release: 0.6.1 (#77)

git-goods · Jun 8, 2024 · 5e8f945 · 5e8f945
2 parents 3390fb5 + d40a1b6
commit 5e8f945
Show file tree

Hide file tree

Showing 8 changed files with 100 additions and 24 deletions.
diff --git a/src/main/kotlin/org/gitanimals/render/controller/PersonaController.kt b/src/main/kotlin/org/gitanimals/render/controller/PersonaController.kt
@@ -4,8 +4,10 @@ import org.gitanimals.render.app.AuthorizationException
 import org.gitanimals.render.app.UserFacade
 import org.gitanimals.render.controller.request.AddPersonaRequest
 import org.gitanimals.render.controller.response.ErrorResponse
+import org.gitanimals.render.controller.response.PersonaEnumResponse
 import org.gitanimals.render.controller.response.PersonaResponse
 import org.gitanimals.render.controller.response.UserResponse
+import org.gitanimals.render.domain.PersonaType
 import org.gitanimals.render.domain.UserService
 import org.gitanimals.render.domain.request.PersonaChangeRequest
 import org.springframework.http.HttpHeaders
@@ -30,7 +32,13 @@ class PersonaController(
     ): PersonaResponse {
         val persona = userFacade.getPersona(token, personaId)
 
-        return PersonaResponse(persona.id, persona.type, persona.level, persona.visible)
+        return PersonaResponse(
+            persona.id,
+            persona.type,
+            persona.level,
+            persona.visible,
+            persona.dropRate
+        )
     }
 
     @PatchMapping("/personas")
@@ -46,9 +54,27 @@ class PersonaController(
             changedPersona.type,
             changedPersona.level,
             changedPersona.visible,
+            changedPersona.dropRate,
+        )
+    }
+
+    @GetMapping("/personas/infos")
+    @ResponseStatus(HttpStatus.OK)
+    fun getAllPersonaInfo(): Map<String, List<PersonaEnumResponse>> {
+        return mapOf(
+            "personas" to PersonaType.entries
+                .sortedByDescending { it.weight }
+                .asSequence()
+                .map { PersonaEnumResponse.from(it) }
+                .toList()
         )
     }
 
+    @ExceptionHandler(IllegalArgumentException::class)
+    @ResponseStatus(HttpStatus.BAD_REQUEST)
+    fun handleIllegalArgumentException(exception: IllegalArgumentException): ErrorResponse =
+        ErrorResponse.from(exception)
+
     @PostMapping("/internals/personas")
     fun addPersona(
         @RequestHeader(HttpHeaders.AUTHORIZATION) token: String,
@@ -63,7 +89,13 @@ class PersonaController(
             addPersonaRequest.level,
         )
 
-        return PersonaResponse(persona.id, persona.type, persona.level, persona.visible)
+        return PersonaResponse(
+            persona.id,
+            persona.type,
+            persona.level,
+            persona.visible,
+            persona.dropRate,
+        )
     }
 
     @DeleteMapping("/internals/personas")
@@ -73,14 +105,15 @@ class PersonaController(
     ): PersonaResponse {
         val persona = userFacade.deletePersona(token, personaId)
 
-        return PersonaResponse(persona.id, persona.type, persona.level, persona.visible)
+        return PersonaResponse(
+            persona.id,
+            persona.type,
+            persona.level,
+            persona.visible,
+            persona.dropRate,
+        )
     }
 
-    @ExceptionHandler(IllegalArgumentException::class)
-    @ResponseStatus(HttpStatus.BAD_REQUEST)
-    fun handleIllegalArgumentException(exception: IllegalArgumentException): ErrorResponse =
-        ErrorResponse.from(exception)
-
     @ExceptionHandler(AuthorizationException::class)
     @ResponseStatus(HttpStatus.UNAUTHORIZED)
     fun handleAuthorizationException(exception: AuthorizationException): ErrorResponse =

diff --git a/src/main/kotlin/org/gitanimals/render/controller/response/PersonaEnumResponse.kt b/src/main/kotlin/org/gitanimals/render/controller/response/PersonaEnumResponse.kt
@@ -0,0 +1,15 @@
+package org.gitanimals.render.controller.response
+
+import org.gitanimals.render.domain.PersonaType
+
+data class PersonaEnumResponse(
+    val type: PersonaType,
+    val dropRate: String,
+) {
+
+    companion object {
+        fun from(personaType: PersonaType): PersonaEnumResponse {
+            return PersonaEnumResponse(personaType, personaType.getDropRate())
+        }
+    }
+}
diff --git a/src/main/kotlin/org/gitanimals/render/controller/response/PersonaResponse.kt b/src/main/kotlin/org/gitanimals/render/controller/response/PersonaResponse.kt
@@ -7,4 +7,5 @@ data class PersonaResponse(
     val type: PersonaType,
     val level: String,
     val visible: Boolean,
+    val dropRate: String,
 )
