Merge pull request #155 from UnivApp/feature/notification-refactor7

refactor: 알림 구현 리팩토링
UnivApp · Oct 28, 2024 · 4e500f3 · 4e500f3
2 parents 0f646eb + c824755
commit 4e500f3
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/src/main/java/yerong/wedle/calendar/service/CalendarEventService.java b/src/main/java/yerong/wedle/calendar/service/CalendarEventService.java
@@ -46,8 +46,13 @@ public List<CalendarEventResponse> convertToDto(CalendarEvent calendarEvent) {
                 .orElseThrow(MemberNotFoundException::new);
 
 
-        Notification notification = notificationRepository.findByEventAndMember(calendarEvent, member).orElseThrow(NotificationNotFoundException::new);;
-        boolean notificationActive = notification != null && notification.isActive();
+        Notification notification = notificationRepository.findByEventAndMember(calendarEvent, member);
+        boolean notificationActive;
+        if(notification != null) {
+            notificationActive = notification.isActive();
+        } else {
+            notificationActive = false;
+        }
         Long notificationId = notification != null ? notification.getNotificationId() : null;
 
         if (endDate == null) {

diff --git a/src/main/java/yerong/wedle/notification/repository/NotificationRepository.java b/src/main/java/yerong/wedle/notification/repository/NotificationRepository.java
@@ -13,7 +13,7 @@ public interface NotificationRepository extends JpaRepository<Notification, Long
 
     List<Notification> findByNotificationDate(LocalDate notification);
 
-    Optional<Notification> findByEventAndMember(CalendarEvent calendarEvent, Member member);
+    Notification findByEventAndMember(CalendarEvent calendarEvent, Member member);
 
     List<Notification> findByMember(Member member);
 }