release: 2.0.7 (#373)

Author: devxb

src/main/kotlin/org/gitanimals/core/extension/StringExtension.kt

@@ -0,0 +1,31 @@
+package org.gitanimals.core.extension
+
+object StringExtension {
+
+    fun String.trimNotDigitCharacters(): String {
+        var trimed = this.trim()
+
+        if (trimed.first().isDigit().not()) {
+            trimed = trimed.drop(1)
+        }
+        if (trimed.last().isDigit().not()) {
+            trimed = trimed.dropLast(1)
+        }
+
+        return trimed
+    }
+
+    fun String.deleteBrackets(): String {
+        val start = when (this[0]) {
+            '{' -> 1
+            else -> 0
+        }
+
+        val end = when (this.last()) {
+            '}' -> this.length - 1
+            else -> this.length
+        }
+
+        return this.substring(start, end)
+    }
+}

src/main/kotlin/org/gitanimals/rank/app/GivePointToGuildFacade.kt

@@ -40,7 +40,7 @@ class GivePointToGuildFacade(
                 runCatching {
                     val point = getPoint(rankResponse)
 
-                    val guild = guildApi.getGuildByTitle(rankResponse.name)
+                    val guild = guildApi.getGuildById(rankResponse.id.toLong())
                     givePointToLeader(guild, point)
                     givePointToMembers(guild, point)
                 }.onFailure {

src/main/kotlin/org/gitanimals/rank/app/GuildApi.kt

@@ -5,11 +5,14 @@ import org.springframework.web.bind.annotation.PathVariable
 import org.springframework.web.service.annotation.GetExchange
 import java.time.Instant
 
-fun interface GuildApi {
+interface GuildApi {
 
     @GetExchange("/internals/guilds/by-title/{title}")
     fun getGuildByTitle(@PathVariable("title") title: String): GuildResponse
 
+    @GetExchange("/guilds/{guildId}")
+    fun getGuildById(@PathVariable("guildId") guildId: Long): GuildResponse
+
     data class GuildResponse(
         val id: String,
         val title: String,

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

@@ -2,6 +2,8 @@ package org.gitanimals.render.controller
 
 import jakarta.servlet.http.HttpServletResponse
 import org.gitanimals.core.Mode
+import org.gitanimals.core.extension.StringExtension.deleteBrackets
+import org.gitanimals.core.extension.StringExtension.trimNotDigitCharacters
 import org.gitanimals.render.app.AnimationFacade
 import org.springframework.http.HttpHeaders
 import org.springframework.web.bind.annotation.GetMapping
@@ -20,13 +22,13 @@ class AnimationController(
         response: HttpServletResponse
     ): String {
         response.cacheControl(3600)
-        return animationFacade.getFarmAnimation(deleteBrackets(username))
+        return animationFacade.getFarmAnimation(username.deleteBrackets())
     }
 
     @GetMapping(value = ["/lines/{username}"], produces = ["image/svg+xml"])
     fun getLineSvgAnimation(
         @PathVariable("username") username: String,
-        @RequestParam(name = "pet-id", defaultValue = "0") personaId: Long,
+        @RequestParam(name = "pet-id", defaultValue = "0") personaId: String,
         @RequestParam(name = "contribution-view", defaultValue = "true") contributionView: Boolean,
         response: HttpServletResponse,
     ): String {
@@ -37,21 +39,11 @@ class AnimationController(
             false -> Mode.LINE_NO_CONTRIBUTION
         }
 
-        return animationFacade.getLineAnimation(deleteBrackets(username), personaId, mode)
-    }
-
-    private fun deleteBrackets(username: String): String {
-        val start = when (username[0]) {
-            '{' -> 1
-            else -> 0
-        }
-
-        val end = when (username.last()) {
-            '}' -> username.length - 1
-            else -> username.length
-        }
-
-        return username.substring(start, end)
+        return animationFacade.getLineAnimation(
+            username = username.deleteBrackets(),
+            personaId = personaId.trimNotDigitCharacters().toLong(),
+            mode = mode,
+        )
     }
 
     private fun HttpServletResponse.cacheControl(maxAgeSeconds: Int): HttpServletResponse {

src/test/kotlin/org/gitanimals/core/extension/StringExtensionTest.kt

@@ -0,0 +1,32 @@
+package org.gitanimals.core.extension
+
+import io.kotest.core.annotation.DisplayName
+import io.kotest.core.spec.style.DescribeSpec
+import io.kotest.matchers.shouldBe
+import org.gitanimals.core.extension.StringExtension.deleteBrackets
+import org.gitanimals.core.extension.StringExtension.trimNotDigitCharacters
+
+@DisplayName("StringExtension class의")
+internal class StringExtensionTest : DescribeSpec({
+
+    describe("trimNotDigitCharacters 메소드는") {
+        context("입력받은 문자의 앞 뒤로 숫자가 아닌 문자가 있다면") {
+            val text = "\"12345\""
+
+            it("앞 뒤 문자를 삭제한다.") {
+                val result = text.trimNotDigitCharacters()
+
+                result shouldBe "12345"
+            }
+        }
+    }
+
+    describe("deleteBrackets 메소드는") {
+        val text = "{devxb}"
+        context("입력받은 문자의 앞 뒤로 bracket이 있다면, 삭제한다") {
+            val result = text.deleteBrackets()
+
+            result shouldBe "devxb"
+        }
+    }
+})