diff --git a/src/main/kotlin/org/gitanimals/render/controller/response/UserResponse.kt b/src/main/kotlin/org/gitanimals/render/controller/response/UserResponse.kt
@@ -14,7 +14,13 @@ data class UserResponse(
                 user.id.toString(),
                 user.name,
                 user.personas.map {
-                    PersonaResponse(it.id.toString(), it.type, it.level().toString(), it.visible)
+                    PersonaResponse(
+                        it.id.toString(),
+                        it.type,
+                        it.level().toString(),
+                        it.visible,
+                        it.type.getDropRate()
+                    )
                 }.toList()
             )
         }

diff --git a/src/main/kotlin/org/gitanimals/render/domain/PersonaType.kt b/src/main/kotlin/org/gitanimals/render/domain/PersonaType.kt
@@ -1,11 +1,12 @@
 package org.gitanimals.render.domain
 
+import java.text.DecimalFormat
 import kotlin.math.atan2
 import kotlin.math.max
 import kotlin.math.min
 import kotlin.random.Random
 
-enum class PersonaType(private val weight: Double) {
+enum class PersonaType(val weight: Double, private var dropRate: String? = null) {
     GOOSE(1.0) {
         override fun loadSvg(user: User, persona: Persona, mode: Mode): String {
             val goose = gooseSvg.replace("*{act}", act(persona.id))
@@ -1071,7 +1072,7 @@ enum class PersonaType(private val weight: Double) {
             StringBuilder().moveRandomly("mole", id, 40, "180s", 5, 14.0)
                 .toString()
     },
-    MOLE_GRASS(0.1){
+    MOLE_GRASS(0.1) {
         override fun loadSvg(user: User, persona: Persona, mode: Mode): String {
             return moleGrassSvg.replace("*{act}", act(persona.id))
                 .replace("*{id}", persona.id.toString())
@@ -1086,7 +1087,7 @@ enum class PersonaType(private val weight: Double) {
             StringBuilder().moveRandomly("mole", id, 40, "180s", 5, 14.0)
                 .toString()
     },
-    RABBIT(0.9){
+    RABBIT(0.9) {
         override fun loadSvg(user: User, persona: Persona, mode: Mode): String {
             return rabbitSvg.replace("*{act}", act(persona.id))
                 .replace("*{id}", persona.id.toString())
@@ -1107,6 +1108,23 @@ enum class PersonaType(private val weight: Double) {
         require(weight in 0.000..1.0) { "PersonaType's weight should be between 0.000 to 1.0" }
     }
 
+    fun getDropRate(): String {
+        return this.dropRate ?: loadDropRate()
+    }
+
+    private fun loadDropRate(): String {
+        val allPersonaCount = personas.size
+        val personaCount = (weight * 1000).toInt()
+
+        val dropRateTemp = (personaCount.toDouble() / allPersonaCount.toDouble()) * 100.0
+        this.dropRate = if (dropRateTemp < 1.0) {
+            "${dropRateFormat.format(dropRateTemp)}%"
+        } else {
+            "${dropRateTemp.toInt()}%"
+        }
+        return dropRate!!
+    }
+
     fun load(user: User, persona: Persona, mode: Mode): String =
         loadSvg(user, persona, mode)
             .drawContribution(mode, user)
@@ -1145,6 +1163,7 @@ enum class PersonaType(private val weight: Double) {
     }
 
     companion object {
+        private val dropRateFormat = DecimalFormat("#.#")
 
         private val maxWeight = lazy {
             var maxWeight = 0

diff --git a/src/main/kotlin/org/gitanimals/render/domain/response/PersonaResponse.kt b/src/main/kotlin/org/gitanimals/render/domain/response/PersonaResponse.kt
@@ -8,14 +8,16 @@ data class PersonaResponse(
     val type: PersonaType,
     val level: String,
     val visible: Boolean,
+    val dropRate: String,
 ) {
     companion object {
         fun from(persona: Persona): PersonaResponse {
             return PersonaResponse(
                 persona.id.toString(),
                 persona.type,
                 persona.level.value.toString(),
-                persona.visible
+                persona.visible,
+                persona.type.getDropRate()
             )
         }
     }

diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
@@ -2,8 +2,8 @@ server.name=gitanimals-render
 server.port=8080
 
 spring.datasource.url=jdbc:mysql://localhost:3306/gitanimalsrender
-spring.datasource.username=a
-spring.datasource.password=a
+spring.datasource.username=root
+spring.datasource.password=Dlwnsdud0414
 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
 
 spring.jpa.database-platform=org.hibernate.dialect.MySQLDialect

diff --git a/src/main/resources/persona/animal/rabbit.svg b/src/main/resources/persona/animal/rabbit.svg