Merge pull request #144 from prgrms-aibe-devcourse/feat/#139-solve-N+1

jhwan1205-sys · web-flow · commit f55d0002c599 · 2026-04-28T09:11:57.000+09:00
[ Refact ] N+1 문제 전체 파악 및 개선
diff --git a/src/main/java/com/knoc/dashboard/DashboardService.java b/src/main/java/com/knoc/dashboard/DashboardService.java
@@ -20,6 +20,7 @@
 
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 import java.util.stream.Collectors;
 
 @Service
@@ -37,18 +38,21 @@ public JuniorDashboardDto getJuniorDashboard(String email) {
         Member member = memberRepository.findByEmail(email)
                 .orElseThrow(() -> new BusinessException(ErrorCode.MEMBER_NOT_FOUND));
 
-        List<Order> orders = orderRepository.findByJunior_IdOrderByCreatedAtDesc(member.getId());
+        List<Order> orders = orderRepository.findByJuniorIdWithSenior(member.getId());
 
         long pendingCount = orders.stream().filter(o -> o.getStatus() == OrderStatus.PENDING).count();
         long inProgressCount = orders.stream().filter(o -> o.getStatus() == OrderStatus.PAID).count();
         long completedCount = orders.stream().filter(o -> o.getStatus() == OrderStatus.SETTLED).count();
 
+        List<Long> orderIds = orders.stream().map(Order::getId).toList();
+        Set<Long> reviewedOrderIds = reviewFeedbackRepository.findReviewedOrderIds(orderIds);
+
         List<JuniorDashboardDto.OrderSummaryDto> orderSummaryDtos = orders.stream()
                 .map(o -> JuniorDashboardDto.OrderSummaryDto.builder()
                         .orderId(o.getId())
                         .seniorNickname(o.getSenior().getNickname())
                         .status(o.getStatus())
-                        .hasReview(reviewFeedbackRepository.existsByOrderId(o.getId()))
+                        .hasReview(reviewedOrderIds.contains(o.getId()))
                         .build())
                 .toList();
 
@@ -70,18 +74,21 @@ public SeniorDashBoardDto getSeniorDashboard(String email) {
         SeniorProfile seniorProfile = seniorProfileRepository.findByMemberId(member.getId())
                 .orElseThrow(() -> new BusinessException(ErrorCode.SENIOR_PROFILE_NOT_FOUND));
 
-        List<Order> orders = orderRepository.findBySenior_IdOrderByCreatedAtDesc(member.getId());
+        List<Order> orders = orderRepository.findBySeniorIdWithJunior(member.getId());
 
         long pendingCount = orders.stream().filter(o -> o.getStatus() == OrderStatus.PENDING).count();
         long inProgressCount = orders.stream().filter(o -> o.getStatus() == OrderStatus.PAID).count();
         long completedCount = orders.stream().filter(o -> o.getStatus() == OrderStatus.SETTLED).count();
 
+        List<Long> orderIds = orders.stream().map(Order::getId).toList();
+        Set<Long> reviewedOrderIds = reviewFeedbackRepository.findReviewedOrderIds(orderIds);
+
         List<SeniorDashBoardDto.OrderSummaryDto> orderSummaryDtos = orders.stream()
                 .map(o -> SeniorDashBoardDto.OrderSummaryDto.builder()
                         .orderId(o.getId())
                         .juniorNickname(o.getJunior().getNickname())
                         .status(o.getStatus())
-                        .hasReview(reviewFeedbackRepository.existsByOrderId(o.getId()))
+                        .hasReview(reviewedOrderIds.contains(o.getId()))
                         .build())
                 .toList();
 
@@ -93,7 +100,7 @@ public SeniorDashBoardDto getSeniorDashboard(String email) {
 
         // 최근 후기 3개
         List<SeniorDashBoardDto.ReviewSummeryDto> reviewSummeryDtos =
-                reviewFeedbackRepository.findTop3BySeniorProfile_IdOrderByCreatedAtDesc(seniorProfile.getId())
+                reviewFeedbackRepository.findTop3WithJuniorBySeniorProfileId(seniorProfile.getId(), PageRequest.of(0, 3))
                         .stream()
                         .map(r -> SeniorDashBoardDto.ReviewSummeryDto.builder()
                                 .reviewId(r.getId())
@@ -135,9 +142,7 @@ public SeniorReviewPageDto getSeniorReviews(String email, int pageNumber) {
         SeniorProfile profile = seniorProfileRepository.findByMemberId(member.getId())
                 .orElseThrow(() -> new BusinessException(ErrorCode.SENIOR_PROFILE_NOT_FOUND));
 
-        Page<ReviewFeedback> reviewPage = reviewFeedbackRepository
-                .findBySeniorProfile_IdOrderByCreatedAtDesc(
-                        profile.getId(), PageRequest.of(pageNumber, 10));
+        Page<ReviewFeedback> reviewPage = reviewFeedbackRepository.findWithJuniorBySeniorProfileId(profile.getId(), PageRequest.of(pageNumber, 10));
 
         List<SeniorDashBoardDto.ReviewSummeryDto> reviews = reviewPage.getContent().stream()
                 .map(r -> SeniorDashBoardDto.ReviewSummeryDto.builder()
diff --git a/src/main/java/com/knoc/order/repository/OrderRepository.java b/src/main/java/com/knoc/order/repository/OrderRepository.java
@@ -4,6 +4,8 @@
 import com.knoc.order.entity.Order;
 import com.knoc.order.entity.OrderStatus;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
 
 import java.util.List;
 import java.util.Optional;
@@ -16,6 +18,12 @@ public interface OrderRepository extends JpaRepository<Order, Long> {
 
     List<Order> findBySenior_IdOrderByCreatedAtDesc(Long seniorId);
 
+    @Query("SELECT o FROM Order o JOIN FETCH o.junior WHERE o.senior.id = :seniorId ORDER BY o.createdAt DESC")
+    List<Order> findBySeniorIdWithJunior(@Param("seniorId") Long seniorId);
+
+    @Query("SELECT o FROM Order o JOIN FETCH o.senior WHERE o.junior.id = :juniorId ORDER BY o.createdAt DESC")
+    List<Order> findByJuniorIdWithSenior(@Param("juniorId") Long juniorId);
+
     // 해당 채팅방에 결제 요청(Order)이 이미 발행된 적이 있는지 여부.
     // 시니어의 '결제 요청하기' 버튼 초기 노출 제어에 사용 (한 채팅방당 한 번만 요청하는 정책).
     boolean existsByChatRoom_Id(Long chatRoomId);
diff --git a/src/main/java/com/knoc/reviewFeedback/repository/ReviewFeedbackRepository.java b/src/main/java/com/knoc/reviewFeedback/repository/ReviewFeedbackRepository.java
@@ -2,12 +2,15 @@
 
 import com.knoc.senior.entity.SeniorProfile;
 import com.knoc.reviewFeedback.entity.ReviewFeedback;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
 
 import java.time.LocalDateTime;
 import java.util.List;
+import java.util.Set;
 
 public interface ReviewFeedbackRepository extends JpaRepository<ReviewFeedback,Long> {
     boolean existsByOrderId(Long orderId);
@@ -22,10 +25,25 @@ public interface ReviewFeedbackRepository extends JpaRepository<ReviewFeedback,L
 
     org.springframework.data.domain.Page<ReviewFeedback> findBySeniorProfile_IdOrderByCreatedAtDesc(Long seniorProfileId, org.springframework.data.domain.Pageable pageable);
 
-    List<ReviewFeedback> findAllByOrderByCreatedAtDesc();
+    @Query("SELECT r.order.id FROM ReviewFeedback r WHERE r.order.id IN :orderIds")
+    Set<Long> findReviewedOrderIds(@Param("orderIds") List<Long> orderIds);
 
-    @Query("SELECT r.seniorProfile FROM ReviewFeedback r WHERE r.createdAt >= :startOfMonth GROUP BY r.seniorProfile ORDER BY COUNT(r) DESC")
-    List<SeniorProfile> findTop3ActiveSeniorsThisMonth(@Param("startOfMonth") LocalDateTime startOfMonth, org.springframework.data.domain.Pageable pageable);
+    @Query("SELECT r FROM ReviewFeedback r JOIN FETCH r.junior WHERE r.seniorProfile.id = :id ORDER BY r.createdAt DESC")
+    List<ReviewFeedback> findTop3WithJuniorBySeniorProfileId(@Param("id") Long seniorProfileId, Pageable pageable);
 
-    List<ReviewFeedback> findByJunior_IdOrderByCreatedAtDesc(Long juniorId);
+    // 페이지네이션 대체
+    @Query(
+            value = "SELECT r FROM ReviewFeedback r JOIN FETCH r.junior WHERE r.seniorProfile.id = :id ORDER BY r.createdAt DESC",
+            countQuery = "SELECT COUNT(r) FROM ReviewFeedback r WHERE r.seniorProfile.id = :id"
+    )
+    Page<ReviewFeedback> findWithJuniorBySeniorProfileId(@Param("id") Long seniorProfileId, Pageable pageable);
+
+    @Query("SELECT r FROM ReviewFeedback r JOIN FETCH r.junior JOIN FETCH r.seniorProfile sp JOIN FETCH sp.member JOIN FETCH r.order ORDER BY r.createdAt DESC ")
+    List<ReviewFeedback> findAllWithRelationsOrderByCreatedAtDesc();
+
+    @Query("SELECT r FROM ReviewFeedback r JOIN FETCH r.junior JOIN FETCH r.seniorProfile sp JOIN FETCH sp.member JOIN FETCH r.order WHERE r.junior.id = :juniorId ORDER BY r.createdAt DESC")
+    List<ReviewFeedback> findByJuniorIdWithRelations(@Param("juniorId") Long juniorId);
+
+    @Query("SELECT sp FROM SeniorProfile sp JOIN FETCH sp.member " + "WHERE sp.id IN (" + "SELECT r.seniorProfile.id FROM ReviewFeedback r " + "WHERE r.createdAt >= :startOfMonth " + "GROUP BY r.seniorProfile.id " + "ORDER BY COUNT(r) DESC" + ")")
+    List<SeniorProfile> findTop3ActiveSeniorsThisMonthWithMember(@Param("startOfMonth") LocalDateTime startOfMonth, Pageable pageable);
 }
diff --git a/src/main/java/com/knoc/reviewFeedback/service/ReviewFeedbackService.java b/src/main/java/com/knoc/reviewFeedback/service/ReviewFeedbackService.java
@@ -84,12 +84,12 @@ public void updateReview(Long orderId, ReviewFeedbackRequestDto dto, Long junior
     }
 
     public ReviewPageDto getReviewPage() {
-        List<ReviewFeedback> feedbacks = reviewFeedbackRepository.findAllByOrderByCreatedAtDesc();
+        List<ReviewFeedback> feedbacks = reviewFeedbackRepository.findAllWithRelationsOrderByCreatedAtDesc();
 
         List<ReviewPageDto.ReviewCardDto> reviewCards = mapToCards(feedbacks);
         LocalDateTime startOfMonth = LocalDate.now().withDayOfMonth(1).atStartOfDay();
         List<ReviewPageDto.TopSeniorDto> topSeniors = mapToTopSeniors(
-                reviewFeedbackRepository.findTop3ActiveSeniorsThisMonth(startOfMonth, PageRequest.of(0, 3)));
+                reviewFeedbackRepository.findTop3ActiveSeniorsThisMonthWithMember(startOfMonth, PageRequest.of(0, 3)));
 
         return ReviewPageDto.builder()
                 .reviews(reviewCards)
@@ -138,7 +138,7 @@ public MyReviewPageResponse getMyReviewCards(String email) {
                 .map(Member::getId)
                 .orElseThrow(() -> new BusinessException(ErrorCode.MEMBER_NOT_FOUND));
 
-        List<ReviewFeedback> myFeedbacks = reviewFeedbackRepository.findByJunior_IdOrderByCreatedAtDesc(juniorId);
+        List<ReviewFeedback> myFeedbacks = reviewFeedbackRepository.findByJuniorIdWithRelations(juniorId);
         return new MyReviewPageResponse(mapToCards(myFeedbacks), myFeedbacks.size());
     }
 }
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
@@ -20,7 +20,9 @@ springdoc.swagger-ui.disable-swagger-default-url=true
 springdoc.swagger-ui.display-request-duration=true
 
 # 4. 로깅 공통 설정
-logging.level.org.hibernate.orm.jdbc.bind=DEBUG
+logging.level.org.hibernate.orm.jdbc.bind=TRACE
+logging.level.org.hibernate.SQL=DEBUG
+logging.level.org.springframework.web=DEBUG
 
 # 인증 메일 설정
 spring.mail.host=smtp.gmail.com
@@ -50,4 +52,7 @@ toss.payments.connect-timeout=3s
 toss.payments.read-timeout=10s
 
 # GitHub API (미설정 시 공개 저장소 60req/h 제한, prod는 환경변수로 주입)
-github.token=${GITHUB_TOKEN:}
+github.token=${GITHUB_TOKEN:}
+
+spring.jpa.show-sql=true
+spring.jpa.properties.hibernate.format_sql=true
diff --git a/src/main/resources/templates/index.html b/src/main/resources/templates/index.html
@@ -227,14 +227,6 @@ <h1 class="display-5 fw-bold mb-4">성장을 이끌어줄 현업 <span class="te
             careerSlider.addEventListener('change', loadSeniors);
             priceSlider.addEventListener('change',  loadSeniors);
 
-            // 필터가 적용된 상태면 패널 자동 열기
-            const hasFilter = parseInt(careerSlider.value) > 0
-                           || parseInt(priceSlider.value) < MAX_PRICE
-                           || currentSkill !== '';
-            if (hasFilter) {
-                new bootstrap.Collapse(document.getElementById('filterPanel'), { toggle: false }).show();
-                document.getElementById('filterToggleBtn').classList.add('active');
-            }
         });
     </script>
 </th:block>
diff --git a/src/test/java/com/knoc/dashboard/DashboardServiceTest.java b/src/test/java/com/knoc/dashboard/DashboardServiceTest.java
@@ -29,9 +29,11 @@
 import java.time.LocalDateTime;
 import java.util.List;
 import java.util.Optional;
+import java.util.Set;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.mockito.ArgumentMatchers.anyList;
 import static org.mockito.BDDMockito.given;
 import static org.mockito.Mockito.mock;
 
@@ -92,11 +94,10 @@ void getJuniorDashboard_Success() {
         settledOrder.updateStatus(OrderStatus.SETTLED);
         ReflectionTestUtils.setField(settledOrder, "id", 3L);
 
-        given(orderRepository.findByJunior_IdOrderByCreatedAtDesc(1L))
+        given(orderRepository.findByJuniorIdWithSenior(1L))
                 .willReturn(List.of(settledOrder, paidOrder, pendingOrder));
-        given(reviewFeedbackRepository.existsByOrderId(1L)).willReturn(false);
-        given(reviewFeedbackRepository.existsByOrderId(2L)).willReturn(false);
-        given(reviewFeedbackRepository.existsByOrderId(3L)).willReturn(true);
+        given(reviewFeedbackRepository.findReviewedOrderIds(anyList()))
+                .willReturn(Set.of(3L));
 
         // when
         JuniorDashboardDto result = dashboardService.getJuniorDashboard(email);
@@ -127,7 +128,7 @@ void getJuniorDashboard_Success_NoOrders() {
         given(junior.getId()).willReturn(1L);
         given(junior.getNickname()).willReturn("코딩초보");
         given(memberRepository.findByEmail(email)).willReturn(Optional.of(junior));
-        given(orderRepository.findByJunior_IdOrderByCreatedAtDesc(1L)).willReturn(List.of());
+        given(orderRepository.findByJuniorIdWithSenior(1L)).willReturn(List.of());
 
         // when
         JuniorDashboardDto result = dashboardService.getJuniorDashboard(email);
@@ -203,10 +204,10 @@ void getSeniorDashboard_Success() {
         paidOrder.updateStatus(OrderStatus.PAID);
         ReflectionTestUtils.setField(paidOrder, "id", 2L);
 
-        given(orderRepository.findBySenior_IdOrderByCreatedAtDesc(2L))
+        given(orderRepository.findBySeniorIdWithJunior(2L))
                 .willReturn(List.of(settledOrder, paidOrder));
-        given(reviewFeedbackRepository.existsByOrderId(1L)).willReturn(true);
-        given(reviewFeedbackRepository.existsByOrderId(2L)).willReturn(false);
+        given(reviewFeedbackRepository.findReviewedOrderIds(anyList()))
+                .willReturn(Set.of(1L));
 
         // 별점 분포용 전체 후기
         ReviewFeedback review5 = mock(ReviewFeedback.class);
@@ -227,7 +228,7 @@ void getSeniorDashboard_Success() {
         given(top3Review.getComment()).willReturn("정말 도움이 됐어요!");
         given(top3Review.getCreatedAt()).willReturn(LocalDateTime.of(2025, 4, 1, 12, 0));
 
-        given(reviewFeedbackRepository.findTop3BySeniorProfile_IdOrderByCreatedAtDesc(10L))
+        given(reviewFeedbackRepository.findTop3WithJuniorBySeniorProfileId(10L, PageRequest.of(0, 3)))
                 .willReturn(List.of(top3Review));
 
         // when
@@ -279,9 +280,9 @@ void getSeniorDashboard_Success_NoReviews() {
         given(profile.getSkills()).willReturn(List.of());
         given(seniorProfileRepository.findByMemberId(2L)).willReturn(Optional.of(profile));
 
-        given(orderRepository.findBySenior_IdOrderByCreatedAtDesc(2L)).willReturn(List.of());
+        given(orderRepository.findBySeniorIdWithJunior(2L)).willReturn(List.of());
         given(reviewFeedbackRepository.findBySeniorProfile_Id(10L)).willReturn(List.of());
-        given(reviewFeedbackRepository.findTop3BySeniorProfile_IdOrderByCreatedAtDesc(10L)).willReturn(List.of());
+        given(reviewFeedbackRepository.findTop3WithJuniorBySeniorProfileId(10L, PageRequest.of(0, 3))).willReturn(List.of());
 
         // when
         SeniorDashBoardDto result = dashboardService.getSeniorDashboard(email);
@@ -362,7 +363,7 @@ void getSeniorReviews_Success() {
 
         PageRequest pageable = PageRequest.of(0, 10);
         Page<ReviewFeedback> reviewPage = new PageImpl<>(List.of(review1, review2), pageable, 2);
-        given(reviewFeedbackRepository.findBySeniorProfile_IdOrderByCreatedAtDesc(10L, pageable))
+        given(reviewFeedbackRepository.findWithJuniorBySeniorProfileId(10L, pageable))
                 .willReturn(reviewPage);
 
         // when
@@ -405,7 +406,7 @@ void getSeniorReviews_Success_NoReviews() {
 
         PageRequest pageable = PageRequest.of(0, 10);
         Page<ReviewFeedback> emptyPage = new PageImpl<>(List.of(), pageable, 0);
-        given(reviewFeedbackRepository.findBySeniorProfile_IdOrderByCreatedAtDesc(10L, pageable))
+        given(reviewFeedbackRepository.findWithJuniorBySeniorProfileId(10L, pageable))
                 .willReturn(emptyPage);
 
         // when

Original file line number	Diff line number	Diff line change
`@@ -84,12 +84,12 @@ public void updateReview(Long orderId, ReviewFeedbackRequestDto dto, Long junior`
`84`	`84`	`}`
`85`	`85`
`86`	`86`	`public ReviewPageDto getReviewPage() {`
`87`		`- List<ReviewFeedback> feedbacks = reviewFeedbackRepository.findAllByOrderByCreatedAtDesc();`
	`87`	`+ List<ReviewFeedback> feedbacks = reviewFeedbackRepository.findAllWithRelationsOrderByCreatedAtDesc();`
`88`	`88`
`89`	`89`	`List<ReviewPageDto.ReviewCardDto> reviewCards = mapToCards(feedbacks);`
`90`	`90`	`LocalDateTime startOfMonth = LocalDate.now().withDayOfMonth(1).atStartOfDay();`
`91`	`91`	`List<ReviewPageDto.TopSeniorDto> topSeniors = mapToTopSeniors(`
`92`		`- reviewFeedbackRepository.findTop3ActiveSeniorsThisMonth(startOfMonth, PageRequest.of(0, 3)));`
	`92`	`+ reviewFeedbackRepository.findTop3ActiveSeniorsThisMonthWithMember(startOfMonth, PageRequest.of(0, 3)));`
`93`	`93`
`94`	`94`	`return ReviewPageDto.builder()`
`95`	`95`	`.reviews(reviewCards)`
`@@ -138,7 +138,7 @@ public MyReviewPageResponse getMyReviewCards(String email) {`
`138`	`138`	`.map(Member::getId)`
`139`	`139`	`.orElseThrow(() -> new BusinessException(ErrorCode.MEMBER_NOT_FOUND));`
`140`	`140`
`141`		`- List<ReviewFeedback> myFeedbacks = reviewFeedbackRepository.findByJunior_IdOrderByCreatedAtDesc(juniorId);`
	`141`	`+ List<ReviewFeedback> myFeedbacks = reviewFeedbackRepository.findByJuniorIdWithRelations(juniorId);`
`142`	`142`	`return new MyReviewPageResponse(mapToCards(myFeedbacks), myFeedbacks.size());`
`143`	`143`	`}`
`144`	`144`	`}`