메인 머지 (10/14) Merge pull request #369

메인 머지 (10/14)

Author: sso0om

back/src/main/java/com/back/domain/mentoring/reservation/controller/ReservationController.java

@@ -4,6 +4,7 @@
 import com.back.domain.member.member.service.MemberStorage;
 import com.back.domain.member.mentee.entity.Mentee;
 import com.back.domain.member.mentor.entity.Mentor;
+import com.back.domain.mentoring.reservation.constant.ReservationStatus;
 import com.back.domain.mentoring.reservation.dto.ReservationDto;
 import com.back.domain.mentoring.reservation.dto.request.ReservationRequest;
 import com.back.domain.mentoring.reservation.dto.response.ReservationPagingResponse;
@@ -33,10 +34,11 @@ public class ReservationController {
     @Operation(summary = "나의 예약 목록 조회", description = "본인의 예약 목록을 조회합니다. 로그인 후 조회할 수 있습니다.")
     public RsData<ReservationPagingResponse> getReservations(
         @RequestParam(defaultValue = "0") int page,
-        @RequestParam(defaultValue = "10") int size
+        @RequestParam(defaultValue = "10") int size,
+        @RequestParam(required = false) ReservationStatus status
     ) {
         Member member = rq.getActor();
-        Page<ReservationDto> reservationPage = reservationService.getReservations(member, page, size);
+        Page<ReservationDto> reservationPage = reservationService.getReservations(member, page, size, status);
         ReservationPagingResponse resDto = ReservationPagingResponse.from(reservationPage);
 
         return new RsData<>(

back/src/main/java/com/back/domain/mentoring/reservation/entity/Reservation.java

@@ -7,7 +7,6 @@
 import com.back.domain.mentoring.reservation.constant.ReservationStatus;
 import com.back.domain.mentoring.reservation.error.ReservationErrorCode;
 import com.back.domain.mentoring.slot.entity.MentorSlot;
-import com.back.global.app.AppConfig;
 import com.back.global.exception.ServiceException;
 import com.back.global.jpa.BaseEntity;
 import jakarta.persistence.*;
@@ -133,14 +132,6 @@ private void ensureCanComplete() {
         if(!this.status.canComplete()) {
             throw new ServiceException(ReservationErrorCode.CANNOT_COMPLETE);
         }
-        // 개발·테스트 환경에서는 검증 스킵 (Swagger 테스트 허용)
-        if (AppConfig.isDev() || AppConfig.isTest()) {
-            return;
-        }
-        // 시작 이후 완료 가능 (조기 종료 허용)
-        if (!mentorSlot.isPast()) {
-            throw new ServiceException(ReservationErrorCode.MENTORING_NOT_STARTED);
-        }
     }
 
     private void ensureNotPast() {

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

@@ -32,20 +32,28 @@ Optional<Reservation> findByIdAndMember(
     @Query("""
         SELECT r
         FROM Reservation r
+        JOIN FETCH r.mentorSlot ms
+        JOIN FETCH r.mentoring
         WHERE r.mentor.member.id = :memberId
+        AND (:status IS NULL OR r.status = :status)
         """)
     Page<Reservation> findAllByMentorMember(
         @Param("memberId") Long memberId,
+        @Param("status") ReservationStatus status,
         Pageable pageable
     );
 
     @Query("""
         SELECT r
         FROM Reservation r
+        JOIN FETCH r.mentorSlot ms
+        JOIN FETCH r.mentoring
         WHERE r.mentee.member = :member
+        AND (:status IS NULL OR r.status = :status)
         """)
     Page<Reservation> findAllByMenteeMember(
         @Param("member") Member member,
+        @Param("status") ReservationStatus status,
         Pageable pageable
     );
 

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

@@ -39,7 +39,7 @@ public class ReservationService {
     private final MentoringSessionService mentoringSessionService;
 
     @Transactional(readOnly = true)
-    public Page<ReservationDto> getReservations(Member member, int page, int size) {
+    public Page<ReservationDto> getReservations(Member member, int page, int size, ReservationStatus status) {
         Pageable pageable = PageRequest.of(
             page,
             size,
@@ -49,9 +49,9 @@ public Page<ReservationDto> getReservations(Member member, int page, int size) {
         Page<Reservation> reservations;
 
         if (member.getRole() == Member.Role.MENTOR) {
-            reservations = reservationRepository.findAllByMentorMember(member.getId(), pageable);
+            reservations = reservationRepository.findAllByMentorMember(member.getId(), status, pageable);
         } else {
-            reservations = reservationRepository.findAllByMenteeMember(member, pageable);
+            reservations = reservationRepository.findAllByMenteeMember(member, status, pageable);
         }
         return reservations.map(ReservationDto::from);
     }

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

@@ -101,14 +101,16 @@ void getReservations() {
 
             when(reservationRepository.findAllByMentorMember(
                 eq(mentor.getMember().getId()),
+                isNull(),
                 any(Pageable.class)
             )).thenReturn(reservationPage);
 
             // when
             Page<ReservationDto> result = reservationService.getReservations(
                 mentor.getMember(),
                 page,
-                size
+                size,
+                null
             );
 
             // then
@@ -118,6 +120,7 @@ void getReservations() {
             assertThat(result.getTotalPages()).isEqualTo(2);
             verify(reservationRepository).findAllByMentorMember(
                 eq(mentor.getMember().getId()),
+                isNull(),
                 any(Pageable.class)
             );
         }