Merge pull request #301 from prgrms-web-devcourse-final-project/develop

메인 머지(10/14)

Author: dbfgml2000

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

@@ -56,9 +56,11 @@ public ReservationResponse getReservation(Member member, Long reservationId) {
         Reservation reservation = reservationRepository.findByIdAndMember(reservationId, member.getId())
             .orElseThrow(() -> new ServiceException(ReservationErrorCode.RESERVATION_NOT_ACCESSIBLE));
 
-        MentoringSession mentoringSession = mentoringSessionService.getMentoringSessionByReservation(reservation);
+        Optional<MentoringSession> mentoringSession = mentoringSessionService.findMentoringSessionByReservation(reservation);
 
-        return ReservationResponse.from(reservation, mentoringSession);
+        return mentoringSession
+            .map(session -> ReservationResponse.from(reservation, session))
+            .orElseGet(() -> ReservationResponse.from(reservation));
     }
 
     @Transactional

back/src/main/java/com/back/domain/mentoring/session/service/MentoringSessionService.java

@@ -8,6 +8,8 @@
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
+import java.util.Optional;
+
 @Service
 @RequiredArgsConstructor
 public class MentoringSessionService {
@@ -28,6 +30,10 @@ public MentoringSession getMentoringSessionByReservation(Reservation reservation
                 .orElseThrow(() -> new ServiceException("404", "해당 예약의 세션이 없습니다."));
     }
 
+    public Optional<MentoringSession> findMentoringSessionByReservation(Reservation reservation) {
+        return mentoringSessionRepository.findByReservation((reservation));
+    }
+
     public MentoringSession getMentoringSessionByMentoring(Mentoring mentoring) {
         return mentoringSessionRepository.findByMentoring(mentoring)
                 .orElseThrow(() -> new ServiceException("404", "해당 멘토링의 세션이 없습니다."));

back/src/main/java/com/back/global/initData/RoadmapProdInitData.java

@@ -66,7 +66,7 @@ public void runInitData() {
             log.info(">>> Step 3: JobRoadmap 샘플 데이터 생성 완료");
         } catch (Exception e) {
             log.error("JobRoadmap 샘플 데이터 생성 실패", e);
-            throw e;
+            //throw e;
         }
 
         // 통합 로직 테스트

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

@@ -135,7 +135,7 @@ void getReservation() {
             when(reservationRepository.findByIdAndMember(reservationId, mentor.getMember().getId()))
                 .thenReturn(Optional.of(reservation));
             MentoringSession session = MentoringSessionFixture.create(reservation);
-            when(mentoringSessionService.getMentoringSessionByReservation(reservation)).thenReturn(session);
+            when(mentoringSessionService.findMentoringSessionByReservation(reservation)).thenReturn(Optional.ofNullable(session));
 
             // when
             ReservationResponse response = reservationService.getReservation(