Merge pull request #212 from Link-MIND/test

[Merge] 완료된 타이머 로직변경 머지
Link-MIND · Jan 19, 2024 · b948283 · b948283
2 parents 04f6916 + 93ad259
commit b948283
Showing 1 changed file with 11 additions and 4 deletions.
diff --git a/linkmind/src/main/java/com/app/toaster/service/timer/TimerService.java b/linkmind/src/main/java/com/app/toaster/service/timer/TimerService.java
@@ -184,6 +184,10 @@ public GetTimerPageResponseDto getTimerPage(Long userId) {
                 .sorted(Comparator.comparing(CompletedTimerDto::remindTime))
                 .collect(Collectors.toList());
 
+        for(Reminder reminder : reminders){
+            System.out.println(reminder.getId());
+            System.out.println(isCompletedTimer(reminder));
+        }
 
         List<WaitingTimerDto> waitingTimerList = reminders.stream()
                 .filter(reminder -> !isCompletedTimer(reminder))
@@ -213,12 +217,15 @@ private boolean isCompletedTimer(Reminder reminder){
         // 현재 시간
         LocalDateTime now = LocalDateTime.now();
 
-        LocalTime futureDateTime = LocalTime.from(now.plusHours(1));
-        LocalTime pastDateTime = LocalTime.from(now.minusHours(1));
+        LocalDateTime pastDateTime = now.minusHours(1);
+        LocalDateTime futureDateTime = now.plusHours(1);
+
+//        System.out.println(pastDateTime + ", " + now + ", " + futureDateTime);
 
         if (reminder.getRemindDates().contains(now.getDayOfWeek().getValue())) {
-            LocalTime reminderTime = reminder.getRemindTime();
-            return !reminderTime.isBefore(pastDateTime) && !reminderTime.isAfter(futureDateTime) && reminder.getIsAlarm();
+            LocalDateTime reminderDateTime = LocalDateTime.of(now.toLocalDate(), reminder.getRemindTime());
+
+            return !reminderDateTime.isBefore(pastDateTime) && !reminderDateTime.isAfter(futureDateTime) && reminder.getIsAlarm();
         }
 
         return false;