Merge remote-tracking branch 'origin/dev' into feat/#482

woowacourse-teams · Nov 14, 2023 · 214ad09 · 214ad09
2 parents 14fb125 + 1eeb1c7
commit 214ad09
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 4 deletions.
diff --git a/backend/src/main/java/com/festago/ticket/application/TicketService.java b/backend/src/main/java/com/festago/ticket/application/TicketService.java
@@ -46,6 +46,6 @@ private Stage findStageById(Long stageId) {
 
     @Transactional(readOnly = true)
     public StageTicketsResponse findStageTickets(Long stageId) {
-        return StageTicketsResponse.from(ticketRepository.findAllByStageId(stageId));
+        return StageTicketsResponse.from(ticketRepository.findAllByStageIdWithFetch(stageId));
     }
 }
diff --git a/backend/src/main/java/com/festago/ticket/repository/TicketRepository.java b/backend/src/main/java/com/festago/ticket/repository/TicketRepository.java
@@ -11,7 +11,12 @@
 
 public interface TicketRepository extends JpaRepository<Ticket, Long> {
 
-    List<Ticket> findAllByStageId(Long stageId);
+    @Query("""
+            SELECT t from Ticket t
+            INNER JOIN FETCH t.ticketAmount
+            WHERE t.stage.id = :stageId
+        """)
+    List<Ticket> findAllByStageIdWithFetch(@Param("stageId") Long stageId);
 
     Optional<Ticket> findByTicketTypeAndStage(TicketType ticketType, Stage stage);
 

diff --git a/backend/src/test/java/com/festago/ticket/application/TicketServiceTest.java b/backend/src/test/java/com/festago/ticket/application/TicketServiceTest.java
@@ -40,7 +40,7 @@ class TicketServiceTest {
             TicketFixture.ticket().id(1L).ticketType(TicketType.STUDENT).stage(stage).build(),
             TicketFixture.ticket().id(2L).ticketType(TicketType.VISITOR).stage(stage).build()
         );
-        given(ticketRepository.findAllByStageId(stageId))
+        given(ticketRepository.findAllByStageIdWithFetch(stageId))
             .willReturn(tickets);
 
         // when

diff --git a/backend/src/test/java/com/festago/ticket/repository/TicketRepositoryTest.java b/backend/src/test/java/com/festago/ticket/repository/TicketRepositoryTest.java
@@ -51,7 +51,7 @@ class TicketRepositoryTest {
         ticketRepository.save(TicketFixture.ticket().stage(otherStage).build());
 
         // when
-        List<Ticket> actual = ticketRepository.findAllByStageId(stage.getId());
+        List<Ticket> actual = ticketRepository.findAllByStageIdWithFetch(stage.getId());
 
         // then
         assertThat(actual).hasSize(2);