release: 0.7.6 (#136)

git-goods · Sep 8, 2024 · 4293148 · 4293148
2 parents 329f56d + 4e8654c
commit 4293148
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/src/main/kotlin/org/gitanimals/render/app/UserFacade.kt b/src/main/kotlin/org/gitanimals/render/app/UserFacade.kt
@@ -47,8 +47,8 @@ class UserFacade(
 
         return userService.mergePersona(
             user.id.toLong(),
-            request.increasePersonaId,
-            request.deletePersonaId,
+            request.increasePersonaId.toLong(),
+            request.deletePersonaId.toLong(),
         )
     }
 }
diff --git a/src/main/kotlin/org/gitanimals/render/app/request/MergePersonaRequest.kt b/src/main/kotlin/org/gitanimals/render/app/request/MergePersonaRequest.kt
@@ -1,6 +1,6 @@
 package org.gitanimals.render.app.request
 
 data class MergePersonaRequest(
-    val increasePersonaId: Long,
-    val deletePersonaId: Long,
+    val increasePersonaId: String,
+    val deletePersonaId: String,
 )
diff --git a/src/main/kotlin/org/gitanimals/render/domain/User.kt b/src/main/kotlin/org/gitanimals/render/domain/User.kt
@@ -206,6 +206,10 @@ class User(
         .toString()
 
     fun mergePersona(increasePersonaId: Long, deletePersonaId: Long) {
+        require(increasePersonaId != deletePersonaId) {
+            "increasePersonaId \"$increasePersonaId\", deletePersonaId \"$deletePersonaId\" must be different"
+        }
+
         val increasePersona = personas.first { it.id == increasePersonaId }
         val deletePersona = personas.first { it.id == deletePersonaId }