release: 0.9.0 (#169)

git-goods · Nov 10, 2024 · 07220b3 · 07220b3
2 parents 128f30a + a0dafb6
commit 07220b3
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 7 deletions.
diff --git a/src/main/kotlin/org/gitanimals/render/app/UserFacade.kt b/src/main/kotlin/org/gitanimals/render/app/UserFacade.kt
@@ -43,11 +43,11 @@ class UserFacade(
         return userService.getPersona(user.username, personaId)
     }
 
-    fun mergePersona(token: String, request: MergePersonaRequest) {
+    fun mergePersona(token: String, request: MergePersonaRequest): PersonaResponse {
         val user = identityApi.getUserByToken(token)
 
         return userService.mergePersona(
-            user.id.toLong(),
+            user.username,
             request.increasePersonaId.toLong(),
             request.deletePersonaId.toLong(),
         )

diff --git a/src/main/kotlin/org/gitanimals/render/domain/User.kt b/src/main/kotlin/org/gitanimals/render/domain/User.kt
@@ -247,7 +247,7 @@ class User(
         .append("</svg>")
         .toString()
 
-    fun mergePersona(increasePersonaId: Long, deletePersonaId: Long) {
+    fun mergePersona(increasePersonaId: Long, deletePersonaId: Long): Persona {
         require(increasePersonaId != deletePersonaId) {
             "increasePersonaId \"$increasePersonaId\", deletePersonaId \"$deletePersonaId\" must be different"
         }
@@ -258,6 +258,8 @@ class User(
         increasePersona.level.value += deletePersona.level.value
 
         personas.remove(deletePersona)
+
+        return increasePersona
     }
 
     companion object {

diff --git a/src/main/kotlin/org/gitanimals/render/domain/UserService.kt b/src/main/kotlin/org/gitanimals/render/domain/UserService.kt
@@ -109,11 +109,15 @@ class UserService(
 
     @Transactional
     @Retryable(retryFor = [ObjectOptimisticLockingFailureException::class], maxAttempts = 10)
-    fun mergePersona(id: Long, increasePersonaId: Long, deletePersonaId: Long) {
-        val user = userRepository.findByIdOrNull(id)
-            ?: throw IllegalArgumentException("Cannot find user by id \"$id\"")
+    fun mergePersona(
+        name: String,
+        increasePersonaId: Long,
+        deletePersonaId: Long,
+    ): PersonaResponse {
+        val user = userRepository.findByName(name)
+            ?: throw IllegalArgumentException("Cannot find user by name \"$name\"")
 
-        user.mergePersona(increasePersonaId, deletePersonaId)
+        return PersonaResponse.from(user.mergePersona(increasePersonaId, deletePersonaId))
     }
 
     @Transactional