From 511cacdba9a20826ce56745d5f162e72c56bc180 Mon Sep 17 00:00:00 2001
From: GOEN WOO KIM <148152234+coli-geonwoo@users.noreply.github.com>
Date: Thu, 26 Sep 2024 19:51:50 +0900
Subject: [PATCH] =?UTF-8?q?refactor:=20=EC=95=8C=EB=A6=BC=20=EC=A1=B0?=
 =?UTF-8?q?=ED=9A=8C=20=EA=B8=B0=EC=A4=80=20=EC=8B=9C=EA=B0=84=EC=9D=84=20?=
 =?UTF-8?q?=ED=8C=8C=EB=9D=BC=EB=AF=B8=ED=84=B0=EB=A1=9C=20=EB=B0=9B?=
 =?UTF-8?q?=EB=8F=84=EB=A1=9D=20=EC=88=98=EC=A0=95=20(#611)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: coli-geonwoo <coli-geonwoo@gmail.com>
---
 .../ody/notification/repository/NotificationRepository.java  | 5 +++--
 .../com/ody/notification/service/NotificationService.java    | 2 +-
 .../notification/repository/NotificationRepositoryTest.java  | 4 ++--
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/backend/src/main/java/com/ody/notification/repository/NotificationRepository.java b/backend/src/main/java/com/ody/notification/repository/NotificationRepository.java
index 4f0a9d5f6..a40756ade 100644
--- a/backend/src/main/java/com/ody/notification/repository/NotificationRepository.java
+++ b/backend/src/main/java/com/ody/notification/repository/NotificationRepository.java
@@ -3,6 +3,7 @@
 import com.ody.notification.domain.Notification;
 import com.ody.notification.domain.NotificationStatus;
 import com.ody.notification.domain.NotificationType;
+import java.time.LocalDateTime;
 import java.util.List;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Modifying;
@@ -15,10 +16,10 @@ public interface NotificationRepository extends JpaRepository<Notification, Long
             from Notification noti
             left join fetch Mate m on noti.mate = m
             left join Meeting meet on m.meeting = meet
-            where meet.id = :meetingId and noti.sendAt <= now()
+            where meet.id = :meetingId and noti.sendAt <= :time
             order by noti.sendAt asc
             """)
-    List<Notification> findAllMeetingLogs(Long meetingId);
+    List<Notification> findAllMeetingLogsBeforeThanEqual(Long meetingId, LocalDateTime time);
 
     @Query("""
             select noti
diff --git a/backend/src/main/java/com/ody/notification/service/NotificationService.java b/backend/src/main/java/com/ody/notification/service/NotificationService.java
index 3d2547004..8c8d9bbda 100644
--- a/backend/src/main/java/com/ody/notification/service/NotificationService.java
+++ b/backend/src/main/java/com/ody/notification/service/NotificationService.java
@@ -92,7 +92,7 @@ public void schedulePendingNotification() {
 
     @DisabledDeletedFilter
     public NotiLogFindResponses findAllMeetingLogs(Long meetingId) {
-        List<Notification> notifications = notificationRepository.findAllMeetingLogs(meetingId);
+        List<Notification> notifications = notificationRepository.findAllMeetingLogsBeforeThanEqual(meetingId, LocalDateTime.now());
         return NotiLogFindResponses.from(notifications);
     }
 
diff --git a/backend/src/test/java/com/ody/notification/repository/NotificationRepositoryTest.java b/backend/src/test/java/com/ody/notification/repository/NotificationRepositoryTest.java
index 481a9425e..abe339bd9 100644
--- a/backend/src/test/java/com/ody/notification/repository/NotificationRepositoryTest.java
+++ b/backend/src/test/java/com/ody/notification/repository/NotificationRepositoryTest.java
@@ -49,7 +49,7 @@ void findAllMeetingLogsById() {
         notificationRepository.save(notification1);
         notificationRepository.save(notification2);
 
-        List<Notification> notifications = notificationRepository.findAllMeetingLogs(odyMeeting.getId());
+        List<Notification> notifications = notificationRepository.findAllMeetingLogsBeforeThanEqual(odyMeeting.getId(), LocalDateTime.now());
 
         assertThat(notifications.size()).isEqualTo(2);
     }
@@ -86,7 +86,7 @@ void findAllNotificationsById() {
         notificationRepository.save(pastNotification);
         notificationRepository.save(futureNotification);
 
-        List<Notification> notifications = notificationRepository.findAllMeetingLogs(odyMeeting.getId());
+        List<Notification> notifications = notificationRepository.findAllMeetingLogsBeforeThanEqual(odyMeeting.getId(), LocalDateTime.now());
 
         assertThat(notifications.size()).isOne();
     }