Merge pull request #138 from so2zy/hotfix/fix_reservation_image

fix: 방 이미지 가져오기 수정
so2zy · Nov 30, 2023 · 92816ce · 92816ce
2 parents 94a55f5 + 727ae65
commit 92816ce
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/src/main/java/com/aroom/domain/reservation/service/ReservationService.java b/src/main/java/com/aroom/domain/reservation/service/ReservationService.java
@@ -1,5 +1,6 @@
 package com.aroom.domain.reservation.service;
 
+import com.aroom.domain.cart.model.Cart;
 import com.aroom.domain.member.exception.MemberNotFoundException;
 import com.aroom.domain.member.model.Member;
 import com.aroom.domain.member.repository.MemberRepository;
@@ -24,6 +25,7 @@
 import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Optional;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -85,8 +87,10 @@ public ReservationResponse reserveRoom(ReservationRequest request, Long id) {
                 reservationRoomId = savedReservationRoom.getId();
             }
 
-            RoomImage roomImage = roomImageRepository.findByRoomId(
-                requiredRoom.getId()).orElseThrow(RuntimeException::new);
+            Optional<RoomImage> optionalRoomImage = roomImageRepository.findByRoomId(requiredRoom.getId());
+            RoomImage roomImage = optionalRoomImage.orElseGet(() -> {
+                return RoomImage.builder().url("").build();
+            });
 
             RoomReservationResponse responseRoom = RoomReservationResponse.builder()
                 .roomId(requiredRoom.getId())

diff --git a/src/test/java/com/aroom/domain/reservation/service/ReservationServiceTest.java b/src/test/java/com/aroom/domain/reservation/service/ReservationServiceTest.java
@@ -142,7 +142,7 @@ void reservation_one_room_of_one_accommodation_success(){
             given(roomRepository.findById(any())).willReturn(Optional.of(testRoom));
             given(reservationRoomRepository.save(any())).willReturn(reservationRoom);
             given(reservationRepository.save(any())).willReturn(reservation);
-            given(roomImageRepository.findById(any())).willReturn(Optional.of(roomImage));
+            given(roomImageRepository.findByRoomId(any())).willReturn(Optional.of(roomImage));
             given(roomProductRepository.findByRoomAndBetweenStartDateAndEndDate(any(), any(),
                 any())).willReturn(List.of(roomProduct));