release: 2.4.1 (#429)

devxb · web-flow · commit d47dcbf6690c · 2025-09-16T23:24:59.000+09:00
diff --git a/src/main/kotlin/org/gitanimals/core/PersonaEvolutionType.kt b/src/main/kotlin/org/gitanimals/core/PersonaEvolutionType.kt
@@ -0,0 +1,23 @@
+package org.gitanimals.core
+
+
+data class PersonaEvolution(
+    val weight: Double,
+    val type: PersonaEvolutionType,
+) {
+
+    companion object {
+
+        val nothing = PersonaEvolution(
+            weight = 0.0,
+            type = PersonaEvolutionType.NOTHING,
+        )
+    }
+}
+
+enum class PersonaEvolutionType {
+
+    NOTHING,
+    RABBIT,
+    ;
+}
diff --git a/src/main/kotlin/org/gitanimals/core/PersonaType.kt b/src/main/kotlin/org/gitanimals/core/PersonaType.kt
@@ -9,6 +9,7 @@ import kotlin.random.Random
 enum class PersonaType(
     val weight: Double,
     val grade: PersonaGrade = PersonaGrade.DEFAULT,
+    val personaEvolution: PersonaEvolution = PersonaEvolution.nothing,
     private var dropRate: String? = null,
 ) {
     GOOSE(1.0) {
@@ -1510,7 +1511,7 @@ enum class PersonaType(
             StringBuilder().moveRandomly("mole", id, 40, "180s", 5, 14.0)
                 .toString()
     },
-    RABBIT(0.9) {
+    RABBIT(weight =0.9, personaEvolution = PersonaEvolution(weight = 0.001, PersonaEvolutionType.RABBIT)) {
         override fun loadSvg(name: String, animationId: Long, level: Long, mode: Mode): String {
             return rabbitSvg.replace("*{act}", act(animationId))
                 .replace("*{id}", animationId.toString())
@@ -1530,7 +1531,7 @@ enum class PersonaType(
             StringBuilder().moveRandomly("rabbit", id, 40, "180s", 5, 10.0)
                 .toString()
     },
-    RABBIT_BROWN_RUDOLPH(0.007) {
+    RABBIT_BROWN_RUDOLPH(weight = 0.007, personaEvolution = PersonaEvolution(weight = 0.01, PersonaEvolutionType.RABBIT)) {
         override fun loadSvg(name: String, animationId: Long, level: Long, mode: Mode): String {
             return rabbitBrownRudolphSvg.replace("*{act}", act(animationId))
                 .replace("*{id}", animationId.toString())
@@ -1570,7 +1571,7 @@ enum class PersonaType(
             StringBuilder().moveRandomly("rabbit", id, 40, "180s", 5, 10.0)
                 .toString()
     },
-    RABBIT_TUBE(0.01) {
+    RABBIT_TUBE(weight = 0.01, personaEvolution = PersonaEvolution(weight = 0.02, PersonaEvolutionType.RABBIT)) {
         override fun loadSvg(name: String, animationId: Long, level: Long, mode: Mode): String {
             return rabbitTubeSvg.replace("*{act}", act(animationId))
                 .replace("*{id}", animationId.toString())
@@ -2352,6 +2353,14 @@ enum class PersonaType(
         }
     }
 
+    fun randomEvolution(): PersonaType {
+        val evolutionCandidates = personasPerEvolutionType[personaEvolution.type]
+        require(evolutionCandidates.isNullOrEmpty().not()) {
+            "Cannot find evolution candidates. personaType: ${this.name}, evolutionType: ${this.personaEvolution.type}"
+        }
+        return evolutionCandidates!!.random()
+    }
+
     companion object {
         private val dropRateFormat = DecimalFormat("#.##")
 
@@ -2373,6 +2382,30 @@ enum class PersonaType(
             weightedPersonas.shuffled()
         }.value
 
+        private val personasPerEvolutionType: Map<PersonaEvolutionType, List<PersonaType>> = lazy {
+            val weightedEvolutionPersonas = PersonaEvolutionType.entries.filterNot {
+                it == PersonaEvolutionType.NOTHING
+            }.associateWith { mutableListOf<PersonaType>() }
+
+            entries.filterNot {
+                it.personaEvolution == PersonaEvolution.nothing
+            }.forEach { personaType ->
+                val personaTypes = weightedEvolutionPersonas.getOrElse(personaType.personaEvolution.type) {
+                    mutableListOf()
+                }
+
+                repeat((personaType.personaEvolution.weight * 1000).toInt()) {
+                    personaTypes.add(personaType)
+                }
+            }
+
+            weightedEvolutionPersonas.forEach { (_, value) ->
+                value.shuffle()
+            }
+
+            weightedEvolutionPersonas
+        }.value
+
         fun random(): PersonaType = personas[Random.nextInt(0, maxWeight)]
 
         private fun StringBuilder.moveRandomly(
diff --git a/src/main/kotlin/org/gitanimals/render/app/IdentityApi.kt b/src/main/kotlin/org/gitanimals/render/app/IdentityApi.kt
@@ -19,6 +19,11 @@ interface IdentityApi {
         @RequestParam("idempotency-key") idempotencyKey: String,
     )
 
+    @GetExchange("/internals/users/{user-id}")
+    fun getUserById(
+        @PathVariable("user-id") userId: Long
+    ): UserResponse
+
     data class UserResponse(
         val id: String,
         val username: String,
diff --git a/src/main/kotlin/org/gitanimals/render/app/PersonaEvolutionFacade.kt b/src/main/kotlin/org/gitanimals/render/app/PersonaEvolutionFacade.kt
@@ -0,0 +1,30 @@
+package org.gitanimals.render.app
+
+import org.gitanimals.render.domain.UserService
+import org.gitanimals.render.domain.response.PersonaResponse
+import org.springframework.stereotype.Service
+
+@Service
+class PersonaEvolutionFacade(
+    private val identityApi: IdentityApi,
+    private val userService: UserService,
+) {
+
+    fun evolutionPersona(token: String, personaId: Long): PersonaResponse {
+        val user = identityApi.getUserByToken(token)
+
+        return userService.evolutionPersona(
+            name = user.username,
+            personaId = personaId,
+        )
+    }
+
+    fun isEvoluationable(token: String, personaId: Long): Boolean {
+        val user = identityApi.getUserByToken(token)
+
+        return userService.isEvoluationable(
+            name = user.username,
+            personaId = personaId,
+        )
+    }
+}
diff --git a/src/main/kotlin/org/gitanimals/render/controller/PersonaEvolutionController.kt b/src/main/kotlin/org/gitanimals/render/controller/PersonaEvolutionController.kt
@@ -0,0 +1,46 @@
+package org.gitanimals.render.controller
+
+import org.gitanimals.core.auth.RequiredUserEntryPoints
+import org.gitanimals.core.auth.UserEntryPoint
+import org.gitanimals.render.app.PersonaEvolutionFacade
+import org.gitanimals.render.controller.response.PersonaEvolutionableResponse
+import org.gitanimals.render.controller.response.PersonaResponse
+import org.springframework.http.HttpHeaders
+import org.springframework.http.HttpStatus
+import org.springframework.web.bind.annotation.*
+
+@RestController
+class PersonaEvolutionController(
+    private val personaEvolutionFacade: PersonaEvolutionFacade,
+) {
+
+    @PostMapping("/personas/{personaId}/evolution")
+    @ResponseStatus(HttpStatus.OK)
+    @RequiredUserEntryPoints([UserEntryPoint.GITHUB])
+    fun evolutionPersona(
+        @RequestHeader(HttpHeaders.AUTHORIZATION) token: String,
+        @PathVariable personaId: Long,
+    ): PersonaResponse {
+        return PersonaResponse.from(
+            personaEvolutionFacade.evolutionPersona(
+                token = token,
+                personaId = personaId,
+            )
+        )
+    }
+
+    @GetMapping("/personas/{personaId}/evolution")
+    @ResponseStatus(HttpStatus.OK)
+    @RequiredUserEntryPoints([UserEntryPoint.GITHUB])
+    fun isEvolutionablePersona(
+        @RequestHeader(HttpHeaders.AUTHORIZATION) token: String,
+        @PathVariable personaId: Long,
+    ): PersonaEvolutionableResponse {
+        return PersonaEvolutionableResponse(
+            evolutionAble = personaEvolutionFacade.isEvoluationable(
+                token = token,
+                personaId = personaId,
+            )
+        )
+    }
+}
diff --git a/src/main/kotlin/org/gitanimals/render/controller/response/PersonaEvolutionableResponse.kt b/src/main/kotlin/org/gitanimals/render/controller/response/PersonaEvolutionableResponse.kt
@@ -0,0 +1,5 @@
+package org.gitanimals.render.controller.response
+
+data class PersonaEvolutionableResponse(
+    val evolutionAble: Boolean
+)
diff --git a/src/main/kotlin/org/gitanimals/render/controller/response/UserResponse.kt b/src/main/kotlin/org/gitanimals/render/controller/response/UserResponse.kt
@@ -18,12 +18,12 @@ data class UserResponse(
                 user.personas.map {
                     PersonaResponse(
                         id = it.id.toString(),
-                        type = it.type,
+                        type = it.getType(),
                         level = it.level().toString(),
                         visible = it.visible,
                         appVisible = it.appVisible,
-                        dropRate = it.type.getDropRate(),
-                        grade = it.type.grade,
+                        dropRate = it.getType().getDropRate(),
+                        grade = it.getType().grade,
                     )
                 }.toList()
             )
@@ -39,12 +39,12 @@ data class UserResponse(
                 }.map {
                     PersonaResponse(
                         id = it.id.toString(),
-                        type = it.type,
+                        type = it.getType(),
                         level = it.level().toString(),
                         visible = it.visible,
                         appVisible = it.appVisible,
-                        dropRate = it.type.getDropRate(),
-                        grade = it.type.grade,
+                        dropRate = it.getType().getDropRate(),
+                        grade = it.getType().grade,
                     )
                 }.toList()
             )
@@ -60,12 +60,12 @@ data class UserResponse(
                     .let {
                         PersonaResponse(
                             id = it.id.toString(),
-                            type = it.type,
+                            type = it.getType(),
                             level = it.level().toString(),
                             visible = it.visible,
                             appVisible = it.appVisible,
-                            dropRate = it.type.getDropRate(),
-                            grade = it.type.grade,
+                            dropRate = it.getType().getDropRate(),
+                            grade = it.getType().grade,
                         )
                     }
                 )
diff --git a/src/main/kotlin/org/gitanimals/render/domain/Persona.kt b/src/main/kotlin/org/gitanimals/render/domain/Persona.kt
@@ -4,6 +4,7 @@ import com.fasterxml.jackson.annotation.JsonIgnore
 import jakarta.persistence.*
 import org.gitanimals.core.IdGenerator
 import org.gitanimals.core.Mode
+import org.gitanimals.core.PersonaEvolution
 import org.gitanimals.core.PersonaType
 import org.gitanimals.render.domain.value.Level
 
@@ -16,7 +17,7 @@ class Persona(
 
     @Column(name = "type", nullable = false, columnDefinition = "TEXT")
     @Enumerated(EnumType.STRING)
-    val type: PersonaType,
+    private var type: PersonaType,
 
     @Embedded
     val level: Level,
@@ -56,6 +57,7 @@ class Persona(
         user = user
     )
 
+    fun getType() = this.type
 
     fun toSvgForce(mode: Mode): String = type.load(
         name = user!!.getName(),
@@ -80,4 +82,14 @@ class Persona(
     }
 
     fun level(): Long = level.value
+
+    fun evolution() {
+        require (type.personaEvolution != PersonaEvolution.nothing) {
+            "Evolution fail cause, not support evolution type :${type.name}"
+        }
+
+        val evolutionedPersonaType = this.type.randomEvolution()
+        this.type = evolutionedPersonaType
+        this.level.value = 0
+    }
 }
diff --git a/src/main/kotlin/org/gitanimals/render/domain/PersonaStatisticService.kt b/src/main/kotlin/org/gitanimals/render/domain/PersonaStatisticService.kt
@@ -25,16 +25,16 @@ class PersonaStatisticService(
             }
 
         personas.content.forEach {
-            newPetDropRateDistributionMap.getOrPut(it.type.weight) { 0 }
-            newPetDropRateDistributionMap[it.type.weight] = (newPetDropRateDistributionMap[it.type.weight] ?: 0) + 1
+            newPetDropRateDistributionMap.getOrPut(it.getType().weight) { 0 }
+            newPetDropRateDistributionMap[it.getType().weight] = (newPetDropRateDistributionMap[it.getType().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
+                newPetDropRateDistributionMap.getOrPut(it.getType().weight) { 0 }
+                newPetDropRateDistributionMap[it.getType().weight] = (newPetDropRateDistributionMap[it.getType().weight] ?: 0) + 1
             }
         }
 
diff --git a/src/main/kotlin/org/gitanimals/render/domain/User.kt b/src/main/kotlin/org/gitanimals/render/domain/User.kt
@@ -340,12 +340,35 @@ class User(
         .append("</svg>")
         .toString()
 
+    fun evolution(personaId: Long): Persona {
+        val persona = personas.firstOrNull {
+            it.id == personaId
+        } ?: throw IllegalArgumentException("Cannot evolution persona cause cannot find matched persona by id: \"$personaId\"")
+
+        require(persona.level() >= EVOLUTION_REQUIRED_LEVEL) {
+            "Cannot evolution persona cause, ${persona.level()} is not enough level for evolution."
+        }
+
+        persona.evolution()
+        return persona
+    }
+
+    fun isEvolutionable(personaId: Long): Boolean {
+        val persona = personas.firstOrNull {
+            it.id == personaId
+        } ?: throw IllegalArgumentException("Cannot evolution persona cause cannot find matched persona by id: \"$personaId\"")
+
+        return persona.level() >= EVOLUTION_REQUIRED_LEVEL && persona.getType().personaEvolution != PersonaEvolution.nothing
+    }
+
     companion object {
         private const val MAX_PERSONA_COUNT = 30L
         private const val MAX_INIT_PERSONA_COUNT = 10L
         private const val FOR_NEW_PERSONA_COUNT = 30L
         private const val FOR_INIT_PERSONA_COUNT = 100L
 
+        private const val EVOLUTION_REQUIRED_LEVEL = 100L
+
         private val nameConvention = Regex("[^a-zA-Z0-9-]")
 
         private val logger = LoggerFactory.getLogger(this::class.simpleName)
diff --git a/src/main/kotlin/org/gitanimals/render/domain/UserService.kt b/src/main/kotlin/org/gitanimals/render/domain/UserService.kt
@@ -206,6 +206,23 @@ class UserService(
         user.updateName(username)
     }
 
+    @Transactional
+    fun evolutionPersona(name: String, personaId: Long): PersonaResponse {
+        val user = getUserByName(name)
+        val evolutionedPersona = user.evolution(personaId)
+
+        return PersonaResponse.from(persona = evolutionedPersona)
+    }
+
+    @Transactional(readOnly = true)
+    fun isEvoluationable(name: String, personaId: Long): Boolean {
+        val user = getUserByName(name)
+
+        return user.isEvolutionable(
+            personaId = personaId
+        )
+    }
+
     private fun getUserById(id: Long): User {
         return userRepository.findByIdOrNull(id)
             ?: throw IllegalArgumentException("Cannot find user by id : \"$id\"")
diff --git a/src/main/kotlin/org/gitanimals/render/domain/response/PersonaResponse.kt b/src/main/kotlin/org/gitanimals/render/domain/response/PersonaResponse.kt
@@ -17,12 +17,12 @@ data class PersonaResponse(
         fun from(persona: Persona): PersonaResponse {
             return PersonaResponse(
                 id = persona.id.toString(),
-                type = persona.type,
+                type = persona.getType(),
                 level = persona.level.value.toString(),
                 visible = persona.visible,
                 appVisible = persona.appVisible,
-                dropRate = persona.type.getDropRate(),
-                grade = persona.type.grade,
+                dropRate = persona.getType().getDropRate(),
+                grade = persona.getType().grade,
             )
         }
     }
diff --git a/src/main/kotlin/org/gitanimals/render/domain/value/Level.kt b/src/main/kotlin/org/gitanimals/render/domain/value/Level.kt
@@ -3,7 +3,6 @@ package org.gitanimals.render.domain.value
 import jakarta.persistence.Column
 import jakarta.persistence.Embeddable
 
-
 @Embeddable
 data class Level(
     @Column(name = "level", nullable = false)
diff --git a/src/test/kotlin/org/gitanimals/render/domain/UserServiceTest.kt b/src/test/kotlin/org/gitanimals/render/domain/UserServiceTest.kt
diff --git a/src/test/kotlin/org/gitanimals/render/domain/UserTest.kt b/src/test/kotlin/org/gitanimals/render/domain/UserTest.kt
diff --git a/src/test/kotlin/org/gitanimals/render/saga/UsedCouponSagaHandlerTest.kt b/src/test/kotlin/org/gitanimals/render/saga/UsedCouponSagaHandlerTest.kt

Original file line number	Diff line number	Diff line change
`@@ -25,16 +25,16 @@ class PersonaStatisticService(`
`25`	`25`	`}`
`26`	`26`
`27`	`27`	`personas.content.forEach {`
`28`		`- newPetDropRateDistributionMap.getOrPut(it.type.weight) { 0 }`
`29`		`- newPetDropRateDistributionMap[it.type.weight] = (newPetDropRateDistributionMap[it.type.weight] ?: 0) + 1`
	`28`	`+ newPetDropRateDistributionMap.getOrPut(it.getType().weight) { 0 }`
	`29`	`+ newPetDropRateDistributionMap[it.getType().weight] = (newPetDropRateDistributionMap[it.getType().weight] ?: 0) + 1`
`30`	`30`	`}`
`31`	`31`
`32`	`32`	`while (personas.hasNext()) {`
`33`	`33`	`pageable = pageable.next()`
`34`	`34`	`personas = personaStatisticRepository.findAllPersonaByCreatedAtAfter(createdAt, pageable)`
`35`	`35`	`personas.content.forEach {`
`36`		`- newPetDropRateDistributionMap.getOrPut(it.type.weight) { 0 }`
`37`		`- newPetDropRateDistributionMap[it.type.weight] = (newPetDropRateDistributionMap[it.type.weight] ?: 0) + 1`
	`36`	`+ newPetDropRateDistributionMap.getOrPut(it.getType().weight) { 0 }`
	`37`	`+ newPetDropRateDistributionMap[it.getType().weight] = (newPetDropRateDistributionMap[it.getType().weight] ?: 0) + 1`
`38`	`38`	`}`
`39`	`39`	`}`
`40`	`40`