diff --git a/src/main/java/site/campingon/campingon/reservation/service/ReservationStatusUpdate.java b/src/main/java/site/campingon/campingon/reservation/service/ReservationStatusUpdate.java index 2d07640..b74fcbd 100644 --- a/src/main/java/site/campingon/campingon/reservation/service/ReservationStatusUpdate.java +++ b/src/main/java/site/campingon/campingon/reservation/service/ReservationStatusUpdate.java @@ -31,7 +31,7 @@ public void updateStatusToNotCancelable() { List reservations = reservationRepository.findByCheckin(targetTime); reservations.stream() - .filter(reservation -> reservation.getStatus() != ReservationStatus.NOTCANCELABLE) + .filter(reservation -> reservation.getStatus() != ReservationStatus.RESERVED) .forEach(reservation -> reservation.changeStatus(ReservationStatus.NOTCANCELABLE)); reservationRepository.saveAll(reservations); @@ -43,14 +43,14 @@ public void updateStatusToNotCancelable() { @Scheduled(cron = "0 0 15 * * ?") public void updateStatusToCompleted() { LocalDateTime now = LocalDateTime.now(ZoneId.of("Asia/Seoul")); - LocalDateTime targetDate = now.toLocalDate().atTime(15, 0); - - List reservations = reservationRepository.findByCheckin(targetDate); - for (Reservation reservation : reservations) { - if (reservation.getStatus() != ReservationStatus.COMPLETED) { - reservation.changeStatus(ReservationStatus.COMPLETED); - } - } + LocalDateTime targetTime = now.toLocalDate().atTime(15, 0); + + List reservations = reservationRepository.findByCheckin(targetTime); + + reservations.stream() + .filter(reservation -> reservation.getStatus() == ReservationStatus.RESERVED) + .forEach(reservation -> reservation.changeStatus(ReservationStatus.COMPLETED)); + reservationRepository.saveAll(reservations); log.debug("체크인완료 업데이트 스케줄러가 실행되었습니다."); diff --git a/src/test/java/site/campingon/campingon/reservation/service/ReservationServiceTest.java b/src/test/java/site/campingon/campingon/reservation/service/ReservationServiceTest.java index fdc89af..347b4b0 100644 --- a/src/test/java/site/campingon/campingon/reservation/service/ReservationServiceTest.java +++ b/src/test/java/site/campingon/campingon/reservation/service/ReservationServiceTest.java @@ -103,6 +103,7 @@ void setUp() { .campResponseDto(mockCampDto) .campAddrResponseDto(mockCampAddrDto) .build(); + } @Test