fix: "안쓰는 class 삭제 및 알림 Enum 간소화 처리"

to-be-healthy · Jun 5, 2024 · a4868bd · a4868bd
1 parent e1a2879
commit a4868bd
Show file tree

Hide file tree

Showing 9 changed files with 20 additions and 62 deletions.
diff --git a/src/main/java/com/tobe/healthy/common/event/CustomEventListener.java b/src/main/java/com/tobe/healthy/common/event/CustomEventListener.java
@@ -18,10 +18,10 @@
 import org.springframework.transaction.event.TransactionalEventListener;
 
 import java.time.LocalDateTime;
-import java.time.format.DateTimeFormatter;
 import java.util.List;
 import java.util.Optional;
 
+import static com.tobe.healthy.common.LessonTimeFormatter.lessonStartDateTimeFormatter;
 import static com.tobe.healthy.config.error.ErrorCode.SCHEDULE_NOT_FOUND;
 import static com.tobe.healthy.course.domain.entity.CourseHistoryType.RESERVATION;
 import static com.tobe.healthy.notification.domain.entity.NotificationType.WAITING;
@@ -32,7 +32,6 @@
 @RequiredArgsConstructor
 public class CustomEventListener {
 
-    private static final DateTimeFormatter formatter = DateTimeFormatter.ofPattern("M월 d일(E) h시");
     private final int ONE_LESSON = 1;
 
     private final CourseService courseService;
@@ -47,7 +46,7 @@ public class CustomEventListener {
     public void handleEvent(CustomEvent event) {
         switch (event.getType()) {
             case SCHEDULE_CANCEL -> changeWaitingToCompleted((Long) event.getResult());
-            case SCHEDULE_NOTIFICATION, LESSON_HISTORY_NOTIFICATION -> sendNotification((CommandSendNotification) event.getResult());
+            case NOTIFICATION -> sendNotification((CommandSendNotification) event.getResult());
         }
     }
 
@@ -72,7 +71,7 @@ public void changeWaitingToCompleted(Long scheduleId) {
 
                     CommandSendNotification request = new CommandSendNotification(
                             WAITING.getDescription(),
-                            String.format("%s 대기 중이던 예약이 확정되었어요!", LocalDateTime.of(schedule.getLessonDt(), schedule.getLessonStartTime()).format(formatter)),
+                            String.format("%s 대기 중이던 예약이 확정되었어요!", LocalDateTime.of(schedule.getLessonDt(), schedule.getLessonStartTime()).format(lessonStartDateTimeFormatter())),
                             List.of(schedule.getApplicant().getId()),
                             WAITING,
                             null

diff --git a/src/main/java/com/tobe/healthy/common/event/EventType.java b/src/main/java/com/tobe/healthy/common/event/EventType.java
@@ -8,8 +8,7 @@
 public enum EventType {
 
     SCHEDULE_CANCEL("트레이너 또는 학생이 수업을 취소한 경우"),
-    SCHEDULE_NOTIFICATION("학생이 수업을 신청한 경우 알림 전송"),
-    LESSON_HISTORY_NOTIFICATION("수업일지에 댓글/답글을 등록했을 때 알림 전송");
+    NOTIFICATION("사용자에게 알림 전송");
 
     private final String description;
 

diff --git a/src/main/java/com/tobe/healthy/schedule/application/CommonScheduleService.java b/src/main/java/com/tobe/healthy/schedule/application/CommonScheduleService.java
@@ -18,8 +18,8 @@
 import java.time.format.DateTimeFormatter;
 import java.util.List;
 
+import static com.tobe.healthy.common.event.EventType.NOTIFICATION;
 import static com.tobe.healthy.common.event.EventType.SCHEDULE_CANCEL;
-import static com.tobe.healthy.common.event.EventType.SCHEDULE_NOTIFICATION;
 import static com.tobe.healthy.config.error.ErrorCode.*;
 import static com.tobe.healthy.notification.domain.entity.NotificationType.CANCEL;
 import static com.tobe.healthy.notification.domain.entity.NotificationType.RESERVE;
@@ -60,7 +60,7 @@ public ScheduleIdInfo reserveSchedule(Long scheduleId, Long memberId) {
                 null
         );
 
-        notificationPublisher.publish(notification, SCHEDULE_NOTIFICATION);
+        notificationPublisher.publish(notification, NOTIFICATION);
 
         return ScheduleIdInfo.create(schedule, getScheduleTimeText(schedule.getLessonStartTime()));
     }
@@ -81,7 +81,7 @@ public ScheduleIdInfo cancelMemberSchedule(Long scheduleId, Long memberId) {
                 null
         );
 
-        notificationPublisher.publish(notification, SCHEDULE_NOTIFICATION);
+        notificationPublisher.publish(notification, NOTIFICATION);
 
         ScheduleIdInfo idInfo = ScheduleIdInfo.create(schedule, getScheduleTimeText(schedule.getLessonStartTime()));
         schedule.cancelMemberSchedule();

diff --git a/src/main/kotlin/com/tobe/healthy/common/LessonTimeFormatter.kt b/src/main/kotlin/com/tobe/healthy/common/LessonTimeFormatter.kt
@@ -30,4 +30,9 @@ object LessonTimeFormatter {
         val formatter = DateTimeFormatter.ofPattern("MM월 dd일 E요일", Locale.KOREAN)
         return lessonDt?.format(formatter)
     }
-}
+
+    @JvmStatic
+    fun lessonStartDateTimeFormatter(): DateTimeFormatter {
+        return DateTimeFormatter.ofPattern("M월 d일(E) h시")
+    }
+}
diff --git a/src/main/kotlin/com/tobe/healthy/lessonhistory/application/LessonHistoryCommandService.kt b/src/main/kotlin/com/tobe/healthy/lessonhistory/application/LessonHistoryCommandService.kt
@@ -6,7 +6,7 @@ import com.tobe.healthy.common.FileUpload.FILE_TEMP_UPLOAD_TIMEOUT
 import com.tobe.healthy.common.Utils.createFileName
 import com.tobe.healthy.common.Utils.createObjectMetadata
 import com.tobe.healthy.common.event.CustomEventPublisher
-import com.tobe.healthy.common.event.EventType.LESSON_HISTORY_NOTIFICATION
+import com.tobe.healthy.common.event.EventType.NOTIFICATION
 import com.tobe.healthy.common.redis.RedisKeyPrefix.TEMP_FILE_URI
 import com.tobe.healthy.common.redis.RedisService
 import com.tobe.healthy.config.error.CustomException
@@ -77,7 +77,7 @@ class LessonHistoryCommandService(
             lessonHistory.id
         )
 
-        notificationPublisher.publish(notification, LESSON_HISTORY_NOTIFICATION)
+        notificationPublisher.publish(notification, NOTIFICATION)
 
         return CommandRegisterLessonHistoryResult.from(lessonHistory, files)
     }
@@ -171,7 +171,7 @@ class LessonHistoryCommandService(
                 lessonHistory.id
         )
 
-        notificationPublisher.publish(notification, LESSON_HISTORY_NOTIFICATION)
+        notificationPublisher.publish(notification, NOTIFICATION)
 
         return CommandRegisterCommentResult.from(lessonHistoryComment, files)
     }
