푸시 개발 (초대장, 모임 정기 푸시) (#26)

* feat: 푸시 API 개발 (모임 푸시, 초대장 푸시)

* feat: 푸시 API 개발 (모임 푸시, 초대장 푸시)

* fix: test

* refactor: 불필요 코드 제거

Author: songyi00

tuk-api/src/main/kotlin/nexters/tuk/application/device/DeviceService.kt

@@ -2,11 +2,8 @@ package nexters.tuk.application.device
 
 import nexters.tuk.application.device.dto.request.DeviceCommand
 import nexters.tuk.application.device.dto.response.DeviceResponse
-import nexters.tuk.contract.BaseException
-import nexters.tuk.contract.ErrorType
 import nexters.tuk.domain.device.Device
 import nexters.tuk.domain.device.DeviceRepository
-import org.slf4j.LoggerFactory
 import org.springframework.stereotype.Service
 import org.springframework.transaction.annotation.Transactional
 
@@ -49,4 +46,19 @@ class DeviceService(
             updatedAt = device.updatedAt
         )
     }
+
+    @Transactional(readOnly = true)
+    fun getDeviceTokens(memberIds: List<Long>): List<DeviceResponse.MemberDeviceToken> {
+        if (memberIds.isEmpty()) return emptyList()
+
+        val devices = deviceRepository.findByMemberIdIn(memberIds)
+        if (devices.isEmpty()) return emptyList()
+
+        return devices.mapNotNull { device ->
+            DeviceResponse.MemberDeviceToken(
+                memberId = device.memberId,
+                deviceToken = device.deviceToken ?: return@mapNotNull null
+            )
+        }
+    }
 }

tuk-api/src/main/kotlin/nexters/tuk/application/device/dto/response/DeviceResponse.kt

@@ -9,4 +9,9 @@ class DeviceResponse {
         val deviceToken: String,
         val updatedAt: LocalDateTime,
     )
+
+    data class MemberDeviceToken(
+        val memberId: Long,
+        val deviceToken: String,
+    )
 }

tuk-api/src/main/kotlin/nexters/tuk/application/gathering/GatheringMemberService.kt

@@ -10,7 +10,7 @@ import org.springframework.transaction.annotation.Transactional
 @Service
 class GatheringMemberService(
     private val gatheringRepository: GatheringRepository,
-    private val gatheringMemberRepository: GatheringMemberRepository
+    private val gatheringMemberRepository: GatheringMemberRepository,
 ) {
     @Transactional
     fun joinGathering(gatheringId: Long, memberId: Long): GatheringMemberResponse.JoinGathering {
@@ -20,7 +20,7 @@ class GatheringMemberService(
         }
 
         val gatheringMember = GatheringMember.registerMember(gathering, memberId)
-                .let { gatheringMemberRepository.save(it) }
+            .let { gatheringMemberRepository.save(it) }
 
         return GatheringMemberResponse.JoinGathering(gatheringMember.id)
     }
@@ -34,11 +34,11 @@ class GatheringMemberService(
         val gatheringMembers = gatheringMemberRepository.findAllByMemberId(memberId)
 
         return gatheringMembers
-            .map { it.gathering }
-            .map {
+            .map { memberGathering ->
                 GatheringMemberResponse.MemberGatherings(
-                    it.id,
-                    it.name,
+                    memberGathering.gathering.id,
+                    memberGathering.gathering.name,
+                    memberGathering.gathering.intervalDays.toInt(),
                 )
             }.sortedBy { it.name }
     }

tuk-api/src/main/kotlin/nexters/tuk/application/gathering/GatheringQueryService.kt

@@ -24,7 +24,7 @@ class GatheringQueryService(
             GatheringResponse.GatheringOverviews.GatheringOverview(
                 gatheringId = it.id,
                 gatheringName = it.name,
-                lastNotificationRelativeTime = RelativeTime.fromDays(0)
+                lastNotificationRelativeTime = RelativeTime.fromDays(it.pushIntervalDays)
             )
         }
 

tuk-api/src/main/kotlin/nexters/tuk/application/gathering/dto/response/GatheringMemberResponse.kt

@@ -5,11 +5,12 @@ import io.swagger.v3.oas.annotations.media.Schema
 class GatheringMemberResponse {
     @Schema(name = "JoinGatheringResponse")
     data class JoinGathering(
-        val id: Long
+        val id: Long,
     )
 
     data class MemberGatherings(
         val id: Long,
         val name: String,
+        val pushIntervalDays: Int,
     )
 }

tuk-api/src/main/kotlin/nexters/tuk/application/gathering/dto/response/GatheringResponse.kt

@@ -7,7 +7,7 @@ class GatheringResponse {
     @Schema(name = "GenerateResponse")
     data class Generate(
         @Schema(description = "생성된 모임 id")
-        val gatheringId: Long
+        val gatheringId: Long,
     )
 
     @Schema(name = "GatheringOverviewsResponse")
@@ -23,7 +23,7 @@ class GatheringResponse {
             @Schema(description = "모임명")
             val gatheringName: String,
             @Schema(description = "상대 시간 타입 - \"오늘\", \"n일 전\", \"n주 전\", \"n개월 전\", \"n년 전\" ")
-            val lastNotificationRelativeTime: RelativeTime
+            val lastNotificationRelativeTime: RelativeTime,
         )
     }
 
@@ -40,7 +40,7 @@ class GatheringResponse {
         @Schema(description = "받은 제안 수")
         val receivedProposalCount: Int,
         @Schema(description = "모임원")
-        val members: List<MemberOverview>
+        val members: List<MemberOverview>,
     ) {
         data class MemberOverview(
             @Schema(description = "사용자 id")
@@ -49,4 +49,9 @@ class GatheringResponse {
             val memberName: String,
         )
     }
+
+    data class GatheringMembers(
+        val gatheringId: Long,
+        val memberIds: List<Long>,
+    )
 }

tuk-api/src/main/kotlin/nexters/tuk/application/member/MemberService.kt

@@ -66,4 +66,19 @@ class MemberService(
             name = member.name,
         )
     }
+
+    @Transactional(readOnly = true)
+    fun getMembers(memberIds: List<Long>): List<MemberResponse.Overview> {
+        if (memberIds.isEmpty()) return emptyList()
+
+        val members = memberRepository.findAllById(memberIds).toList()
+        if (members.isEmpty()) return emptyList()
+
+        return members.mapNotNull { member ->
+            MemberResponse.Overview(
+                memberId = member.id,
+                memberName = member.name ?: return@mapNotNull null,
+            )
+        }
+    }
 }

