diff --git a/src/main/kotlin/com/ssak3/timeattack/external/firebase/FirebaseCloudMessageService.kt b/src/main/kotlin/com/ssak3/timeattack/external/firebase/FirebaseCloudMessageService.kt index 959b197d..ce49b2f7 100644 --- a/src/main/kotlin/com/ssak3/timeattack/external/firebase/FirebaseCloudMessageService.kt +++ b/src/main/kotlin/com/ssak3/timeattack/external/firebase/FirebaseCloudMessageService.kt @@ -22,7 +22,7 @@ class FirebaseCloudMessageService : Logger { Message.builder() .setToken(message.token) .setNotification( - Notification.builder().setTitle(TITLE).setBody(message.body).build(), + Notification.builder().setTitle(message.title).setBody(message.body).build(), ) .setApnsConfig(getAPNSConfig()) .setAndroidConfig(getAndroidConfig()) diff --git a/src/main/kotlin/com/ssak3/timeattack/notifications/controller/PushNotificationController.kt b/src/main/kotlin/com/ssak3/timeattack/notifications/controller/PushNotificationController.kt index ac2d932a..a221e952 100644 --- a/src/main/kotlin/com/ssak3/timeattack/notifications/controller/PushNotificationController.kt +++ b/src/main/kotlin/com/ssak3/timeattack/notifications/controller/PushNotificationController.kt @@ -32,6 +32,7 @@ class PushNotificationController( taskId = request.taskId.toLong(), body = request.body, route = request.route, + title = request.title, ), ) diff --git a/src/main/kotlin/com/ssak3/timeattack/notifications/controller/dto/PushNotificationSendRequest.kt b/src/main/kotlin/com/ssak3/timeattack/notifications/controller/dto/PushNotificationSendRequest.kt index bb352cfa..4f0c0ee0 100644 --- a/src/main/kotlin/com/ssak3/timeattack/notifications/controller/dto/PushNotificationSendRequest.kt +++ b/src/main/kotlin/com/ssak3/timeattack/notifications/controller/dto/PushNotificationSendRequest.kt @@ -6,4 +6,5 @@ data class PushNotificationSendRequest( val taskId: String, val body: String, val route: String, + val title: String = "SPURT", ) diff --git a/src/main/kotlin/com/ssak3/timeattack/notifications/domain/FcmMessage.kt b/src/main/kotlin/com/ssak3/timeattack/notifications/domain/FcmMessage.kt index 16bb2c19..569326a2 100644 --- a/src/main/kotlin/com/ssak3/timeattack/notifications/domain/FcmMessage.kt +++ b/src/main/kotlin/com/ssak3/timeattack/notifications/domain/FcmMessage.kt @@ -8,4 +8,5 @@ data class FcmMessage( val taskId: Long, val body: String, val route: String, + val title: String = "SPURT", ) diff --git a/src/main/kotlin/com/ssak3/timeattack/notifications/service/PushNotificationScheduler.kt b/src/main/kotlin/com/ssak3/timeattack/notifications/service/PushNotificationScheduler.kt index 14280f3e..d095c7fd 100644 --- a/src/main/kotlin/com/ssak3/timeattack/notifications/service/PushNotificationScheduler.kt +++ b/src/main/kotlin/com/ssak3/timeattack/notifications/service/PushNotificationScheduler.kt @@ -32,6 +32,7 @@ class PushNotificationScheduler( taskId = it.task.id, body = it.message, route = getRoute(it.order), + title = it.task.name, ) fcmPushNotificationService.sendNotification(message) diff --git a/src/main/kotlin/com/ssak3/timeattack/task/controller/TaskController.kt b/src/main/kotlin/com/ssak3/timeattack/task/controller/TaskController.kt index 082f8fff..d1b7b065 100644 --- a/src/main/kotlin/com/ssak3/timeattack/task/controller/TaskController.kt +++ b/src/main/kotlin/com/ssak3/timeattack/task/controller/TaskController.kt @@ -72,12 +72,12 @@ class TaskController( val changedStatusTask = taskService.changeTaskStatus(taskId, member.id, taskStatusRequest.status) // 몰입 상태가 되면 응원 문구 푸시 알림 요청 - if (taskStatusRequest.status == TaskStatus.FOCUSED) { + if (changedStatusTask.status == TaskStatus.FOCUSED) { taskService.requestSupportNotifications(taskId = taskId, memberId = member.id) } // 완료 상태가 되면 응원 문구 푸시 알림 비활성화 - if (taskStatusRequest.status == TaskStatus.COMPLETE) { + if (changedStatusTask.status == TaskStatus.COMPLETE) { taskService.inactiveSupportNotifications(taskId = taskId, memberId = member.id) } diff --git a/src/main/kotlin/com/ssak3/timeattack/task/scheduler/OverdueTaskStatusUpdateScheduler.kt b/src/main/kotlin/com/ssak3/timeattack/task/scheduler/OverdueTaskStatusUpdateScheduler.kt index 6c200d21..611d4b81 100644 --- a/src/main/kotlin/com/ssak3/timeattack/task/scheduler/OverdueTaskStatusUpdateScheduler.kt +++ b/src/main/kotlin/com/ssak3/timeattack/task/scheduler/OverdueTaskStatusUpdateScheduler.kt @@ -69,7 +69,7 @@ class OverdueTaskStatusUpdateScheduler( taskId = checkNotNull(task.id, "task id"), body = """ - PPT 만들고 대본 작성 마감일이 끝났어요! + ${task.name} 마감일이 끝났어요! 회고를 작성하며 과정을 돌아보세요. """.trimIndent(), route = "/retrospection",