@@ -208,7 +208,7 @@ class LessonHistoryCommandService(
             lessonHistory.id
         )
 
-        notificationPublisher.publish(notification, LESSON_HISTORY_NOTIFICATION)
+        notificationPublisher.publish(notification, NOTIFICATION)
 
         lessonHistoryCommentRepository.save(entity)
 

diff --git a/src/main/kotlin/com/tobe/healthy/notification/domain/dto/in/RetrieveNotification.kt b/src/main/kotlin/com/tobe/healthy/notification/domain/dto/in/RetrieveNotification.kt
diff --git a/...n/kotlin/com/tobe/healthy/notification/domain/dto/out/RetrieveNotificationDetailResult.kt b/...n/kotlin/com/tobe/healthy/notification/domain/dto/out/RetrieveNotificationDetailResult.kt
diff --git a/src/main/kotlin/com/tobe/healthy/schedule/application/TrainerScheduleCommandService.kt b/src/main/kotlin/com/tobe/healthy/schedule/application/TrainerScheduleCommandService.kt
@@ -1,7 +1,7 @@
 package com.tobe.healthy.schedule.application
 
 import com.tobe.healthy.common.event.CustomEventPublisher
-import com.tobe.healthy.common.event.EventType
+import com.tobe.healthy.common.event.EventType.NOTIFICATION
 import com.tobe.healthy.common.event.EventType.SCHEDULE_CANCEL
 import com.tobe.healthy.config.error.CustomException
 import com.tobe.healthy.config.error.ErrorCode.*
@@ -210,7 +210,7 @@ class TrainerScheduleCommandService(
                 RESERVE
         )
 
-        notificationPublisher.publish(notification, EventType.SCHEDULE_NOTIFICATION)
+        notificationPublisher.publish(notification, NOTIFICATION)
 
         return CommandRegisterScheduleByStudentResult.from(schedule, findStudent)
     }
@@ -236,7 +236,7 @@ class TrainerScheduleCommandService(
             CANCEL
         )
 
-        notificationPublisher.publish(notification, EventType.SCHEDULE_NOTIFICATION)
+        notificationPublisher.publish(notification, NOTIFICATION)
 
         eventPublisher.publish(schedule.id, SCHEDULE_CANCEL)
 

diff --git a/src/main/resources/static/firebase-messaging-sw.js b/src/main/resources/static/firebase-messaging-sw.js
@@ -13,19 +13,6 @@ firebase.initializeApp({
 
 const messaging = firebase.messaging();
 
-messaging.onBackgroundMessage((payload) => {
-    console.log('[firebase-messaging-sw.js] Received background message ', payload);
-
-    // Customize notification here
-    const notificationTitle = 'Background Message Title';
-    const notificationOptions = {
-        body: 'Background Message body.',
-        icon: '/firebase-logo.png'
-    };
-
-    self.registration.showNotification(notificationTitle, notificationOptions);
-});
-
 self.addEventListener('push', function(event) {
     var message = event.data ? event.data.json() : {};
     event.waitUntil(