refactor: Events 객체 컬랙션 래핑

gdsc-konkuk · Feb 1, 2024 · d61ff92 · d61ff92
1 parent 27b6212
commit d61ff92
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/src/main/kotlin/gdsc/plantory/event/notification/WaterCycleEventListener.kt b/src/main/kotlin/gdsc/plantory/event/notification/WaterCycleEventListener.kt
@@ -24,8 +24,8 @@ class WaterCycleEventListener(
 
     @TransactionalEventListener(phase = TransactionPhase.AFTER_COMMIT)
     @Async
-    fun sendFcmNotification(events: List<WaterCycleEvent>) {
-        val messages: List<Message> = createMessages(events, FCMChannel.WATER_ALERT.name)
+    fun sendFcmNotification(events: WaterCycleEvents) {
+        val messages: List<Message> = createMessages(events.plantsNeedWateredToday, FCMChannel.WATER_ALERT.name)
 
         try {
             firebaseMessaging.sendEach(messages)

diff --git a/src/main/kotlin/gdsc/plantory/event/notification/WaterCycleEvents.kt b/src/main/kotlin/gdsc/plantory/event/notification/WaterCycleEvents.kt
@@ -0,0 +1,5 @@
+package gdsc.plantory.event.notification
+
+data class WaterCycleEvents(
+    val plantsNeedWateredToday: List<WaterCycleEvent>
+)
diff --git a/src/main/kotlin/gdsc/plantory/plant/service/ReminderService.kt b/src/main/kotlin/gdsc/plantory/plant/service/ReminderService.kt
@@ -2,6 +2,7 @@ package gdsc.plantory.plant.service
 
 import gdsc.plantory.event.Events
 import gdsc.plantory.event.notification.WaterCycleEvent
+import gdsc.plantory.event.notification.WaterCycleEvents
 import gdsc.plantory.plant.domain.CompanionPlantRepository
 import gdsc.plantory.plant.presentation.dto.CompanionPlantWaterCycleDto
 import org.springframework.scheduling.annotation.Scheduled
@@ -18,7 +19,7 @@ class ReminderService(
     @Scheduled(cron = "0 0 8 * * *")
     fun sendWaterNotification() {
         val companionPlants = companionPlantRepository.findAllByNextWaterDate(LocalDate.now())
-        val events: List<WaterCycleEvent> = buildWaterCycleEvents(companionPlants)
+        val events = WaterCycleEvents(buildWaterCycleEvents(companionPlants))
         Events.raise(events)
     }