release: 2.0.1 (#361)

devxb · web-flow · commit cfb3072f7f4c · 2025-04-20T15:30:06.000+09:00
diff --git a/src/main/kotlin/org/gitanimals/core/redis/RedisPubSubChannel.kt b/src/main/kotlin/org/gitanimals/core/redis/RedisPubSubChannel.kt
@@ -9,4 +9,6 @@ object RedisPubSubChannel {
     const val SLACK_REPLIED = "SLACK_REPLIED"
 
     const val DEAD_LETTER_OCCURRED = "DEAD_LETTER_OCCURRED"
+
+    const val NEW_PET_DROP_RATE_DISTRIBUTION = "NEW_PET_DROP_RATE_DISTRIBUTION"
 }
diff --git a/src/main/kotlin/org/gitanimals/render/domain/PersonaStatisticRepository.kt b/src/main/kotlin/org/gitanimals/render/domain/PersonaStatisticRepository.kt
@@ -1,5 +1,17 @@
 package org.gitanimals.render.domain
 
+import org.springframework.data.domain.Pageable
+import org.springframework.data.domain.Slice
 import org.springframework.data.jpa.repository.JpaRepository
+import org.springframework.data.jpa.repository.Query
+import org.springframework.data.repository.query.Param
+import java.time.Instant
 
-interface PersonaStatisticRepository: JpaRepository<Persona, Long>
+interface PersonaStatisticRepository : JpaRepository<Persona, Long> {
+
+    @Query("select p from persona p where p.createdAt >= :createdAt")
+    fun findAllPersonaByCreatedAtAfter(
+        @Param("createdAt") createdAt: Instant,
+        pageable: Pageable,
+    ): Slice<Persona>
+}
diff --git a/src/main/kotlin/org/gitanimals/render/domain/PersonaStatisticService.kt b/src/main/kotlin/org/gitanimals/render/domain/PersonaStatisticService.kt
@@ -1,7 +1,11 @@
 package org.gitanimals.render.domain
 
+import org.gitanimals.core.PersonaType
+import org.gitanimals.render.domain.response.NewPetDropRateDistribution
 import org.springframework.cache.annotation.Cacheable
+import org.springframework.data.domain.PageRequest
 import org.springframework.stereotype.Service
+import java.time.Instant
 
 @Service
 class PersonaStatisticService(
@@ -10,4 +14,35 @@ class PersonaStatisticService(
 
     @Cacheable(value = ["total_persona_count_cache"])
     fun getTotalPersonaCount() = personaStatisticRepository.count()
+
+    fun getAggregatedPersonaDistributionByCreatedAtAfter(createdAt: Instant): List<NewPetDropRateDistribution> {
+        var pageable = PageRequest.of(0, 100)
+        var personas = personaStatisticRepository.findAllPersonaByCreatedAtAfter(createdAt, pageable)
+
+        val newPetDropRateDistributionMap: MutableMap<Double, Int> =
+            PersonaType.entries.associateTo(mutableMapOf()) {
+                it.weight to 0
+            }
+
+        personas.content.forEach {
+            newPetDropRateDistributionMap.getOrPut(it.type.weight) { 0 }
+            newPetDropRateDistributionMap[it.type.weight] = (newPetDropRateDistributionMap[it.type.weight] ?: 0) + 1
+        }
+
+        while (personas.hasNext()) {
+            pageable = pageable.next()
+            personas = personaStatisticRepository.findAllPersonaByCreatedAtAfter(createdAt, pageable)
+            personas.content.forEach {
+                newPetDropRateDistributionMap.getOrPut(it.type.weight) { 0 }
+                newPetDropRateDistributionMap[it.type.weight] = (newPetDropRateDistributionMap[it.type.weight] ?: 0) + 1
+            }
+        }
+
+        return newPetDropRateDistributionMap.map {
+            val dropRate = it.key
+            val count = it.value
+
+            NewPetDropRateDistribution(dropRate, count)
+        }
+    }
 }
diff --git a/src/main/kotlin/org/gitanimals/render/domain/response/NewPetDropRateDistribution.kt b/src/main/kotlin/org/gitanimals/render/domain/response/NewPetDropRateDistribution.kt
@@ -0,0 +1,6 @@
+package org.gitanimals.render.domain.response
+
+data class NewPetDropRateDistribution(
+    val dropRate: Double,
+    val count: Int,
+)
diff --git a/src/main/kotlin/org/gitanimals/render/infra/NewPetDropRateDistributionReport.kt b/src/main/kotlin/org/gitanimals/render/infra/NewPetDropRateDistributionReport.kt
@@ -0,0 +1,78 @@
+package org.gitanimals.render.infra
+
+import org.gitanimals.core.IdGenerator
+import org.gitanimals.core.filter.MDCFilter.Companion.TRACE_ID
+import org.gitanimals.core.instant
+import org.gitanimals.render.domain.PersonaStatisticService
+import org.gitanimals.render.infra.event.NewPetDropRateDistributionEvent
+import org.gitanimals.render.infra.event.Type
+import org.slf4j.LoggerFactory
+import org.slf4j.MDC
+import org.springframework.context.ApplicationEventPublisher
+import org.springframework.scheduling.annotation.Scheduled
+import org.springframework.stereotype.Component
+import java.time.temporal.ChronoUnit
+
+@Component
+class NewPetDropRateDistributionReport(
+    private val personaStatisticService: PersonaStatisticService,
+    private val applicationEventPublisher: ApplicationEventPublisher,
+) {
+
+    private val logger = LoggerFactory.getLogger(this::class.simpleName)
+
+    @Scheduled(cron = EVERY_9AM, zone = "Asia/Seoul")
+    fun reportDailyNewPetDropRateDistribution() {
+        runCatching {
+            publishDropRateDistribution(1, Type.DAILY)
+        }.also {
+            MDC.remove(TRACE_ID)
+        }
+    }
+
+    @Scheduled(cron = EVERY_SUNDAY_9AM, zone = "Asia/Seoul")
+    fun reportWeeklyNewPetDropRateDistribution() {
+        runCatching {
+            publishDropRateDistribution(7, Type.DAILY)
+        }.also {
+            MDC.remove(TRACE_ID)
+        }
+    }
+
+    @Scheduled(cron = EVERY_FIRST_DAY_OF_MONTH_9AM, zone = "Asia/Seoul")
+    fun reportMonthlyNewPetDropRateDistribution() {
+        runCatching {
+            publishDropRateDistribution(30, Type.DAILY)
+        }.also {
+            MDC.remove(TRACE_ID)
+        }
+    }
+
+    private fun publishDropRateDistribution(days: Long, type: Type) {
+        MDC.put(TRACE_ID, IdGenerator.generate().toString())
+
+        logger.info("[NewPetDropRateDistributionReport] Aggregate yesterday days pet distribution drop rate...")
+
+        val createdAt = instant().minus(days, ChronoUnit.DAYS).truncatedTo(ChronoUnit.DAYS)
+        val distributionResponse =
+            personaStatisticService.getAggregatedPersonaDistributionByCreatedAtAfter(createdAt)
+
+        val event = NewPetDropRateDistributionEvent(
+            type = type,
+            distributions = distributionResponse.map {
+                NewPetDropRateDistributionEvent.Distribution(
+                    it.dropRate,
+                    it.count,
+                )
+            }
+        )
+
+        applicationEventPublisher.publishEvent(event)
+    }
+
+    companion object {
+        private const val EVERY_9AM = "0 0 9 * * ?"
+        private const val EVERY_SUNDAY_9AM = "0 0 9 * * SUN"
+        private const val EVERY_FIRST_DAY_OF_MONTH_9AM = "0 0 9 1 * *"
+    }
+}
diff --git a/src/main/kotlin/org/gitanimals/render/infra/event/NewPetDropRateDistributionEvent.kt b/src/main/kotlin/org/gitanimals/render/infra/event/NewPetDropRateDistributionEvent.kt
@@ -0,0 +1,25 @@
+package org.gitanimals.render.infra.event
+
+import org.gitanimals.core.filter.MDCFilter.Companion.TRACE_ID
+import org.gitanimals.core.redis.AsyncRedisPubSubEvent
+import org.gitanimals.core.redis.RedisPubSubChannel.NEW_PET_DROP_RATE_DISTRIBUTION
+import org.slf4j.MDC
+
+data class NewPetDropRateDistributionEvent(
+    val type: Type,
+    val distributions: List<Distribution>,
+) : AsyncRedisPubSubEvent(
+    traceId = MDC.get(TRACE_ID),
+    channel = NEW_PET_DROP_RATE_DISTRIBUTION,
+) {
+    data class Distribution(
+        val dropRate: Double,
+        val count: Int,
+    )
+}
+
+enum class Type {
+    DAILY,
+    WEEKLY,
+    MONTHLY,
+}
diff --git a/src/test/kotlin/org/gitanimals/render/domain/PersonaStatisticServiceTest.kt b/src/test/kotlin/org/gitanimals/render/domain/PersonaStatisticServiceTest.kt
@@ -2,8 +2,11 @@ package org.gitanimals.render.domain
 
 import io.kotest.core.annotation.DisplayName
 import io.kotest.core.spec.style.DescribeSpec
+import io.kotest.matchers.shouldBe
 import io.kotest.matchers.shouldNotBe
+import org.gitanimals.core.instant
 import org.gitanimals.render.infra.CacheConfigurer
+import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.boot.autoconfigure.domain.EntityScan
 import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest
 import org.springframework.cache.CacheManager
@@ -17,7 +20,7 @@ import org.springframework.test.context.ContextConfiguration
 @ContextConfiguration(
     classes = [
         CacheConfigurer::class,
-        PersonaStatisticService::class
+        PersonaStatisticService::class,
     ]
 )
 @DisplayName("PersonaStatisticService 클래스의")
@@ -26,6 +29,8 @@ import org.springframework.test.context.ContextConfiguration
 internal class PersonaStatisticServiceTest(
     private val cacheManager: CacheManager,
     private val personaStatisticService: PersonaStatisticService,
+    private val personaStatisticRepository: PersonaStatisticRepository,
+    private val userRepository: UserRepository,
 ) : DescribeSpec({
     describe("getTotalPersonaCount 메소드는") {
         context("호출되면,") {
@@ -37,4 +42,25 @@ internal class PersonaStatisticServiceTest(
             }
         }
     }
-})
+
+    describe("getAggregatedPersonaDistributionByCreatedAtAfter 메소드는") {
+        context("createdAt을 받으면,") {
+            val user = userRepository.save(user())
+            val createdAt = instant()
+
+            for (i in 0..100) {
+                personaStatisticRepository.save(persona(user = user))
+            }
+
+            it("createdAt보다 이후에 생성된 모든 persona의 dropRate count를 집계한다") {
+                val expectedCount = 101
+
+                val result = personaStatisticService
+                    .getAggregatedPersonaDistributionByCreatedAtAfter(createdAt)
+
+                result.sumOf { it.count } shouldBe expectedCount
+            }
+        }
+    }
+}) {
+}
diff --git a/src/test/kotlin/org/gitanimals/render/domain/UserFixture.kt b/src/test/kotlin/org/gitanimals/render/domain/UserFixture.kt
@@ -1,7 +1,9 @@
 package org.gitanimals.render.domain
 
 import org.gitanimals.core.IdGenerator
+import org.gitanimals.core.PersonaType
 import org.gitanimals.render.domain.value.Contribution
+import org.gitanimals.render.domain.value.Level
 
 fun user(
     id: Long = IdGenerator.generate(),
@@ -20,3 +22,15 @@ fun user(
         lastPersonaGivePoint = 0,
     )
 }
+
+fun persona(
+    id: Long = IdGenerator.generate(),
+    type: PersonaType = PersonaType.CAT,
+    user: User,
+) = Persona(
+    id = id,
+    type = type,
+    level = Level(0),
+    visible = false,
+    user = user,
+)

Original file line number	Diff line number	Diff line change
`@@ -9,4 +9,6 @@ object RedisPubSubChannel {`
`9`	`9`	`const val SLACK_REPLIED = "SLACK_REPLIED"`
`10`	`10`
`11`	`11`	`const val DEAD_LETTER_OCCURRED = "DEAD_LETTER_OCCURRED"`
	`12`	`+`
	`13`	`+ const val NEW_PET_DROP_RATE_DISTRIBUTION = "NEW_PET_DROP_RATE_DISTRIBUTION"`
`12`	`14`	`}`