release: 2.4.6 (#435)

Author: devxb

src/main/kotlin/org/gitanimals/render/controller/InternalPersonaController.kt

@@ -40,15 +40,7 @@ class InternalPersonaController(
             addPersonaRequest.level,
         )
 
-        return PersonaResponse(
-            id = persona.id,
-            type = persona.type,
-            level = persona.level,
-            visible = persona.visible,
-            appVisible = persona.appVisible,
-            dropRate = persona.dropRate,
-            grade = persona.grade,
-        )
+        return PersonaResponse.from(persona)
     }
 
     @PostMapping("/internals/personas/multiply")
@@ -66,15 +58,7 @@ class InternalPersonaController(
                 0,
             )
 
-            PersonaResponse(
-                id = persona.id,
-                type = persona.type,
-                level = persona.level,
-                visible = persona.visible,
-                appVisible = persona.appVisible,
-                dropRate = persona.dropRate,
-                grade = persona.grade,
-            )
+            PersonaResponse.from(persona)
         }
     }
 
@@ -86,15 +70,7 @@ class InternalPersonaController(
     ): PersonaResponse {
         val persona = userFacade.deletePersona(token, personaId)
 
-        return PersonaResponse(
-            id = persona.id,
-            type = persona.type,
-            level = persona.level,
-            visible = persona.visible,
-            appVisible = persona.appVisible,
-            dropRate = persona.dropRate,
-            grade = persona.grade,
-        )
+        return PersonaResponse.from(persona)
     }
 
     @GetMapping("/internals/personas/all")

src/main/kotlin/org/gitanimals/render/controller/PersonaController.kt

@@ -35,15 +35,7 @@ class PersonaController(
     ): PersonaResponse {
         val persona = userFacade.getPersona(token, personaId)
 
-        return PersonaResponse(
-            id = persona.id,
-            type = persona.type,
-            level = persona.level,
-            visible = persona.visible,
-            appVisible = persona.appVisible,
-            dropRate = persona.dropRate,
-            grade = persona.grade,
-        )
+        return PersonaResponse.from(persona)
     }
 
     @PatchMapping("/personas")
@@ -55,15 +47,7 @@ class PersonaController(
     ): PersonaResponse {
         val changedPersona = userFacade.changePersona(token, personaChangeRequest)
 
-        return PersonaResponse(
-            id = changedPersona.id,
-            type = changedPersona.type,
-            level = changedPersona.level,
-            visible = changedPersona.visible,
-            appVisible = changedPersona.appVisible,
-            dropRate = changedPersona.dropRate,
-            grade = changedPersona.grade,
-        )
+        return PersonaResponse.from(changedPersona)
     }
 
     @GetMapping("/personas/infos")

src/main/kotlin/org/gitanimals/render/controller/response/PersonaResponse.kt

@@ -2,6 +2,7 @@ package org.gitanimals.render.controller.response
 
 import org.gitanimals.core.PersonaGrade
 import org.gitanimals.core.PersonaType
+import org.gitanimals.render.domain.Persona
 import org.gitanimals.render.domain.response.PersonaResponse
 
 data class PersonaResponse(
@@ -12,6 +13,7 @@ data class PersonaResponse(
     val appVisible: Boolean,
     val dropRate: String,
     val grade: PersonaGrade,
+    val isEvolutionable: Boolean,
 ) {
 
     companion object {
@@ -24,6 +26,20 @@ data class PersonaResponse(
                 appVisible = personaResponse.appVisible,
                 dropRate = personaResponse.dropRate,
                 grade = personaResponse.grade,
+                isEvolutionable = personaResponse.isEvolutionable,
+            )
+        }
+
+        fun from(persona: Persona): org.gitanimals.render.controller.response.PersonaResponse {
+            return org.gitanimals.render.controller.response.PersonaResponse(
+                id = persona.id.toString(),
+                type = persona.getType(),
+                level = persona.level().toString(),
+                visible = persona.visible,
+                appVisible = persona.appVisible,
+                dropRate = persona.getType().getDropRate(),
+                grade = persona.getType().grade,
+                isEvolutionable = persona.isEvolutionable(),
             )
         }
     }

src/main/kotlin/org/gitanimals/render/controller/response/UserResponse.kt

@@ -16,15 +16,7 @@ data class UserResponse(
                 user.getName(),
                 user.contributionCount().toString(),
                 user.personas.map {
-                    PersonaResponse(
-                        id = it.id.toString(),
-                        type = it.getType(),
-                        level = it.level().toString(),
-                        visible = it.visible,
-                        appVisible = it.appVisible,
-                        dropRate = it.getType().getDropRate(),
-                        grade = it.getType().grade,
-                    )
+                    PersonaResponse.from(it)
                 }.toList()
             )
         }
