@@ -48,9 +48,8 @@ public List<ConcertItem> getNoTicketTimeConcertsList(Pageable pageable) {
4848
4949 public List <ConcertItem > getConcertListByKeyword (String keyword , Pageable pageable ) {
5050 if (keyword == null || keyword .isEmpty ()){
51-
51+ throw new BusinessException ( ConcertErrorCode . KEYWORD_IS_NULL );
5252 }
53-
5453 return concertRepository .getConcertItemsByKeyword (keyword , pageable );
5554 }
5655
@@ -81,8 +80,7 @@ public List<ConcertItem> getConcertsList2(Pageable pageable) {
8180 */
8281
8382 public List <TicketOfficeElement > getTicketOfficesList (long concertId ) {
84- Concert concert = new Concert (concertId );
85- List <TicketOffice > ticketOffices = ticketOfficeRepository .getTicketOfficesByConcert (concert );
83+ List <TicketOffice > ticketOffices = ticketOfficeRepository .getTicketOfficesByConcert_ConcertId (concertId );
8684 List <TicketOfficeElement > ticketOfficeList = new ArrayList <>();
8785 for (TicketOffice ticketOffice : ticketOffices ) {
8886 ticketOfficeList .add (new TicketOfficeElement (ticketOffice ));
@@ -92,7 +90,7 @@ public List<TicketOfficeElement> getTicketOfficesList(long concertId) {
9290 }
9391
9492 public ConcertLikeResponse isLikeConcert (Long concertId , User user ) {
95- Concert concert = concertRepository . getConcertByConcertId (concertId );
93+ Concert concert = findConcertByConcertId (concertId );
9694 ConcertLikeResponse concertLikeResponse ;
9795 if (concertLikeRepository .existsConcertLikeByConcertAndUser (concert ,user )){
9896 concertLikeResponse = new ConcertLikeResponse (concert ,true );
@@ -105,7 +103,8 @@ public ConcertLikeResponse isLikeConcert(Long concertId, User user) {
105103
106104 @ Transactional
107105 public void likeConcert (long concertId , User user ) {
108- Concert concert = concertRepository .findById (concertId ).orElseThrow ();
106+ Concert concert = findConcertByConcertId (concertId );
107+
109108 if (concertLikeRepository .existsConcertLikeByConcertAndUser (concert ,user )){
110109 throw new BusinessException (ConcertErrorCode .LIKE_CONFLICT );
111110 }
@@ -116,7 +115,8 @@ public void likeConcert(long concertId, User user) {
116115
117116 @ Transactional
118117 public void dislikeConcert (long concertId , User user ) {
119- Concert concert = concertRepository .findById (concertId ).orElseThrow ();
118+ Concert concert = findConcertByConcertId (concertId );
119+
120120 ConcertLike concertLike = concertLikeRepository .findConcertLikeByConcertAndUser (concert , user );
121121 if (concertLike == null ){
122122 throw new BusinessException (ConcertErrorCode .NOT_FOUND_CONCERTLIKE );
@@ -126,23 +126,28 @@ public void dislikeConcert(long concertId, User user) {
126126 }
127127
128128 public ConcertItem updateConcert (long concertId , ConcertUpdateRequest concertUpdateRequest ) {
129- Concert concert = concertRepository . findById (concertId ). orElseThrow ( );
129+ Concert concert = findConcertByConcertId (concertId );
130130 ConcertPlace concertPlace = concertPlaceRepository .findById (concertUpdateRequest .getPlaceId ()).orElseThrow ();
131131 concert .update (concertUpdateRequest , concertPlace );
132132 Concert updatedConcert = concertRepository .save (concert );
133133 return new ConcertItem (updatedConcert );
134134 }
135135
136136 public ConcertDetailResponse setConcertTime (ConcertTicketTimeSetRequest concertTicketTimeSetRequest ) {
137- Concert concert = concertRepository . findById (concertTicketTimeSetRequest .getConcertId ()). orElseThrow ( );
137+ Concert concert = findConcertByConcertId (concertTicketTimeSetRequest .getConcertId ());
138138 concert .ticketTimeSet (concertTicketTimeSetRequest .getTicketTime ());
139139 Concert savedConcert = concertRepository .save (concert );
140140 return concertRepository .getConcertDetailById (savedConcert .getConcertId ());
141141 }
142142
143143 public void deleteConcert (long concertId ) {
144- Concert concert = concertRepository .findById (concertId ).orElseThrow ();
145144 concertRepository .deleteById (concertId );
146145 }
147146
147+ private Concert findConcertByConcertId (long concertId ) {
148+ return concertRepository .findById (concertId ).orElseThrow (
149+ () -> new BusinessException (ConcertErrorCode .CONCERT_NOT_FOUND )
150+ );
151+ }
152+
148153}
0 commit comments