[FIX, REFACTOR] Notification 테이블에 title 컬럼 추가 및 Push 이벤트 비동기 처리

notification-application/src/main/kotlin/gloddy/fcmToken/port/in/FCMTokenCreateUseCase.kt

@@ -1,9 +1,9 @@
 package gloddy.fcmToken.port.`in`
 
+import gloddy.fcmToken.FCMToken
 import gloddy.fcmToken.dto.FCMTokenCreateDto
-import gloddy.fcmToken.dto.FCMTokenCreateResponse
 import gloddy.notification.UserId
 
 interface FCMTokenCreateUseCase {
-    fun create(userId: UserId, dto: FCMTokenCreateDto): FCMTokenCreateResponse
+    fun create(userId: UserId, dto: FCMTokenCreateDto): FCMToken
 }

notification-application/src/main/kotlin/gloddy/fcmToken/service/FCMTokenCreateService.kt

@@ -5,8 +5,6 @@ import gloddy.fcmToken.port.`in`.FCMTokenCreateUseCase
 import gloddy.fcmToken.port.out.FCMTokenCreatePort
 import gloddy.fcmToken.FCMToken
 import gloddy.fcmToken.FirebaseToken
-import gloddy.fcmToken.dto.FCMTokenCreateResponse
-import gloddy.fcmToken.dto.toDto
 import gloddy.notification.UserId
 import org.springframework.stereotype.Service
 
