Refactor: 멘토링 관련 Pageable 정렬 조건 처리 (#345)

* Refactor: reservation 목록 orderBy pageable에서 처리

* Refactor: review 목록 orderBy pageable에서 처리

* Refactor: 시간 설정

Author: sso0om

back/src/main/java/com/back/domain/mentoring/mentoring/repository/ReviewRepository.java

@@ -34,7 +34,6 @@ Double calculateMentoringAverageRating(
         SELECT r
         FROM Review r
         WHERE r.reservation.mentoring.id = :mentoringId
-        ORDER BY r.createDate DESC
         """)
     Page<Review> findAllByMentoringId(
         @Param("mentoringId") Long mentoringId,

back/src/main/java/com/back/domain/mentoring/mentoring/service/ReviewService.java

@@ -14,6 +14,7 @@
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Pageable;
+import org.springframework.data.domain.Sort;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -26,7 +27,11 @@ public class ReviewService {
 
     @Transactional(readOnly = true)
     public Page<ReviewResponse> getReviews(Long mentoringId, int page, int size) {
-        Pageable pageable = PageRequest.of(page, size);
+        Pageable pageable = PageRequest.of(
+            page,
+            size,
+            Sort.by(Sort.Direction.DESC, "createDate")
+        );
 
         return reviewRepository.findAllByMentoringId(mentoringId, pageable)
             .map(ReviewResponse::from);

back/src/main/java/com/back/domain/mentoring/reservation/repository/ReservationRepository.java

@@ -33,7 +33,6 @@ Optional<Reservation> findByIdAndMember(
         SELECT r
         FROM Reservation r
         WHERE r.mentor.member.id = :memberId
-        ORDER BY r.mentorSlot.startDateTime DESC
         """)
     Page<Reservation> findAllByMentorMember(
         @Param("memberId") Long memberId,
@@ -44,7 +43,6 @@ Page<Reservation> findAllByMentorMember(
         SELECT r
         FROM Reservation r
         WHERE r.mentee.member = :member
-        ORDER BY r.mentorSlot.startDateTime DESC
         """)
     Page<Reservation> findAllByMenteeMember(
         @Param("member") Member member,

back/src/main/java/com/back/domain/mentoring/reservation/service/ReservationService.java

@@ -23,6 +23,7 @@
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Pageable;
+import org.springframework.data.domain.Sort;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -39,7 +40,11 @@ public class ReservationService {
 
     @Transactional(readOnly = true)
     public Page<ReservationDto> getReservations(Member member, int page, int size) {
-        Pageable pageable = PageRequest.of(page, size);
+        Pageable pageable = PageRequest.of(
+            page,
+            size,
+            Sort.by(Sort.Direction.DESC, "mentorSlot.startDateTime")
+        );
 
         Page<Reservation> reservations;
 

back/src/main/java/com/back/domain/mentoring/slot/service/MentorSlotService.java

@@ -157,15 +157,13 @@ private LocalDate findNextOrSameDayOfWeek(LocalDate startDate, DayOfWeek targetD
      * 매 시간 30분에 지난 슬롯 만기 처리
      * - AVAILABLE -> EXPIRED
      */
-    @Scheduled(cron = "0 */30 * * * *")
+    @Scheduled(cron = "0 */30 * * * *", zone = "Asia/Seoul")
     @Transactional
     public void expirePassedSlots() {
         LocalDateTime now = LocalDateTime.now();
-
         int updateCount = mentorSlotRepository.expirePassedSlots(now);
-        if (updateCount > 0) {
-            log.info("만료된 슬롯 {}개 업데이트 완료 at {}", updateCount, now);
-        }
+
+        log.info("만료된 슬롯 {}개 업데이트 완료 at {}", updateCount, now);
     }
 
 

back/src/test/java/com/back/domain/mentoring/reservation/service/ReservationServiceTest.java

@@ -33,10 +33,7 @@
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.PageImpl;
-import org.springframework.data.domain.PageRequest;
-import org.springframework.data.domain.Pageable;
+import org.springframework.data.domain.*;
 import org.springframework.test.util.ReflectionTestUtils;
 
 import java.time.LocalDateTime;
@@ -96,16 +93,16 @@ void getReservations() {
             // given
             int page = 1;
             int size = 5;
-            Pageable pageable = PageRequest.of(page, size);
-
             Page<Reservation> reservationPage = new PageImpl<>(
                 List.of(reservation),
-                pageable,
+                PageRequest.of(page, size),
                 10
             );
 
-            when(reservationRepository.findAllByMentorMember(mentor.getMember().getId(), pageable))
-                .thenReturn(reservationPage);
+            when(reservationRepository.findAllByMentorMember(
+                eq(mentor.getMember().getId()),
+                any(Pageable.class)
+            )).thenReturn(reservationPage);
 
             // when
             Page<ReservationDto> result = reservationService.getReservations(
@@ -119,7 +116,10 @@ void getReservations() {
             assertThat(result.getSize()).isEqualTo(5);
             assertThat(result.getTotalElements()).isEqualTo(10);
             assertThat(result.getTotalPages()).isEqualTo(2);
-            verify(reservationRepository).findAllByMentorMember(mentor.getMember().getId(), pageable);
+            verify(reservationRepository).findAllByMentorMember(
+                eq(mentor.getMember().getId()),
+                any(Pageable.class)
+            );
         }
     }