Skip to content

Commit da69f2c

Browse files
authored
Merge pull request #296 from ShallWeProject/fix/294-ShopOwnerReservationFix
fix: 사장님은 예약중인 상태만 조회할 수 있도록 수정
2 parents 83244c5 + 52039cb commit da69f2c

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

src/main/java/com/shallwe/domain/reservation/application/ReservationCheckServiceImpl.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,8 +73,8 @@ public List<ReservationIdOwnerRes> getReservationByDateOwner(UserPrincipal userP
7373
ExperienceGift experienceGift = experienceGiftRepository.findById(giftId)
7474
.orElseThrow(ExperienceGiftNotFoundException::new);
7575

76-
List<Reservation> reservations = reservationRepository.findAllByExperienceGiftAndDate(
77-
experienceGift, date)
76+
List<Reservation> reservations = reservationRepository.findAllByExperienceGiftAndDateAndReservationStatus(
77+
experienceGift, date,BOOKED)
7878
.orElseThrow(InvalidReservationException::new);
7979

8080
return reservations.stream()

src/main/java/com/shallwe/domain/reservation/domain/repository/ReservationRepository.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,8 @@ public interface ReservationRepository extends JpaRepository<Reservation, Long>,
3636
Optional<Reservation> findByDateAndTimeAndExperienceGift(LocalDate date, LocalTime time, ExperienceGift experienceGift);
3737

3838
Optional<List<Reservation>> findAllByExperienceGiftAndDate(ExperienceGift experienceGift, LocalDate date);
39+
Optional<List<Reservation>> findAllByExperienceGiftAndDateAndReservationStatus(ExperienceGift experienceGift, LocalDate date,ReservationStatus reservationStatus);
40+
3941

4042
@Lock(LockModeType.PESSIMISTIC_WRITE)
4143
@Query("select r from Reservation r where r.date = :date and r.time = :time and r.experienceGift=:experienceGift")

0 commit comments

Comments
 (0)