@@ -15,11 +13,11 @@ class FCMTokenCreateService(
     private val fcmTokenCreatePort: FCMTokenCreatePort
 ): FCMTokenCreateUseCase {
 
-    override fun create(userId: UserId, dto: FCMTokenCreateDto): FCMTokenCreateResponse {
+    override fun create(userId: UserId, dto: FCMTokenCreateDto): FCMToken {
         val fcmToken = FCMToken(
             userId = userId,
             token = FirebaseToken(dto.token)
         )
-        return fcmTokenCreatePort.create(fcmToken).toDto()
+        return fcmTokenCreatePort.create(fcmToken)
     }
 }

notification-application/src/main/kotlin/gloddy/notification/port/in/NotificationGetUseCase.kt

@@ -1,8 +1,8 @@
 package gloddy.notification.port.`in`
 
+import gloddy.notification.Notification
 import gloddy.notification.dto.NotificationGetDto
-import gloddy.notification.dto.NotificationResponse
 
 interface NotificationGetUseCase {
-    fun getAllByUser(dto: NotificationGetDto): NotificationResponse
+    fun getAllByUser(dto: NotificationGetDto): List<Notification>
 }

notification-application/src/main/kotlin/gloddy/notification/service/ApplyNotificationCreateService.kt

@@ -21,6 +21,7 @@ class ApplyNotificationCreateService(
         Notification(
             redirectId = applyEvent.applyGroupId,
             userId =  getTargetUserId(type, applyEvent),
+            title = type.title,
             content = type.content,
             type = type
         ).run {

notification-application/src/main/kotlin/gloddy/notification/service/GroupNotificationCreateService.kt

@@ -25,6 +25,7 @@ class GroupNotificationCreateService(
         Notification(
             redirectId = groupEvent.groupId,
             userId =  groupEvent.userId,
+            title = notificationType.title,
             content = notificationType.getContent(),
             type = notificationType
         ).run {
@@ -40,6 +41,7 @@ class GroupNotificationCreateService(
             Notification(
                 userId = it,
                 redirectId = event.groupId,
+                title = notificationType.title,
                 content = notificationType.content,
                 type = notificationType
             ).run {
@@ -56,6 +58,7 @@ class GroupNotificationCreateService(
             Notification(
                 userId = it,
                 redirectId = event.groupId,
+                title = notificationType.title,
                 content = notificationType.content,
                 type = notificationType
             ).run {

notification-application/src/main/kotlin/gloddy/notification/service/NotificationGetService.kt

@@ -1,8 +1,7 @@
 package gloddy.notification.service
 
+import gloddy.notification.Notification
 import gloddy.notification.dto.NotificationGetDto
-import gloddy.notification.dto.NotificationResponse
-import gloddy.notification.dto.toResponse
 import gloddy.notification.port.`in`.NotificationGetUseCase
 import gloddy.notification.port.out.NotificationGetPort
 import org.springframework.stereotype.Service
@@ -12,7 +11,7 @@ class NotificationGetService(
     private val notificationGetPort: NotificationGetPort
 ): NotificationGetUseCase {
 
-    override fun getAllByUser(dto: NotificationGetDto): NotificationResponse =
-        notificationGetPort.findByUserId(dto.userId).toResponse()
+    override fun getAllByUser(dto: NotificationGetDto): List<Notification> =
+        notificationGetPort.findByUserId(dto.userId)
 
 }

notification-domain/src/main/kotlin/gloddy/notification/Notification.kt

@@ -1,12 +1,19 @@
 package gloddy.notification
 
+import java.util.*
+
 
 @JvmInline
 value class UserId(val value: Long)
 
+@JvmInline
+value class NotificationId(val value: String)
+
 data class Notification(
+    val id: NotificationId = NotificationId(UUID.randomUUID().toString()),
     val userId: UserId,
     val redirectId: Long,
+    val title: String,
     val content: String,
     val type: NotificationType
 )

notification-domain/src/main/kotlin/gloddy/notification/NotificationType.kt

@@ -1,17 +1,40 @@
 package gloddy.notification
 
 enum class NotificationType(
+    val title: String,
     val content: String
 ) {
-    APPLY_APPROVE("Your applied gathering has been approved! \uD83D\uDC4C"),
-    APPLY_REFUSE("The gathering you applied for has been declined. \uD83E\uDD72"),
-    APPLY_CREATE("A new gathering application has arrived!  \uD83D\uDC8C"),
-    GROUP_LEAVE("has just left the group.  \uD83E\uDD72"),
-    GROUP_ARTICLE_CREATE("Please Check the New Notice! \uD83D\uDDE3"),
-    GROUP_APPROACHING_START("The gathering starts in 1 hour! ⏰"),
-    GROUP_END("Did you enjoy the gathering? \uD83D\uDE06")
+    APPLY_APPROVE(
+        "👌Your applied gathering has been approved!",
+        "Wishing you enjoy a fun and safe gathering."
+    ),
+    APPLY_REFUSE(
+        "😢The gathering you applied for has been declined.",
+        "There are various other gatherings available for you! Would you like to look for another gathering?"
+    ),
+    APPLY_CREATE(
+        "💌A new gathering application has arrived!",
+        "We’re awaiting the host’s approval for the gathering! please warmly welcome the new members."
+    ),
+    GROUP_LEAVE(
+        "😢has just left the group.",
+        "Shall we go check the group participants?"
+    ),
+    GROUP_ARTICLE_CREATE(
+        "🗣️Please Check the New Notice!",
+        "A new post has been added."
+    ),
+    GROUP_APPROACHING_START(
+        "⏰The gathering starts in 1 hour!",
+        "Are you ready to enjoy the gathering? \n" + "Check the announcement for a better gathering!"
+    ),
+    GROUP_END(
+        "😆Did you enjoy the gathering?",
+        "Please rate the attendees of the gathering! \n" + "Select the best partner with reward stickers."
+    )
     ;
 
+
     companion object {
         fun of(type: String): NotificationType {
             return values().firstOrNull { it.name == type }

notification-in-adapter-api/src/main/kotlin/gloddy/fcmToken/FCMTokenController.kt

@@ -2,6 +2,7 @@ package gloddy.fcmToken
 
 import gloddy.fcmToken.dto.FCMTokenCreateDto
 import gloddy.fcmToken.dto.FCMTokenCreateResponse
+import gloddy.fcmToken.dto.toResponse
 import gloddy.fcmToken.port.`in`.FCMTokenCreateUseCase
 import gloddy.notification.UserId
 import org.springframework.web.bind.annotation.*
@@ -16,6 +17,6 @@ class FCMTokenController(
         @RequestBody request: FCMTokenCreateDto,
         @RequestHeader("USER_ID") userId: UserId
     ): FCMTokenCreateResponse {
-        return fcmTokenCreateUseCase.create(userId, request)
+        return fcmTokenCreateUseCase.create(userId, request).toResponse()
     }
 }

notification-application/src/main/kotlin/gloddy/fcmToken/dto/FCMTokenCreateResponse.kt → notification-in-adapter-api/src/main/kotlin/gloddy/fcmToken/dto/FCMTokenCreateResponse.kt

@@ -3,14 +3,13 @@ package gloddy.fcmToken.dto
 import gloddy.fcmToken.FCMToken
 import gloddy.fcmToken.FirebaseToken
 import gloddy.notification.UserId
-import gloddy.notification.dto.NotificationDto
 
 data class FCMTokenCreateResponse(
     val userId: UserId,
     val token: FirebaseToken
 )
 
-fun FCMToken.toDto(): FCMTokenCreateResponse =
+fun FCMToken.toResponse(): FCMTokenCreateResponse =
     FCMTokenCreateResponse(
         userId = this.userId,
         token = this.token

notification-in-adapter-api/src/main/kotlin/gloddy/notification/NotificationController.kt

@@ -1,6 +1,7 @@
 package gloddy.notification
 
 import gloddy.notification.dto.NotificationGetDto
+import gloddy.notification.dto.toResponse
 import gloddy.notification.port.`in`.NotificationGetUseCase
 import org.springframework.web.bind.annotation.GetMapping
 import org.springframework.web.bind.annotation.RequestHeader
@@ -10,10 +11,10 @@ import org.springframework.web.bind.annotation.RestController
 @RestController
 @RequestMapping("/api/v1/notifications")
 class NotificationController(
-    private val notificationGetUseCase: NotificationGetUseCase
+    private val notificationGetUseCase: NotificationGetUseCase,
 ) {
 
     @GetMapping
     fun getAllByUser(@RequestHeader("USER_ID") userId: UserId) =
-        notificationGetUseCase.getAllByUser(NotificationGetDto(userId))
+        notificationGetUseCase.getAllByUser(NotificationGetDto(userId)).toResponse()
 }

notification-application/src/main/kotlin/gloddy/notification/dto/NotificationGetResponse.kt → notification-in-adapter-api/src/main/kotlin/gloddy/notification/dto/NotificationGetResponse.kt

@@ -4,26 +4,28 @@ import gloddy.notification.Notification
 import gloddy.notification.NotificationType
 import gloddy.notification.UserId
 
-data class NotificationResponse(
+data class NotificationGetResponse(
     val notifications: List<NotificationDto>
 )
 
 data class NotificationDto(
     val userId: UserId,
     val redirectId: Long,
+    val title: String,
     val content: String,
     val type: NotificationType
 )
 
-fun List<Notification>.toResponse(): NotificationResponse =
-    NotificationResponse(
+fun List<Notification>.toResponse(): NotificationGetResponse =
+    NotificationGetResponse(
         this.map { it.toDto() }.toList()
     )
 
 fun Notification.toDto(): NotificationDto =
     NotificationDto(
         userId = this.userId,
         redirectId = this.redirectId,
+        title = this.title,
         content = this.content,
         type = this.type
     )

notification-out-adapter-persistence/src/main/kotlin/gloddy/dynamodb/notification/NotificationEntity.kt

@@ -21,6 +21,9 @@ class NotificationEntity(
     @field:DynamoDBAttribute(attributeName = "redirect_id")
     var redirectId: String = "",
 
+    @field:DynamoDBAttribute(attributeName = "title")
+    var title: String = "",
+
     @field:DynamoDBAttribute(attributeName = "content")
     var content: String = "",
 

notification-out-adapter-persistence/src/main/kotlin/gloddy/dynamodb/notification/NotificationMapper.kt

@@ -1,21 +1,26 @@
 package gloddy.dynamodb.notification
 
 import gloddy.notification.Notification
+import gloddy.notification.NotificationId
 import gloddy.notification.UserId
 
 
 fun NotificationEntity.toDomain(): Notification =
     Notification(
+        id = NotificationId(this.id),
         userId = UserId(this.userId.toLong()),
         redirectId = this.redirectId.toLong(),
+        title = this.title,
         content = this.content,
         type = this.type!!
     )
 
 fun Notification.toEntity(): NotificationEntity =
     NotificationEntity(
+        id = this.id.value,
         userId = this.userId.value.toString(),
         redirectId = this.redirectId.toString(),
+        title = this.title,
         content = this.content,
         type = this.type
     )

push/src/main/kotlin/gloddy/NotificationPushService.kt

@@ -3,18 +3,13 @@ package gloddy
 import gloddy.command.PushCommand
 import gloddy.dynamodb.fcmToken.FCMTokenQueryAdapter
 import gloddy.fcmToken.FirebaseToken
-import gloddy.notification.Notification
-import gloddy.notification.NotificationType
 import org.springframework.stereotype.Component
 
 @Component
 class NotificationPushService(
     private val pushClient: PushClient,
     private val fcmTokenQueryAdapter: FCMTokenQueryAdapter
 ) {
-    companion object {
-        const val PUSH_TITLE = "Gloddy"
-    }
 
     fun push(pushCommand: PushCommand) {
         val fcmToken = fcmTokenQueryAdapter.get(pushCommand.userId)

push/src/main/kotlin/gloddy/config/AsyncConfiguration.kt

@@ -0,0 +1,27 @@
+package gloddy.config
+
+import org.springframework.context.annotation.Bean
+import org.springframework.context.annotation.Configuration
+import org.springframework.scheduling.annotation.AsyncConfigurer
+import org.springframework.scheduling.annotation.EnableAsync
+import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor
+import java.util.concurrent.Executor
+
+@Configuration
+@EnableAsync
+class AsyncConfiguration : AsyncConfigurer {
+
+    companion object {
+        private const val PUSH_THREAD_NAME_PREFIX = "PUSH-ASYNC-THREAD-"
+    }
+
+    @Bean(name = ["PUSH-EVENT-ASYNC-EXECUTOR"])
+    override fun getAsyncExecutor(): Executor {
+        val executor = ThreadPoolTaskExecutor()
+        executor.setThreadNamePrefix(PUSH_THREAD_NAME_PREFIX)
+        executor.corePoolSize = 10
+        executor.maxPoolSize = 10
+        executor.initialize()
+        return executor
+    }
+}

push/src/main/kotlin/gloddy/event/NotificationEventListener.kt

@@ -4,13 +4,15 @@ import gloddy.NotificationPushService
 import gloddy.command.toGroupingPushCommand
 import gloddy.notification.event.NotificationCreateEvent
 import org.springframework.context.event.EventListener
+import org.springframework.scheduling.annotation.Async
 import org.springframework.stereotype.Component
 
 @Component
 class NotificationEventListener(
     private val notificationPushService: NotificationPushService
 ) {
 
+    @Async("PUSH-EVENT-ASYNC-EXECUTOR")
     @EventListener
     fun consume(event: NotificationCreateEvent) {
         notificationPushService.push(event.toGroupingPushCommand())