tuk-api/src/main/kotlin/nexters/tuk/application/push/PushSender.kt

@@ -3,7 +3,11 @@ package nexters.tuk.application.push
 import nexters.tuk.application.push.dto.request.PushCommand
 
 @JvmInline
-value class DeviceToken(val token: String)
+value class DeviceToken(val token: String) {
+    init {
+        require(token.isNotBlank()) { "Device token must not be blank." }
+    }
+}
 
 interface PushSender {
     fun send(

tuk-api/src/main/kotlin/nexters/tuk/application/push/PushService.kt

@@ -1,29 +1,56 @@
 package nexters.tuk.application.push
 
+import nexters.tuk.application.device.DeviceService
+import nexters.tuk.application.gathering.GatheringMemberService
+import nexters.tuk.application.member.MemberService
 import nexters.tuk.application.push.dto.request.PushCommand
-import nexters.tuk.domain.device.DeviceRepository
 import org.slf4j.LoggerFactory
 import org.springframework.stereotype.Service
 import org.springframework.transaction.annotation.Transactional
 
 @Service
 class PushService(
     private val pushSender: PushSender,
-    private val deviceRepository: DeviceRepository,
+    private val deviceService: DeviceService,
+    private val gatheringMemberService: GatheringMemberService,
+    private val memberService: MemberService,
 ) {
     private val logger = LoggerFactory.getLogger(PushService::class.java)
 
     @Transactional
     fun sendPush(command: PushCommand.Push) {
-        logger.info("Sending bulk push notification. Recipients: ${command.recipients.size}")
-        val memberIds = command.recipients.map { it.memberId }
-        val deviceTokens = deviceRepository.findByMemberIdIn(memberIds)
-            .mapNotNull { device -> device.deviceToken?.let { DeviceToken(it) } }
+        val pushMessage = PushMessage.random()
+        when (command) {
+            is PushCommand.Push.GatheringNotification -> {
+                val memberIds = command.recipients.map { it.memberId }
+                pushAll(memberIds = memberIds, pushMessage = pushMessage)
+                logger.info("Sent gathering notification push. Recipients: ${command.recipients.size}, PushType: ${command.pushType}")
+            }
 
-        pushSender.send(
-            deviceTokens = deviceTokens,
-            message = command.message
-        )
-        logger.info("Sent push notification. Recipients: ${command.recipients.size}")
+            is PushCommand.Push.Proposal -> {
+                val memberIds = gatheringMemberService.getGatheringMemberIds(gatheringId = command.gatheringId)
+                pushAll(memberIds = memberIds, pushMessage = pushMessage)
+                logger.info("Sent proposal push. GatheringId: ${command.gatheringId}, Recipients: ${memberIds.size}, PushType: ${command.pushType}")
+            }
+        }
+    }
+
+    private fun pushAll(
+        memberIds: List<Long>,
+        pushMessage: PushMessage,
+    ) {
+        val memberNameMap = memberService.getMembers(memberIds).associate { it.memberId to it.memberName }
+        deviceService.getDeviceTokens(memberIds).forEach { token ->
+            pushSender.send(
+                deviceTokens = listOf(DeviceToken(token.deviceToken)),
+                message = PushCommand.MessagePayload(
+                    title = pushMessage.getTitle(
+                        memberNameMap[token.memberId]
+                            ?: throw IllegalArgumentException("Member name not found for ID: ${token.memberId}")
+                    ),
+                    body = pushMessage.body
+                )
+            )
+        }
     }
 }

tuk-api/src/main/kotlin/nexters/tuk/application/push/PushTemplate.kt

@@ -0,0 +1,23 @@
+package nexters.tuk.application.push
+
+
+enum class PushMessage(
+    private val title: String,
+    val body: String,
+) {
+    PUSH_VERSION_A("%s님! 방금 '툭'— 누군가 만남을 제안했어요.", "슬슬 그리워질 타이밍... 아닐까요?"),
+    PUSH_VERSION_B("누군가 %s님을 떠올리며 툭— 건넸어요.", "이번엔 그냥 지나치지 마세요 :)"),
+    PUSH_VERSION_C("%s님, 툭— 누가 당신을 부르고 있어요.", "이번엔 누굴까? 살짝 들여다볼래요?"),
+    PUSH_VERSION_D("%s님, 누가 몰래 '툭' 했대요.", "그냥 넘어가긴... 좀 아쉽죠?"),
+    ;
+
+    fun getTitle(memberName: String): String {
+        return title.format(memberName)
+    }
+
+    companion object {
+        fun random(): PushMessage {
+            return entries.toTypedArray().random()
+        }
+    }
+}