[BLOOM-134] 건강상태 알림 기능 추가 & Batch 스레드 풀 제한

api/build.gradle.kts

@@ -2,6 +2,7 @@ tasks.jar { enabled = true }
 tasks.bootJar { enabled = true }
 
 dependencies {
+    implementation(project(":batch"))
     implementation(project(":common"))
     implementation(project(":client"))
     implementation(project(":domain:core"))

api/src/main/kotlin/dnd11th/blooming/api/controller/exception/GlobalExceptionHandler.kt

@@ -105,7 +105,7 @@ class GlobalExceptionHandler {
 
     @ExceptionHandler(MethodArgumentTypeMismatchException::class)
     fun handleArgumentTypeMismatchException(exception: MethodArgumentTypeMismatchException): ResponseEntity<ErrorResponse> {
-        val errorType = ErrorType.ARUGMENT_TYPE_MISMATCH
+        val errorType = ErrorType.ARGUMENT_TYPE_MISMATCH
 
         logException(errorType, exception, ExceptionSource.HTTP)
 

api/src/main/resources/application.yml

@@ -20,6 +20,7 @@ spring:
     activate:
       on-profile: local
     import:
+      - batch-local.yml
       - client.yml
       - redis-local.yml
       - core-local.yml
@@ -39,6 +40,7 @@ spring:
     activate:
       on-profile: prod
     import:
+      - batch-prod.yml
       - client.yml
       - redis-prod.yml
       - core-prod.yml

api/src/test/resources/application-test.yml

@@ -18,6 +18,12 @@ spring:
       dialect: org.hibernate.dialect.H2Dialect
     defer-datasource-initialization: true
 
+  batch:
+    jdbc:
+      initialize-schema: always
+    job:
+      enabled: false
+
   data:
     redis:
       host: localhost

batch/build.gradle.kts

@@ -1,5 +1,5 @@
 tasks.jar { enabled = true }
-tasks.bootJar { enabled = true }
+tasks.bootJar { enabled = false }
 
 dependencies {
     implementation(project(":common"))

batch/src/main/kotlin/dnd11th/blooming/batch/BatchConfig.kt → batch/src/main/kotlin/dnd11th/blooming/batch/config/BatchConfig.kt

@@ -1,4 +1,4 @@
-package dnd11th.blooming.batch
+package dnd11th.blooming.batch.config
 
 import org.springframework.beans.factory.support.BeanDefinitionRegistry
 import org.springframework.beans.factory.support.BeanDefinitionRegistryPostProcessor

batch/src/main/kotlin/dnd11th/blooming/batch/NotificationScheduler.kt → batch/src/main/kotlin/dnd11th/blooming/batch/notification/NotificationScheduler.kt

@@ -1,4 +1,4 @@
-package dnd11th.blooming.batch
+package dnd11th.blooming.batch.notification
 
 import dnd11th.blooming.common.util.Logger.Companion.log
 import org.springframework.batch.core.Job

batch/src/main/kotlin/dnd11th/blooming/batch/PlantNotificationJobConfig.kt → batch/src/main/kotlin/dnd11th/blooming/batch/notification/PlantNotificationJobConfig.kt

@@ -1,4 +1,4 @@
-package dnd11th.blooming.batch
+package dnd11th.blooming.batch.notification
 
 import dnd11th.blooming.client.fcm.PushNotification
 import dnd11th.blooming.core.entity.myplant.UserPlantDto
@@ -20,18 +20,22 @@ import org.springframework.transaction.PlatformTransactionManager
 @Configuration
 class PlantNotificationJobConfig {
     companion object {
-        const val CHUNK_SIZE: Int = 100
+        const val CHUNK_SIZE: Int = 1000
     }
 
     @Bean
     @Primary
     fun notificationJob(
         jobRepository: JobRepository,
         waterNotificationStep: Step,
+        fertilizerNotificationStep: Step,
+        healthCheckNotificationStep: Step,
     ): Job {
         return JobBuilder("notificationJob", jobRepository)
             .incrementer(RunIdIncrementer())
             .start(waterNotificationStep)
+            .next(fertilizerNotificationStep)
+            .next(healthCheckNotificationStep)
             .build()
     }
 
@@ -51,4 +55,38 @@ class PlantNotificationJobConfig {
             .writer(waterNotificationItemWriter)
             .build()
     }
+
+    @Bean
+    @JobScope
+    fun fertilizerNotificationStep(
+        jobRepository: JobRepository,
+        transactionManager: PlatformTransactionManager,
+        fertilizerNotificationItemReader: ItemReader<UserPlantDto>,
+        waterNotificationItemProcessor: ItemProcessor<UserPlantDto, PushNotification>,
+        waterNotificationItemWriter: ItemWriter<PushNotification>,
+    ): Step {
+        return StepBuilder("fertilizerNotificationStep", jobRepository)
+            .chunk<UserPlantDto, PushNotification>(CHUNK_SIZE, transactionManager)
+            .reader(fertilizerNotificationItemReader)
+            .processor(waterNotificationItemProcessor)
+            .writer(waterNotificationItemWriter)
+            .build()
+    }
+
+    @Bean
+    @JobScope
+    fun healthCheckNotificationStep(
+        jobRepository: JobRepository,
+        transactionManager: PlatformTransactionManager,
+        healthCheckNotificationItemReader: ItemReader<UserPlantDto>,
+        waterNotificationItemProcessor: ItemProcessor<UserPlantDto, PushNotification>,
+        waterNotificationItemWriter: ItemWriter<PushNotification>,
+    ): Step {
+        return StepBuilder("healthCheckNotificationStep", jobRepository)
+            .chunk<UserPlantDto, PushNotification>(CHUNK_SIZE, transactionManager)
+            .reader(healthCheckNotificationItemReader)
+            .processor(waterNotificationItemProcessor)
+            .writer(waterNotificationItemWriter)
+            .build()
+    }
 }

batch/src/main/kotlin/dnd11th/blooming/batch/PlantNotificationProcessor.kt → batch/src/main/kotlin/dnd11th/blooming/batch/notification/PlantNotificationProcessor.kt

@@ -1,4 +1,4 @@
-package dnd11th.blooming.batch
+package dnd11th.blooming.batch.notification
 
 import dnd11th.blooming.client.fcm.PushNotification
 import dnd11th.blooming.core.entity.myplant.UserPlantDto
@@ -13,7 +13,7 @@ class PlantNotificationProcessor {
     @StepScope
     fun waterNotificationItemProcessor(): ItemProcessor<UserPlantDto, PushNotification> {
         return ItemProcessor { userPlantDto ->
-            PushNotification.create(userPlantDto.myPlantId, "token", userPlantDto.plantNickname)
+            PushNotification.create(userPlantDto.myPlantId, userPlantDto.deviceToken, userPlantDto.plantNickname)
         }
     }
 }

batch/src/main/kotlin/dnd11th/blooming/batch/notification/PlantNotificationReader.kt

@@ -0,0 +1,47 @@
+package dnd11th.blooming.batch.notification
+
+import dnd11th.blooming.core.entity.myplant.UserPlantDto
+import dnd11th.blooming.core.entity.user.AlarmTime
+import dnd11th.blooming.core.repository.myplant.MyPlantRepository
+import org.springframework.batch.core.configuration.annotation.StepScope
+import org.springframework.batch.item.support.ListItemReader
+import org.springframework.context.annotation.Bean
+import org.springframework.context.annotation.Configuration
+import java.time.LocalTime
+
+@Configuration
+class PlantNotificationReader(
+    private val myPlantRepository: MyPlantRepository,
+) {
+    @Bean
+    @StepScope
+    fun waterNotificationItemReader(): ListItemReader<UserPlantDto> {
+        val now: LocalTime = LocalTime.now()
+        // val alarmTime = AlarmTime.fromHour(now)
+        val alarmTime = AlarmTime.TIME_10_11
+
+        val userPlantByAlarmTime: List<UserPlantDto> =
+            myPlantRepository.findNeedWaterPlantsByAlarmTimeInBatch(alarmTime)
+        return ListItemReader(userPlantByAlarmTime)
+    }
+
+    @Bean
+    @StepScope
+    fun fertilizerNotificationItemReader(): ListItemReader<UserPlantDto> {
+        val now: LocalTime = LocalTime.now()
+        val alarmTime = AlarmTime.fromHour(now)
+        val userPlantByAlarmTime: List<UserPlantDto> =
+            myPlantRepository.findNeedFertilizerPlantsByAlarmTimeInBatch(alarmTime)
+        return ListItemReader(userPlantByAlarmTime)
+    }
+
+    @Bean
+    @StepScope
+    fun healthCheckNotificationItemReader(): ListItemReader<UserPlantDto> {
+        val now: LocalTime = LocalTime.now()
+        val alarmTime = AlarmTime.fromHour(now)
+        val userPlantByAlarmTime: List<UserPlantDto> =
+            myPlantRepository.findNeedHealthCheckPlantsByAlarmTimeInBatch(alarmTime)
+        return ListItemReader(userPlantByAlarmTime)
+    }
+}

batch/src/main/kotlin/dnd11th/blooming/batch/PlantNotificationWriter.kt → batch/src/main/kotlin/dnd11th/blooming/batch/notification/PlantNotificationWriter.kt

@@ -1,26 +1,36 @@
-package dnd11th.blooming.batch
+package dnd11th.blooming.batch.notification
 
 import dnd11th.blooming.client.fcm.FcmService
 import dnd11th.blooming.client.fcm.PushNotification
+import dnd11th.blooming.common.util.Logger.Companion.log
+import kotlinx.coroutines.asCoroutineDispatcher
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.runBlocking
 import org.springframework.batch.core.configuration.annotation.StepScope
 import org.springframework.batch.item.ItemWriter
 import org.springframework.context.annotation.Bean
 import org.springframework.context.annotation.Configuration
+import java.util.concurrent.Executors
+import java.util.concurrent.atomic.AtomicInteger
 
 @Configuration
 class PlantNotificationWriter(
     private val fcmService: FcmService,
 ) {
+    private var counter = AtomicInteger(0)
+    private val customDispatcher = Executors.newFixedThreadPool(3).asCoroutineDispatcher()
+
     @Bean
     @StepScope
     fun waterNotificationItemWriter(): ItemWriter<PushNotification> {
         return ItemWriter { pushNotifications ->
             runBlocking {
                 pushNotifications.forEach { pushNotification ->
-                    launch {
-                        fcmService.send(pushNotification) // 비동기 처리
+                    launch(customDispatcher) {
+                        val currentCount = counter.incrementAndGet()
+                        val threadName = Thread.currentThread().name
+                        fcmService.mock(pushNotification)
+                        log.info { "Thread: $threadName, Count: $currentCount" }
                     }
                 }
             }

batch/src/main/kotlin/dnd11th/blooming/batch/weather/WeatherCareMessageWriter.kt

@@ -8,7 +8,7 @@ import dnd11th.blooming.core.entity.region.Region
 import dnd11th.blooming.redis.entity.weather.WeatherCareMessage
 import dnd11th.blooming.redis.entity.weather.WeatherCareMessageType
 import dnd11th.blooming.redis.repository.weather.WeatherCareMessageRepository
-import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.asCoroutineDispatcher
 import kotlinx.coroutines.async
 import kotlinx.coroutines.awaitAll
 import kotlinx.coroutines.runBlocking
@@ -20,7 +20,9 @@ import org.springframework.util.StopWatch
 import java.time.LocalDate
 import java.time.format.DateTimeFormatter
 import java.util.Collections
+import java.util.concurrent.Executors
 import java.util.concurrent.TimeUnit
+import java.util.concurrent.atomic.AtomicInteger
 
 @Configuration
 class WeatherCareMessageWriter(
@@ -41,6 +43,9 @@ class WeatherCareMessageWriter(
         private const val HIGH_TEMPERATURE_THRESHOLD = 30
     }
 
+    private var counter = AtomicInteger(0)
+    private val customDispatcher = Executors.newFixedThreadPool(3).asCoroutineDispatcher()
+
     @Bean
     @StepScope
     fun weatherCareMessageItemWriter(): ItemWriter<Region> {
@@ -53,7 +58,9 @@ class WeatherCareMessageWriter(
             runBlocking {
                 val jobs =
                     regions.map { region ->
-                        async(Dispatchers.IO) {
+                        async(customDispatcher) {
+                            val currentCount = counter.incrementAndGet()
+                            val threadName = Thread.currentThread().name
                             try {
                                 val weatherItems: List<WeatherItem> =
                                     weatherInfoClient.getWeatherInfo(
@@ -68,18 +75,18 @@ class WeatherCareMessageWriter(
                             } catch (e: Exception) {
                                 log.error(e) { "날씨 데이터를 불러오는데 실패했습니다: ${region.id}" }
                             }
+                            log.info { "Thread: $threadName, Count: $currentCount" }
                         }
                     }
                 jobs.awaitAll()
                 runBlockingStopWatch.stop()
                 log.info { runBlockingStopWatch.getTotalTime(TimeUnit.MILLISECONDS) }
-
-                val saveStopWatch = StopWatch()
-                saveStopWatch.start()
-                weatherCareMessageRepository.saveAll(weatherCareMessages)
-                saveStopWatch.stop()
-                log.info { saveStopWatch.getTotalTime(TimeUnit.MILLISECONDS) }
             }
+            val saveStopWatch = StopWatch()
+            saveStopWatch.start()
+            weatherCareMessageRepository.saveAll(weatherCareMessages)
+            saveStopWatch.stop()
+            log.info { saveStopWatch.getTotalTime(TimeUnit.MILLISECONDS) }
         }
     }