@@ -36,17 +28,7 @@ data class UserResponse(
                 user.contributionCount().toString(),
                 user.personas.filter {
                     it.id in personaId
-                }.map {
-                    PersonaResponse(
-                        id = it.id.toString(),
-                        type = it.getType(),
-                        level = it.level().toString(),
-                        visible = it.visible,
-                        appVisible = it.appVisible,
-                        dropRate = it.getType().getDropRate(),
-                        grade = it.getType().grade,
-                    )
-                }.toList()
+                }.map { PersonaResponse.from(it) }.toList()
             )
         }
 
@@ -57,17 +39,7 @@ data class UserResponse(
                 totalContributions = user.contributionCount().toString(),
                 personas = listOf(user.personas
                     .maxBy { it.level() }
-                    .let {
-                        PersonaResponse(
-                            id = it.id.toString(),
-                            type = it.getType(),
-                            level = it.level().toString(),
-                            visible = it.visible,
-                            appVisible = it.appVisible,
-                            dropRate = it.getType().getDropRate(),
-                            grade = it.getType().grade,
-                        )
-                    }
+                    .let { PersonaResponse.from(it) }
                 )
             )
         }

src/main/kotlin/org/gitanimals/render/domain/Persona.kt

@@ -83,13 +83,24 @@ class Persona(
 
     fun level(): Long = level.value
 
+    fun isEvolutionable(): Boolean {
+        return level() >= EVOLUTION_REQUIRED_LEVEL && getType().personaEvolution != PersonaEvolution.nothing
+    }
+
     fun evolution() {
         require (type.personaEvolution != PersonaEvolution.nothing) {
             "Evolution fail cause, not support evolution type :${type.name}"
         }
+        require(level() >= EVOLUTION_REQUIRED_LEVEL) {
+            "Cannot evolution persona cause, ${level()} is not enough level for evolution."
+        }
 
         val evolutionedPersonaType = this.type.randomEvolution()
         this.type = evolutionedPersonaType
         this.level.value = 0
     }
+
+    companion object {
+        private const val EVOLUTION_REQUIRED_LEVEL = 100L
+    }
 }

src/main/kotlin/org/gitanimals/render/domain/User.kt

@@ -345,10 +345,6 @@ class User(
             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
     }
@@ -358,7 +354,7 @@ class User(
             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
+        return persona.isEvolutionable()
     }
 
     companion object {
@@ -367,8 +363,6 @@ class User(
         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)

src/main/kotlin/org/gitanimals/render/domain/response/PersonaResponse.kt

@@ -12,6 +12,7 @@ data class PersonaResponse(
     val appVisible: Boolean,
     val dropRate: String,
     val grade: PersonaGrade,
+    val isEvolutionable: Boolean,
 ) {
     companion object {
         fun from(persona: Persona): PersonaResponse {
@@ -23,6 +24,7 @@ data class PersonaResponse(
                 appVisible = persona.appVisible,
                 dropRate = persona.getType().getDropRate(),
                 grade = persona.getType().grade,
+                isEvolutionable = persona.isEvolutionable(),
             )
         }
     }

src/test/kotlin/org/gitanimals/render/domain/UserServiceTest.kt

@@ -95,7 +95,7 @@ internal class UserServiceTest(
                 name = user.getName(),
                 id = personaId,
                 idempotencyKey = IdGenerator.generate().toString(),
-                personaType = PersonaType.CAT.name,
+                personaType = PersonaType.LITTLE_CHICK.name,
                 level = 99,
             )