[Refactor&Feature] FCM Sender & Notification Domain

pida-clients/aws-client/src/main/kotlin/com/pida/client/aws/s3/AwsS3Client.kt

@@ -2,7 +2,11 @@ package com.pida.client.aws.s3
 
 import org.springframework.stereotype.Component
 import software.amazon.awssdk.services.s3.S3Client
-import software.amazon.awssdk.services.s3.model.*
+import software.amazon.awssdk.services.s3.model.GetObjectRequest
+import software.amazon.awssdk.services.s3.model.ListObjectsV2Request
+import software.amazon.awssdk.services.s3.model.ListObjectsV2Response
+import software.amazon.awssdk.services.s3.model.PutObjectRequest
+import software.amazon.awssdk.services.s3.model.S3Object
 import software.amazon.awssdk.services.s3.presigner.S3Presigner
 import software.amazon.awssdk.services.s3.presigner.model.GetObjectPresignRequest
 import software.amazon.awssdk.services.s3.presigner.model.PutObjectPresignRequest

pida-clients/notification/src/main/kotlin/com/pida/client/notification/FcmClientRepository.kt

@@ -16,6 +16,7 @@ class FcmClientRepository(
                         it.fcmToken,
                         it.title,
                         it.body,
+                        it.destination,
                     )
                 }.toList()
 
