From 054fe28545b4abae51d052579439ab25dab8f47f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=5BCLOUD4=5D=20=EC=9D=B4=EC=9D=80=EC=A3=BC?= Date: Thu, 12 Dec 2024 14:23:02 +0900 Subject: [PATCH] =?UTF-8?q?refactor:=20=EC=8A=A4=EC=BC=80=EC=A4=84?= =?UTF-8?q?=EB=9F=AC=EB=A1=9C=20=EC=98=88=EC=95=BD=EC=99=84=EB=A3=8C?= =?UTF-8?q?=EC=9D=B8=20=EC=83=81=ED=83=9C=EB=A7=8C=20=EC=B2=B4=ED=81=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/ReservationStatusUpdate.java | 18 +++++++++--------- .../service/ReservationServiceTest.java | 1 + 2 files changed, 10 insertions(+), 9 deletions(-) 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