7/15 배포 작업 (#138)

i-Tracker · Jul 15, 2024 · 7782834 · 7782834
1 parent c4d2a6c
commit 7782834
Show file tree

Hide file tree

Showing 6 changed files with 53 additions and 18 deletions.
diff --git a/src/main/kotlin/backend/itracker/alarm/service/AlarmService.kt b/src/main/kotlin/backend/itracker/alarm/service/AlarmService.kt
@@ -56,9 +56,10 @@ class AlarmService (
             Color.GREEN,
             listOf(
                 """
-                |*전송한 메세지 수* : ${event.successMessageCount()}
-                |*남은 포인트* : ${event.point()}
-                |*잔액* : ${event.balance()}
+                *전송한 메세지 수* : ${event.successMessageCount()}
+                *남은 포인트* : ${event.point()}
+                *잔액* : ${event.balance()}
+                *예상 차감 금액(VAT 별도)* : -${event.cost()}
                 """.trimIndent()
             )
         )

diff --git a/...main/kotlin/backend/itracker/alarm/service/event/SuccessReservationOfNotificationEvent.kt b/...main/kotlin/backend/itracker/alarm/service/event/SuccessReservationOfNotificationEvent.kt
@@ -2,7 +2,6 @@ package backend.itracker.alarm.service.event
 
 import java.time.LocalDateTime
 
-
 interface SuccessReservationOfNotificationEvent {
 
     fun reservationTime(): LocalDateTime
@@ -12,4 +11,6 @@ interface SuccessReservationOfNotificationEvent {
     fun point(): Float
 
     fun balance(): Float
+
+    fun cost(): Long
 }
diff --git a/...tlin/backend/itracker/schedule/infra/notification/event/MessageReservationSuccessEvent.kt b/...tlin/backend/itracker/schedule/infra/notification/event/MessageReservationSuccessEvent.kt
@@ -3,6 +3,8 @@ package backend.itracker.schedule.infra.notification.event
 import backend.itracker.alarm.service.event.SuccessReservationOfNotificationEvent
 import java.time.LocalDateTime
 
+private const val SOLAPI_KAKAO_ALARAM_COST = 9L
+
 data class MessageReservationSuccessEvent(
     val reservationTime: LocalDateTime,
     val successMessageCount: Int,
@@ -25,4 +27,8 @@ data class MessageReservationSuccessEvent(
     override fun balance(): Float {
         return balance
     }
+
+    override fun cost(): Long {
+        return successMessageCount * SOLAPI_KAKAO_ALARAM_COST
+    }
 }
diff --git a/src/main/kotlin/backend/itracker/schedule/infra/notification/solapi/NotificationClient.kt b/src/main/kotlin/backend/itracker/schedule/infra/notification/solapi/NotificationClient.kt
@@ -20,6 +20,8 @@ import java.time.ZoneOffset
 
 val logger = KotlinLogging.logger {}
 
+private const val RESERVE_FAIlED = 0
+
 @Profile("!test")
 @Component
 class NotificationClient(
@@ -31,7 +33,7 @@ class NotificationClient(
     override fun reserveNotificationOfPriceChange(
         priceChangeTemplate: PriceChangeNotificationInfo,
         receiverPhoneNumbers: List<String>,
-    ) {
+    ): Int {
         val option = KakaoOption(
             pfId = nurigoKakaoChannelConfig.pfId,
             templateId = nurigoKakaoChannelConfig.priceChangeNotificationTemplateId,
@@ -47,20 +49,11 @@ class NotificationClient(
             )
         }
 
-        val reservationTime = LocalDateTime.of(LocalDate.now(), LocalTime.of(nurigoKakaoChannelConfig.sendingHour, 0))
-        val scheduledDateTime = reservationTime.toInstant(ZoneOffset.of("+9"))!!
+        val scheduledDateTime = getReservationTime().toInstant(ZoneOffset.of("+9"))!!
 
         try {
             messageService.send(messages, scheduledDateTime)
-            val balance = messageService.getBalance()
-            eventPublisher.publishEvent(
-                MessageReservationSuccessEvent(
-                    reservationTime = reservationTime!!,
-                    point = balance.point!!,
-                    balance = balance.balance!!,
-                    successMessageCount = messages.size
-                )
-            )
+            return messages.size
         } catch (exception: NurigoMessageNotReceivedException) {
             logger.error {
                 """
@@ -76,6 +69,33 @@ class NotificationClient(
                     exception.message
                 )
             )
+
+            return RESERVE_FAIlED
         }
     }
+
+    override fun checkBalance(reservationCount: Int) {
+        try {
+            val balance = messageService.getBalance()
+            eventPublisher.publishEvent(
+                MessageReservationSuccessEvent(
+                    reservationTime = getReservationTime(),
+                    point = balance.point!!,
+                    balance = balance.balance!!,
+                    successMessageCount = reservationCount
+                )
+            )
+        } catch (exception: NurigoMessageNotReceivedException) {
+            logger.error { "잔액 확인 실패 cause : $exception" }
+        }
+    }
+
+    private fun getReservationTime(): LocalDateTime {
+        return LocalDateTime.of(
+            LocalDate.now(), LocalTime.of(
+                nurigoKakaoChannelConfig.sendingHour,
+                0
+            )
+        )
+    }
 }
diff --git a/...ain/kotlin/backend/itracker/schedule/service/notification/NotificationSchedulerService.kt b/...ain/kotlin/backend/itracker/schedule/service/notification/NotificationSchedulerService.kt
@@ -21,10 +21,15 @@ class NotificationSchedulerService(
             .groupBy { it.product}
             .mapValues { entry -> entry.value.map { it.member } }
 
+        var reservationCount = 0
         productCategoryMap.forEach { (product, members) ->
             val priceChangeNotificationInfo = notificationComposite.getPriceChangeNotificationInfo(product)
             val receiverPhoneNumbers = members.mapNotNull { it.phoneNumber }
-            notificationSender.reserveNotificationOfPriceChange(priceChangeNotificationInfo, receiverPhoneNumbers)
+            reservationCount += notificationSender.reserveNotificationOfPriceChange(priceChangeNotificationInfo, receiverPhoneNumbers)
+        }
+
+        if (reservationCount > 0) {
+            notificationSender.checkBalance(reservationCount)
         }
     }
 }
diff --git a/src/main/kotlin/backend/itracker/schedule/service/notification/NotificationSender.kt b/src/main/kotlin/backend/itracker/schedule/service/notification/NotificationSender.kt
@@ -7,5 +7,7 @@ interface NotificationSender {
     fun reserveNotificationOfPriceChange(
         priceChangeTemplate: PriceChangeNotificationInfo,
         receiverPhoneNumbers: List<String>,
-    )
+    ): Int
+
+    fun checkBalance(reservationCount: Int)
 }