@@ -24,6 +25,7 @@ class FcmClientRepository(
             firebaseCloudMessageSender.sendEachForMulticastAll(
                 fcmRequests[0].title,
                 fcmRequests[0].body,
+                fcmRequests[0].destination,
                 tokens,
             )
 
@@ -34,6 +36,7 @@ class FcmClientRepository(
                     fcmToken = pushMessage.fcmToken,
                     title = pushMessage.title,
                     body = pushMessage.body,
+                    destination = pushMessage.destination,
                     tryCount = pushMessage.tryCount + 1,
                     sent = batchResult?.responses?.get(index)?.isSuccessful ?: false,
                 )
@@ -47,13 +50,15 @@ class FcmClientRepository(
                 fcmToken = firebaseCloudMessage.fcmToken,
                 title = firebaseCloudMessage.title,
                 body = firebaseCloudMessage.body,
+                destination = firebaseCloudMessage.destination,
             )
         val sendResult = firebaseCloudMessageSender.sendAsync(request).get()
         return FirebaseCloudMessage(
             fcmKey = firebaseCloudMessage.fcmKey,
             fcmToken = firebaseCloudMessage.fcmToken,
             title = firebaseCloudMessage.title,
             body = firebaseCloudMessage.body,
+            destination = firebaseCloudMessage.destination,
             tryCount = firebaseCloudMessage.tryCount + 1,
             sent = sendResult.isNotBlank(),
         )

pida-clients/notification/src/main/kotlin/com/pida/client/notification/FcmSendRequest.kt

@@ -4,4 +4,5 @@ data class FcmSendRequest(
     val fcmToken: String,
     val title: String,
     val body: String,
+    val destination: String,
 )

pida-clients/notification/src/main/kotlin/com/pida/client/notification/FirebaseCloudMessageSender.kt

@@ -35,10 +35,11 @@ class FirebaseCloudMessageSender(
             ).setApnsConfig(
                 ApnsConfig
                     .builder()
+                    .putCustomData("destination", request.destination)
                     .setAps(
                         Aps
                             .builder()
-                            .setAlert("${request.title}\n${request.body}")
+                            .setAlert(request.body)
                             .setBadge(1)
                             .setSound("default")
                             .build(),
@@ -48,6 +49,7 @@ class FirebaseCloudMessageSender(
     fun sendEachForMulticastAll(
         title: String,
         body: String,
+        destination: String,
         fcmTokens: List<String>,
     ): BatchResponse? {
         val notification =
@@ -64,10 +66,11 @@ class FirebaseCloudMessageSender(
                 .setApnsConfig(
                     ApnsConfig
                         .builder()
+                        .putCustomData("destination", destination)
                         .setAps(
                             Aps
                                 .builder()
-                                .setAlert("$title\n$body")
+                                .setAlert(body)
                                 .setBadge(1)
                                 .setSound("default")
                                 .build(),

pida-core/core-api/src/main/resources/application.yml

@@ -2,8 +2,6 @@ spring.application.name: pida-server
 spring.profiles.active: ${SPRING_PROFILES_ACTIVE}
 
 spring:
-  main:
-    lazy-initialization: true
   threads:
     virtual:
       enabled: true

pida-core/core-domain/src/main/kotlin/com/pida/notification/CreateNotificationStoredCommand.kt

@@ -0,0 +1,11 @@
+package com.pida.notification
+
+data class CreateNotificationStoredCommand(
+    val notificationStoredKey: String,
+    val userId: Long,
+    val type: NotificationType,
+    val parameterValue: String,
+    val topic: String,
+    val contents: String,
+    val readStatus: ReadStatus = ReadStatus.UNREAD,
+)

pida-core/core-domain/src/main/kotlin/com/pida/notification/FcmSender.kt

@@ -22,6 +22,7 @@ class FcmSender(
                         fcmToken = it.fcmToken,
                         title = it.title,
                         body = it.body,
+                        destination = it.destination,
                         tryCount = 0,
                         sent = false,
                     )

pida-core/core-domain/src/main/kotlin/com/pida/notification/FirebaseCloudMessage.kt

@@ -5,6 +5,7 @@ data class FirebaseCloudMessage(
     val fcmToken: String,
     val title: String,
     val body: String,
+    val destination: String,
     val tryCount: Int,
     val sent: Boolean,
 )

pida-core/core-domain/src/main/kotlin/com/pida/notification/NewFirebaseCloudMessage.kt

@@ -4,4 +4,5 @@ data class NewFirebaseCloudMessage(
     val fcmToken: String,
     val title: String,
     val body: String,
+    val destination: String,
 )

pida-core/core-domain/src/main/kotlin/com/pida/notification/NotificationService.kt

@@ -0,0 +1,42 @@
+package com.pida.notification
+
+import com.pida.support.cursor.Cursor
+import com.pida.support.cursor.CursorRequest
+import org.springframework.stereotype.Service
+
+@Service
+class NotificationService(
+    private val notificationStoredAppender: NotificationStoredAppender,
+    private val notificationStoredReader: NotificationStoredReader,
+    private val notificationStoredUpdater: NotificationStoredUpdater,
+    private val notificationStoredKeyGenerator: NotificationStoredKeyGenerator,
+) {
+    fun append(notificationStored: NotificationStored.Create): NotificationStored.Info =
+        notificationStoredAppender.append(
+            notificationStored.copy(
+                notificationStoredKey = notificationStoredKeyGenerator.generate(),
+            ),
+        )
+
+    fun appendAll(createAll: List<CreateNotificationStoredCommand>): List<NotificationStored.Info> =
+        notificationStoredAppender.appendAll(
+            createAll.map { notification ->
+                NotificationStored.Create(
+                    notificationStoredKey = notificationStoredKeyGenerator.generate(),
+                    userId = notification.userId,
+                    type = notification.type,
+                    parameterValue = notification.parameterValue,
+                    topic = notification.topic,
+                    contents = notification.contents,
+                    readStatus = ReadStatus.UNREAD,
+                )
+            },
+        )
+
+    fun findAllNotifications(
+        userId: Long,
+        cursorRequest: CursorRequest,
+    ): Cursor<NotificationStored.Info> = notificationStoredReader.findAllBy(userId, cursorRequest)
+
+    fun markAsRead(notificationId: Long) = notificationStoredUpdater.markAsRead(notificationId)
+}

pida-core/core-domain/src/main/kotlin/com/pida/notification/NotificationStored.kt

@@ -0,0 +1,39 @@
+package com.pida.notification
+
+sealed class NotificationStored {
+    data class Create(
+        val notificationStoredKey: String,
+        val userId: Long,
+        val type: NotificationType,
+        val parameterValue: String,
+        val topic: String,
+        val contents: String,
+        val readStatus: ReadStatus,
+    )
+
+    data class Info(
+        val id: Long,
+        val notificationStoredKey: String,
+        val userId: Long,
+        val type: NotificationType,
+        val parameterValue: String,
+        val topic: String,
+        val contents: String,
+        val readStatus: ReadStatus,
+        val createdAt: String,
+    )
+
+    data class Result(
+        val id: Long,
+        val userId: Long,
+        val nickname: String?,
+        val spotName: String?,
+        val site: String?,
+        val type: String,
+        val parameterValue: String,
+        val topic: String,
+        val contents: String,
+        val readStatus: ReadStatus,
+        val createdAt: String,
+    )
+}

pida-core/core-domain/src/main/kotlin/com/pida/notification/NotificationStoredAppender.kt

@@ -0,0 +1,12 @@
+package com.pida.notification
+
+import org.springframework.stereotype.Component
+
+@Component
+class NotificationStoredAppender(
+    private val notificationStoredRepository: NotificationStoredRepository,
+) {
+    fun append(create: NotificationStored.Create): NotificationStored.Info = notificationStoredRepository.save(create)
+
+    fun appendAll(createAll: List<NotificationStored.Create>) = notificationStoredRepository.saveAll(createAll)
+}

pida-core/core-domain/src/main/kotlin/com/pida/notification/NotificationStoredKeyGenerator.kt

@@ -0,0 +1,19 @@
+package com.pida.notification
+
+import org.springframework.stereotype.Component
+import java.time.LocalDate
+import java.time.format.DateTimeFormatter
+import java.util.UUID
+
+@Component
+class NotificationStoredKeyGenerator {
+    companion object {
+        private val FORMAT_YYYYMMDD = DateTimeFormatter.ofPattern("yyyyMMdd")
+    }
+
+    fun generate(): String = "${generateDate()}_NHK_${generateUUID()}"
+
+    private fun generateUUID(): String = UUID.randomUUID().toString().replace("-", "")
+
+    private fun generateDate(): String = FORMAT_YYYYMMDD.format(LocalDate.now())
+}

pida-core/core-domain/src/main/kotlin/com/pida/notification/NotificationStoredReader.kt

@@ -0,0 +1,15 @@
+package com.pida.notification
+
+import com.pida.support.cursor.Cursor
+import com.pida.support.cursor.CursorRequest
+import org.springframework.stereotype.Component
+
+@Component
+class NotificationStoredReader(
+    private val notificationStoredRepository: NotificationStoredRepository,
+) {
+    fun findAllBy(
+        userId: Long,
+        cursorRequest: CursorRequest,
+    ): Cursor<NotificationStored.Info> = notificationStoredRepository.findAllBy(userId, cursorRequest)
+}

pida-core/core-domain/src/main/kotlin/com/pida/notification/NotificationStoredRepository.kt

@@ -0,0 +1,29 @@
+package com.pida.notification
+
+import com.pida.support.cursor.Cursor
+import com.pida.support.cursor.CursorRequest
+
+interface NotificationStoredRepository {
+    fun save(notificationStored: NotificationStored.Create): NotificationStored.Info
+
+    fun saveAll(createAll: List<NotificationStored.Create>): List<NotificationStored.Info>
+
+    fun findById(notificationStoredId: Long): NotificationStored.Info
+
+    fun findByUserIdAndReadStatus(
+        userId: Long,
+        readStatus: ReadStatus,
+    ): List<NotificationStored.Info>
+
+    fun findAllBy(
+        userId: Long,
+        cursorRequest: CursorRequest,
+    ): Cursor<NotificationStored.Info>
+
+    fun countByUserIdAndReadStatus(
+        userId: Long,
+        readStatus: ReadStatus?,
+    ): Long
+
+    fun markAsRead(notificationId: Long)
+}

pida-core/core-domain/src/main/kotlin/com/pida/notification/NotificationStoredUpdater.kt

@@ -0,0 +1,10 @@
+package com.pida.notification
+
+import org.springframework.stereotype.Component
+
+@Component
+class NotificationStoredUpdater(
+    private val notificationStoredRepository: NotificationStoredRepository,
+) {
+    fun markAsRead(notificationId: Long) = notificationStoredRepository.markAsRead(notificationId)
+}

pida-core/core-domain/src/main/kotlin/com/pida/notification/NotificationType.kt

@@ -0,0 +1,16 @@
+package com.pida.notification
+
+enum class NotificationType {
+    ADMIN_PUSH, // 관리자 푸시
+    REGULAR, // 정기 푸시 알림 (화요일 오전 9시)
+    ;
+
+    companion object {
+        fun of(type: String): NotificationType =
+            when (type) {
+                "ADMIN_PUSH" -> ADMIN_PUSH
+                "REGULAR" -> REGULAR
+                else -> throw IllegalArgumentException("Unknown NotificationType: $type")
+            }
+    }
+}

pida-core/core-domain/src/main/kotlin/com/pida/notification/ReadStatus.kt

@@ -0,0 +1,16 @@
+package com.pida.notification
+
+enum class ReadStatus {
+    READ,
+    UNREAD,
+    ;
+
+    companion object {
+        fun of(readStatus: String): ReadStatus =
+            when (readStatus) {
+                "READ" -> READ
+                "UNREAD" -> UNREAD
+                else -> throw IllegalArgumentException("Unknown ReadStatus: $readStatus")
+            }
+    }
+}

pida-core/core-domain/src/main/kotlin/com/pida/support/cursor/Cursor.kt

@@ -0,0 +1,24 @@
+package com.pida.support.cursor
+
+data class Cursor<T>(
+    val content: List<T>,
+    val nextCursor: Long?,
+    val size: Long,
+) {
+    companion object {
+        const val DEFAULT_CURSOR = 0L
+        const val DEFAULT_SIZE = 20
+
+        fun <T> of(
+            content: List<T>,
+            nextCursor: Long?,
+            size: Long,
+        ): Cursor<T> {
+            require(size >= 0) { "size ($size)는 0 이상이어야 합니다" }
+            require(size >= content.size) {
+                "size ($size)는 content.size (${content.size})보다 작을 수 없습니다"
+            }
+            return Cursor(content, nextCursor, size)
+        }
+    }
+}

pida-core/core-domain/src/main/kotlin/com/pida/support/cursor/CursorRequest.kt

@@ -0,0 +1,10 @@
+package com.pida.support.cursor
+
+data class CursorRequest(
+    val lastId: Long?,
+    val size: Long,
+) {
+    init {
+        require(size in 1..100) { "크기는 1 ~ 100 사이여야 합니다." }
+    }
+}