Skip to content

Commit c41f8d0

Browse files
authored
Merge pull request #301 from CampingOn/refactor/#205-reservation
refactor: 스케줄러로 예약완료인 상태만 체크
2 parents 3e7755a + 054fe28 commit c41f8d0

File tree

2 files changed

+10
-9
lines changed

2 files changed

+10
-9
lines changed

src/main/java/site/campingon/campingon/reservation/service/ReservationStatusUpdate.java

+9-9
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ public void updateStatusToNotCancelable() {
3131
List<Reservation> reservations = reservationRepository.findByCheckin(targetTime);
3232

3333
reservations.stream()
34-
.filter(reservation -> reservation.getStatus() != ReservationStatus.NOTCANCELABLE)
34+
.filter(reservation -> reservation.getStatus() != ReservationStatus.RESERVED)
3535
.forEach(reservation -> reservation.changeStatus(ReservationStatus.NOTCANCELABLE));
3636

3737
reservationRepository.saveAll(reservations);
@@ -43,14 +43,14 @@ public void updateStatusToNotCancelable() {
4343
@Scheduled(cron = "0 0 15 * * ?")
4444
public void updateStatusToCompleted() {
4545
LocalDateTime now = LocalDateTime.now(ZoneId.of("Asia/Seoul"));
46-
LocalDateTime targetDate = now.toLocalDate().atTime(15, 0);
47-
48-
List<Reservation> reservations = reservationRepository.findByCheckin(targetDate);
49-
for (Reservation reservation : reservations) {
50-
if (reservation.getStatus() != ReservationStatus.COMPLETED) {
51-
reservation.changeStatus(ReservationStatus.COMPLETED);
52-
}
53-
}
46+
LocalDateTime targetTime = now.toLocalDate().atTime(15, 0);
47+
48+
List<Reservation> reservations = reservationRepository.findByCheckin(targetTime);
49+
50+
reservations.stream()
51+
.filter(reservation -> reservation.getStatus() == ReservationStatus.RESERVED)
52+
.forEach(reservation -> reservation.changeStatus(ReservationStatus.COMPLETED));
53+
5454
reservationRepository.saveAll(reservations);
5555

5656
log.debug("체크인완료 업데이트 스케줄러가 실행되었습니다.");

src/test/java/site/campingon/campingon/reservation/service/ReservationServiceTest.java

+1
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,7 @@ void setUp() {
103103
.campResponseDto(mockCampDto)
104104
.campAddrResponseDto(mockCampAddrDto)
105105
.build();
106+
106107
}
107108

108109
@Test

0 commit comments

Comments
 (0)