Skip to content

refactor: 스케줄러로 예약완료인 상태만 체크 #301

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
silverzoo merged 1 commit into from
Dec 12, 2024
Merged

refactor: 스케줄러로 예약완료인 상태만 체크 #301

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions src/main/java/site/campingon/campingon/reservation/service/ReservationStatusUpdate.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ public void updateStatusToNotCancelable() {
List<Reservation> 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);
Expand All @@ -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<Reservation> 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<Reservation> reservations = reservationRepository.findByCheckin(targetTime);

reservations.stream()
.filter(reservation -> reservation.getStatus() == ReservationStatus.RESERVED)
.forEach(reservation -> reservation.changeStatus(ReservationStatus.COMPLETED));

reservationRepository.saveAll(reservations);

log.debug("체크인완료 업데이트 스케줄러가 실행되었습니다.");
Expand Down
1 change: 1 addition & 0 deletions src/test/java/site/campingon/campingon/reservation/service/ReservationServiceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,7 @@ void setUp() {
.campResponseDto(mockCampDto)
.campAddrResponseDto(mockCampAddrDto)
.build();

}

@Test
Expand Down
Loading