푸시 알림 추가 (#206)

keongmini · keongmini · commit eb0e42880de1 · 2025-04-05T02:19:46.000+09:00
#205 ### Proposed Changes (PR 목적과 변경사항을 적어주세요.) ### Code Review Point (리뷰어가 중점적으로 보면 좋을 부분을 적어주세요.) (cherry picked from commit c13ac7e)
diff --git a/src/main/kotlin/com/ssak3/timeattack/notifications/domain/FcmNotificationConstants.kt b/src/main/kotlin/com/ssak3/timeattack/notifications/domain/FcmNotificationConstants.kt
@@ -1,21 +1,31 @@
 package com.ssak3.timeattack.notifications.domain
 
-import kotlin.random.Random
-
 object FcmNotificationConstants {
-    fun getMessage(order: Int): String {
-        val messages = messageTemplate[order] ?: throw IllegalStateException("message not exist for this number")
-        val index = Random.nextInt(messages.size)
-        return messages[index]
+    fun getMessage(index: Int): String {
+        val messages =
+            taskBeforeMessageTemplate[index] ?: throw IllegalStateException("message not exist for this number")
+        return messages
+    }
+
+    fun getRemindMessage(index: Int): String {
+        val message = remindMessageTemplate[index] ?: throw IllegalStateException("message not exist for this number")
+        return message
     }
 
     fun getSupportMessage(
         personaId: Int,
+        personaName: String,
+        nickname: String,
         index: Int,
     ): String {
-        val messages =
+        val supportMessage =
             supportMessageTemplate[personaId] ?: throw IllegalStateException("message not exist for this number")
-        return messages[index]
+        val message =
+            """
+            $personaName ${nickname}님
+            ${supportMessage[index]}
+            """.trimIndent()
+        return message
     }
 
     fun getRoute(order: Int): String {
@@ -31,36 +41,57 @@ object FcmNotificationConstants {
 
     private const val REMINDER_LIMIT = 3
 
-    private val messageTemplate =
+    private val taskBeforeMessageTemplate =
         mapOf(
             0 to
-                listOf(
-                    """
-                    작업 시간이 다 되었어요!
-                    작은 행동부터 시작해볼까요?
-                    """.trimIndent(),
-                ),
+                """
+                작업 시간이 다 되었어요!
+                작은 행동부터 시작해볼까요?
+                """.trimIndent(),
             1 to
-                listOf(
-                    """
-                    이제 두 번의 기회만 남았어요!
-                    미루기 전에 얼른 시작해볼까요?
-                    """.trimIndent(),
-                ),
+                """
+                아직 할 일을 시작하지 않으셨네요.
+                그리 어렵지 않아요. 1분만 투자해볼까요?
+                """.trimIndent(),
             2 to
-                listOf(
-                    """
-                    한번만 더 알림오고 끝이에요!
-                    작업을 미루기 전에 얼른 시작해보세요!
-                    """.trimIndent(),
-                ),
+                """
+                혹시 까먹으셨나요? 아직 시작하지 않으셨어요!
+                시작 타이밍, 지금 딱 좋아요. 기회는 계속 안 옵니다!
+                """.trimIndent(),
             3 to
-                listOf(
-                    """
-                    이게 마지막 기회에요!
-                    더 미루면 알림도 포기할거에요. 당장 시작하세요!
-                    """.trimIndent(),
-                ),
+                """
+                이제 3번 중 2번 남았습니다. 더 미루면 놓쳐요!
+                다음 알림까진 2분… 진짜 시작해볼까요?
+                """.trimIndent(),
+            4 to
+                """
+                마지막 기회 하나 남았습니다. 진짜 이번엔 시작해야 해요.
+                이제 끝입니다. 알림은 여기까지만 참을게요!
+                """.trimIndent(),
+            5 to
+                """
+                더 이상 알림은 없습니다. 지금이 진짜 마지막 찬스 🔥
+                지금 안 하면 오늘도 미룸 예약!
+                """.trimIndent(),
+        )
+
+    private val remindMessageTemplate =
+        mapOf(
+            0 to
+                """
+                이제 두 번의 기회만 남았어요!
+                미루기 전에 얼른 시작해볼까요?
+                """.trimIndent(),
+            1 to
+                """
+                한번만 더 알림오고 끝이에요!
+                작업을 미루기 전에 얼른 시작해보세요!
+                """.trimIndent(),
+            2 to
+                """
+                이게 마지막 기회에요!
+                더 미루면 알림도 포기할거에요. 당장 시작하세요!
+                """.trimIndent(),
         )
 
     /**
diff --git a/src/main/kotlin/com/ssak3/timeattack/notifications/service/PushNotificationListener.kt b/src/main/kotlin/com/ssak3/timeattack/notifications/service/PushNotificationListener.kt
@@ -3,6 +3,7 @@ package com.ssak3.timeattack.notifications.service
 import com.ssak3.timeattack.common.utils.Logger
 import com.ssak3.timeattack.member.service.MemberService
 import com.ssak3.timeattack.notifications.domain.FcmNotificationConstants.getMessage
+import com.ssak3.timeattack.notifications.domain.FcmNotificationConstants.getRemindMessage
 import com.ssak3.timeattack.notifications.domain.FcmNotificationConstants.getSupportMessage
 import com.ssak3.timeattack.notifications.domain.PushNotification
 import com.ssak3.timeattack.task.service.TaskService
@@ -33,16 +34,18 @@ class PushNotificationListener(
         val member = memberService.getMemberById(event.memberId)
         val task = taskService.getTaskById(event.taskId)
 
-        val pushNotification =
-            PushNotification(
-                member = member,
-                task = task,
-                scheduledAt = event.alarmTime.withSecond(0),
-                order = 0,
-                message = getMessage(0),
-            )
+        val pushNotifications =
+            event.alarmTimes.mapIndexed { i, alarmTime ->
+                PushNotification(
+                    member = member,
+                    task = task,
+                    scheduledAt = alarmTime,
+                    order = 0,
+                    message = getMessage(i),
+                )
+            }
 
-        pushNotificationService.save(pushNotification)
+        pushNotificationService.saveAll(pushNotifications)
     }
 
     @EventListener
@@ -51,14 +54,18 @@ class PushNotificationListener(
         val member = memberService.getMemberById(event.memberId)
         val task = taskService.getTaskById(event.taskId)
 
+        // 기존 알림 제거
+        pushNotificationService.delete(task)
+
+        // 리마인드 알림 등록
         val pushNotifications: List<PushNotification> =
-            event.alarmTimes.map {
+            event.alarmTimes.mapIndexed { i, alarmTime ->
                 PushNotification(
                     member = member,
                     task = task,
-                    scheduledAt = it.alarmTime.withSecond(0),
-                    order = it.order,
-                    message = getMessage(it.order),
+                    scheduledAt = alarmTime,
+                    order = i + 1,
+                    message = getRemindMessage(i),
                 )
             }
 
@@ -104,14 +111,23 @@ class PushNotificationListener(
         val member = memberService.getMemberById(event.memberId)
         val task = taskService.getTaskById(event.taskId)
 
+        // 기존 알림 제거
+        pushNotificationService.delete(task)
+
         val pushNotifications: List<PushNotification> =
             event.alarmTimes.map {
                 PushNotification(
                     member = member,
                     task = task,
                     scheduledAt = it.alarmTime.withSecond(0),
                     order = -1,
-                    message = getSupportMessage(personaId = task.persona.id.toInt(), index = it.index),
+                    message =
+                        getSupportMessage(
+                            personaId = task.persona.id.toInt(),
+                            personaName = task.persona.name,
+                            nickname = member.nickname,
+                            index = it.index,
+                        ),
                 )
             }
 
diff --git a/src/main/kotlin/com/ssak3/timeattack/task/scheduler/OverdueTaskStatusUpdateScheduler.kt b/src/main/kotlin/com/ssak3/timeattack/task/scheduler/OverdueTaskStatusUpdateScheduler.kt
@@ -4,13 +4,19 @@ import com.ssak3.timeattack.common.exception.ApplicationException
 import com.ssak3.timeattack.common.exception.ApplicationExceptionType
 import com.ssak3.timeattack.common.utils.Logger
 import com.ssak3.timeattack.common.utils.checkNotNull
+import com.ssak3.timeattack.external.firebase.domain.DevicePlatform
+import com.ssak3.timeattack.notifications.domain.FcmMessage
+import com.ssak3.timeattack.notifications.service.FcmDeviceService
+import com.ssak3.timeattack.notifications.service.FcmPushNotificationService
+import com.ssak3.timeattack.retrospection.repository.RetrospectionRepository
 import com.ssak3.timeattack.task.domain.Task
 import com.ssak3.timeattack.task.domain.TaskStatus
 import com.ssak3.timeattack.task.domain.TaskStatus.Companion.statusesToFail
 import com.ssak3.timeattack.task.domain.TaskStatus.FAIL
 import com.ssak3.timeattack.task.domain.TaskStatus.FOCUSED
 import com.ssak3.timeattack.task.repository.TaskRepository
 import org.springframework.context.event.EventListener
+import org.springframework.data.repository.findByIdOrNull
 import org.springframework.scheduling.TaskScheduler
 import org.springframework.stereotype.Service
 import org.springframework.transaction.support.TransactionTemplate
@@ -19,6 +25,9 @@ import java.time.ZoneId
 @Service
 class OverdueTaskStatusUpdateScheduler(
     private val taskRepository: TaskRepository,
+    private val retrospectionRepository: RetrospectionRepository,
+    private val fcmPushNotificationService: FcmPushNotificationService,
+    private val fcmDeviceService: FcmDeviceService,
     private val taskScheduler: TaskScheduler,
     private val transactionTemplate: TransactionTemplate,
 ) : Logger {
@@ -34,6 +43,41 @@ class OverdueTaskStatusUpdateScheduler(
         )
 
         logger.info("Task(${task.id}) 상태 체크 스케줄러 등록 완료: 예정 실행 시간 = $scheduledTime")
+
+        val scheduledTimeForPushNotification = task.dueDatetime.plusMinutes(30)
+        taskScheduler.schedule(
+            { checkRetrospectionAndSendPushNotification(task.id) },
+            scheduledTimeForPushNotification.atZone(ZoneId.systemDefault()).toInstant(),
+        )
+
+        logger.info("Task(${task.id}) 회고 푸시 알림 등록 완료: 예정 실행 시간 = $scheduledTime")
+    }
+
+    private fun checkRetrospectionAndSendPushNotification(taskId: Long) {
+        val isExist = retrospectionRepository.findByTaskId(taskId) != null
+        val task =
+            taskRepository.findByIdOrNull(taskId)
+                ?: throw ApplicationException(ApplicationExceptionType.TASK_NOT_FOUND_BY_ID, taskId)
+        val memberId = checkNotNull(task.member.id, "memberId")
+
+        if (!isExist) {
+            fcmDeviceService.getDevicesByMember(memberId).forEach { device ->
+                val message =
+                    FcmMessage(
+                        token = device.fcmRegistrationToken,
+                        platform = DevicePlatform.valueOf(device.devicePlatform.toString()),
+                        taskId = checkNotNull(task.id, "task id"),
+                        body =
+                            """
+                            PPT 만들고 대본 작성 마감일이 끝났어요!
+                            회고를 작성하며 과정을 돌아보세요.
+                            """.trimIndent(),
+                        route = "/retrospection",
+                    )
+
+                fcmPushNotificationService.sendNotification(message)
+            }
+        }
     }
 
     /**
diff --git a/src/main/kotlin/com/ssak3/timeattack/task/service/TaskService.kt b/src/main/kotlin/com/ssak3/timeattack/task/service/TaskService.kt
@@ -21,7 +21,6 @@ import com.ssak3.timeattack.task.repository.TaskModeRepository
 import com.ssak3.timeattack.task.repository.TaskRepository
 import com.ssak3.timeattack.task.repository.TaskTypeRepository
 import com.ssak3.timeattack.task.service.events.DeleteTaskNotificationEvent
-import com.ssak3.timeattack.task.service.events.ReminderAlarm
 import com.ssak3.timeattack.task.service.events.ReminderSaveEvent
 import com.ssak3.timeattack.task.service.events.SupportAlarm
 import com.ssak3.timeattack.task.service.events.SupportNotificationSaveEvent
@@ -102,11 +101,12 @@ class TaskService(
         val savedTaskEntity = taskRepository.save(task.toEntity())
 
         // 4. Task 이벤트 발행
+        val alarmTimes = getAlarmTimes(scheduledTaskRequest.triggerActionAlarmTime)
         val triggerActionNotificationSaveEvent =
             TriggerActionNotificationSaveEvent(
                 checkNotNull(member.id),
                 checkNotNull(savedTaskEntity.id),
-                scheduledTaskRequest.triggerActionAlarmTime,
+                alarmTimes,
             )
         eventPublisher.publishEvent(triggerActionNotificationSaveEvent)
 
@@ -119,6 +119,10 @@ class TaskService(
         return savedTask
     }
 
+    // 2분단위로 첫번째 알림 + 5번 추가 알림 = 6번
+    private fun getAlarmTimes(startTime: LocalDateTime): List<LocalDateTime> =
+        generateSequence(startTime) { it.plusMinutes(2) }.take(6).map { it.withSecond(0).withNano(0) }.toList()
+
     private fun findPersonaByTaskTypeAndTaskMode(
         taskType: String,
         taskMode: String,
@@ -271,7 +275,7 @@ class TaskService(
                         taskHoldOffRequest.remindInterval * order.toLong(),
                     )
                 task.validateReminderAlarmTime(nextReminderAlarmTime)
-                ReminderAlarm(order, nextReminderAlarmTime)
+                nextReminderAlarmTime
             }
 
         // 3. 리마인더 알림 저장 이벤트 발행
diff --git a/src/main/kotlin/com/ssak3/timeattack/task/service/events/ReminderSaveEvent.kt b/src/main/kotlin/com/ssak3/timeattack/task/service/events/ReminderSaveEvent.kt
@@ -5,10 +5,5 @@ import java.time.LocalDateTime
 data class ReminderSaveEvent(
     val memberId: Long,
     val taskId: Long,
-    val alarmTimes: List<ReminderAlarm>,
-)
-
-data class ReminderAlarm(
-    val order: Int,
-    val alarmTime: LocalDateTime,
+    val alarmTimes: List<LocalDateTime>,
 )
diff --git a/src/main/kotlin/com/ssak3/timeattack/task/service/events/TriggerActionNotificationSaveEvent.kt b/src/main/kotlin/com/ssak3/timeattack/task/service/events/TriggerActionNotificationSaveEvent.kt
@@ -5,5 +5,5 @@ import java.time.LocalDateTime
 class TriggerActionNotificationSaveEvent(
     val memberId: Long,
     val taskId: Long,
-    val alarmTime: LocalDateTime,
+    val alarmTimes: List<LocalDateTime>,
 )
diff --git a/src/test/kotlin/com/ssak3/timeattack/task/service/TaskServiceEventTest.kt b/src/test/kotlin/com/ssak3/timeattack/task/service/TaskServiceEventTest.kt
@@ -15,7 +15,6 @@ import com.ssak3.timeattack.task.repository.TaskRepository
 import com.ssak3.timeattack.task.repository.TaskTypeRepository
 import com.ssak3.timeattack.task.repository.entity.TaskModeEntity
 import com.ssak3.timeattack.task.repository.entity.TaskTypeEntity
-import com.ssak3.timeattack.task.service.events.ReminderAlarm
 import com.ssak3.timeattack.task.service.events.ReminderSaveEvent
 import io.mockk.every
 import org.assertj.core.api.Assertions.assertThat
@@ -138,9 +137,9 @@ class TaskServiceEventTest(
 
         val expectedReminderAlarms =
             listOf(
-                ReminderAlarm(1, LocalDateTime.of(2025, 1, 1, 0, 15, 0)),
-                ReminderAlarm(2, LocalDateTime.of(2025, 1, 1, 0, 30, 0)),
-                ReminderAlarm(3, LocalDateTime.of(2025, 1, 1, 0, 45, 0)),
+                LocalDateTime.of(2025, 1, 1, 0, 15, 0),
+                LocalDateTime.of(2025, 1, 1, 0, 30, 0),
+                LocalDateTime.of(2025, 1, 1, 0, 45, 0),
             )
         assertThat(reminderSaveEvent.alarmTimes).containsExactlyElementsOf(expectedReminderAlarms)
     }

Original file line number	Diff line number	Diff line change
`@@ -5,5 +5,5 @@ import java.time.LocalDateTime`
`5`	`5`	`class TriggerActionNotificationSaveEvent(`
`6`	`6`	`val memberId: Long,`
`7`	`7`	`val taskId: Long,`
`8`		`- val alarmTime: LocalDateTime,`
	`8`	`+ val alarmTimes: List<LocalDateTime>,`
`9`	`9`	`)`