배치 스케줄러 푸시 연동 (#20)

* feat: wip 배치 스케줄러 <-> 푸시 연동

* feat: 푸시 배치 연동

* chore: 코드 정리

* chore: 코드 정리

* chore: 코드 정리

Author: songyi00

docker/docker-compose.prod.yml

@@ -36,7 +36,6 @@ services:
       - "3307:3306"
     volumes:
       - mysql_data:/var/lib/mysql
-      - ./init.sql:/docker-entrypoint-initdb.d/init.sql
     command:
       - --character-set-server=utf8mb4
       - --collation-server=utf8mb4_unicode_ci

docker/init.sql

@@ -25,6 +25,7 @@ CREATE TABLE IF NOT EXISTS gathering
     created_at     TIMESTAMP    NOT NULL DEFAULT CURRENT_TIMESTAMP,
     updated_at     TIMESTAMP    NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
     deleted_at     TIMESTAMP    NULL,
+    last_pushed_at TIMESTAMP    NULL,
 
     INDEX idx_deleted_at (deleted_at),
 

settings.gradle.kts

@@ -1,3 +1,3 @@
 rootProject.name = "tuk-server"
 
-include("tuk-api", "tuk-batch")
+include("tuk-api", "tuk-batch", "tuk-contract")

tuk-api/build.gradle.kts

@@ -30,6 +30,8 @@ jib {
 }
 
 dependencies {
+    implementation(project(":tuk-contract"))
+
     implementation("org.springframework.boot:spring-boot-starter-web")
     implementation("org.springframework.boot:spring-boot-starter-actuator")
     implementation("org.springframework.boot:spring-boot-starter-data-jpa")

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

@@ -20,22 +20,22 @@ class DeviceService(
         memberId: Long,
         command: DeviceCommand.UpdateDeviceToken,
     ): DeviceResponse.UpdateDeviceToken {
-        require(command.deviceInfo.deviceToken != null) { "디바이스 토큰은 필수 정보입니다." }
+        val deviceToken = command.deviceInfo.deviceToken ?: throw IllegalArgumentException("디바이스 토큰은 필수 정보입니다.")
 
         val device = deviceRepository.findByDeviceIdAndMemberId(
             deviceId = command.deviceInfo.deviceId,
             memberId = memberId
         )?.let { device ->
             device.updateDeviceToken(
-                newDeviceToken = command.deviceInfo.deviceToken,
+                newDeviceToken = deviceToken,
                 newAppVersion = command.deviceInfo.appVersion,
                 newOsVersion = command.deviceInfo.osVersion,
             )
             device
         } ?: deviceRepository.save(
             Device.new(
                 deviceId = command.deviceInfo.deviceType,
-                deviceToken = command.deviceInfo.deviceToken,
+                deviceToken = deviceToken,
                 appVersion = command.deviceInfo.appVersion,
                 osVersion = command.deviceInfo.osVersion,
                 memberId = memberId
@@ -45,7 +45,7 @@ class DeviceService(
         return DeviceResponse.UpdateDeviceToken(
             memberId = device.memberId,
             deviceId = device.deviceId,
-            deviceToken = device.deviceToken,
+            deviceToken = deviceToken,
             updatedAt = device.updatedAt
         )
     }

tuk-api/src/main/kotlin/nexters/tuk/application/device/dto/request/DeviceCommand.kt

@@ -1,9 +1,9 @@
 package nexters.tuk.application.device.dto.request
 
-import nexters.tuk.contract.device.TukDeviceInfo
+import nexters.tuk.contract.device.TukClientInfo
 
 class DeviceCommand {
     data class UpdateDeviceToken(
-        val deviceInfo: TukDeviceInfo,
+        val deviceInfo: TukClientInfo,
     )
 }

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

@@ -2,9 +2,12 @@ package nexters.tuk.application.push
 
 import nexters.tuk.application.push.dto.request.PushCommand
 
+@JvmInline
+value class DeviceToken(val token: String)
+
 interface PushSender {
     fun send(
-        recipients: List<PushCommand.PushRecipient>,
+        deviceTokens: List<DeviceToken>,
         message: PushCommand.MessagePayload,
     )
 }

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

@@ -1,24 +1,29 @@
 package nexters.tuk.application.push
 
 import nexters.tuk.application.push.dto.request.PushCommand
-import nexters.tuk.application.push.dto.response.PushResponse
+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 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) } }
 
         pushSender.send(
-            recipients = command.recipients,
+            deviceTokens = deviceTokens,
             message = command.message
         )
+        logger.info("Sent push notification. Recipients: ${command.recipients.size}")
     }
 }

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

@@ -1,6 +1,8 @@
 package nexters.tuk.application.push
 
 enum class PushType {
+    // 모임 정기 푸시
     GROUP_NOTIFICATION,
+    // 초대장 푸시
     INVITATION,
 }

tuk-api/src/main/kotlin/nexters/tuk/application/push/dto/request/PushCommand.kt

@@ -1,19 +1,20 @@
 package nexters.tuk.application.push.dto.request
 
+import nexters.tuk.application.push.PushType
+
 class PushCommand {
     data class Push(
         val recipients: List<PushRecipient>,
         val message: MessagePayload,
+        val pushType: PushType,
     )
 
     data class MessagePayload(
         val title: String,
         val body: String,
     )
 
-    // FIXME: 디바이스 토큰이 아닌 memberId만 받아서 직접 토큰 조회후 발송하도록 책임 분리해도 좋을듯
     data class PushRecipient(
-        val deviceToken: String,
-        val memberId: Long? = null,
+        val memberId: Long,
     )
 }