From 52039cb997e5ddbe47f64793d92100869b7412fe Mon Sep 17 00:00:00 2001 From: hyunw9 Date: Sun, 10 Mar 2024 22:57:00 +0900 Subject: [PATCH] =?UTF-8?q?fix:=20=20=EC=98=88=EC=95=BD=EC=A4=91=EC=9D=B8?= =?UTF-8?q?=20=EC=83=81=ED=83=9C=EB=A7=8C=20=EC=A1=B0=ED=9A=8C=ED=95=A0=20?= =?UTF-8?q?=EC=88=98=20=EC=9E=88=EB=8F=84=EB=A1=9D=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../reservation/application/ReservationCheckServiceImpl.java | 4 ++-- .../reservation/domain/repository/ReservationRepository.java | 2 ++ 2 files changed, 4 insertions(+), 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 index 21f3673..6d7638a 100644 --- 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 getReservationByDateOwner(UserPrincipal userP ExperienceGift experienceGift = experienceGiftRepository.findById(giftId) .orElseThrow(ExperienceGiftNotFoundException::new); - List reservations = reservationRepository.findAllByExperienceGiftAndDate( - experienceGift, date) + List 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 index e34b464..78bf229 100644 --- 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, Optional findByDateAndTimeAndExperienceGift(LocalDate date, LocalTime time, ExperienceGift experienceGift); Optional> findAllByExperienceGiftAndDate(ExperienceGift experienceGift, LocalDate date); + Optional> 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")