Merge pull request #296 from ShallWeProject/fix/294-ShopOwnerReservat…

…ionFix fix: 사장님은 예약중인 상태만 조회할 수 있도록 수정
ShallWeProject · Mar 10, 2024 · da69f2c · da69f2c
2 parents 83244c5 + 52039cb
commit da69f2c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/src/main/java/com/shallwe/domain/reservation/application/ReservationCheckServiceImpl.java b/src/main/java/com/shallwe/domain/reservation/application/ReservationCheckServiceImpl.java
@@ -73,8 +73,8 @@ public List<ReservationIdOwnerRes> getReservationByDateOwner(UserPrincipal userP
     ExperienceGift experienceGift = experienceGiftRepository.findById(giftId)
         .orElseThrow(ExperienceGiftNotFoundException::new);
 
-    List<Reservation> reservations = reservationRepository.findAllByExperienceGiftAndDate(
-            experienceGift, date)
+    List<Reservation> reservations = reservationRepository.findAllByExperienceGiftAndDateAndReservationStatus(
+            experienceGift, date,BOOKED)
         .orElseThrow(InvalidReservationException::new);
 
     return reservations.stream()

diff --git a/src/main/java/com/shallwe/domain/reservation/domain/repository/ReservationRepository.java b/src/main/java/com/shallwe/domain/reservation/domain/repository/ReservationRepository.java
@@ -36,6 +36,8 @@ public interface ReservationRepository extends JpaRepository<Reservation, Long>,
     Optional<Reservation> findByDateAndTimeAndExperienceGift(LocalDate date, LocalTime time, ExperienceGift experienceGift);
 
     Optional<List<Reservation>> findAllByExperienceGiftAndDate(ExperienceGift experienceGift, LocalDate date);
+    Optional<List<Reservation>> findAllByExperienceGiftAndDateAndReservationStatus(ExperienceGift experienceGift, LocalDate date,ReservationStatus reservationStatus);
+
 
     @Lock(LockModeType.PESSIMISTIC_WRITE)
     @Query("select r from Reservation r where r.date = :date and r.time = :time and r.experienceGift=:experienceGift")