release: 2.5.0 (#439)

Author: devxb

src/main/kotlin/org/gitanimals/render/app/UserFacade.kt

@@ -2,6 +2,7 @@ package org.gitanimals.render.app
 
 import org.gitanimals.render.app.request.MergePersonaRequest
 import org.gitanimals.core.FieldType
+import org.gitanimals.render.app.request.MergePersonaV2Request
 import org.gitanimals.render.domain.UserService
 import org.gitanimals.render.domain.request.PersonaChangeRequest
 import org.gitanimals.render.domain.response.PersonaResponse
@@ -53,6 +54,16 @@ class UserFacade(
         )
     }
 
+    fun mergePersonaV2(token: String, request: MergePersonaV2Request): PersonaResponse {
+        val user = identityApi.getUserByToken(token)
+
+        return userService.mergePersonaV2(
+            user.username,
+            request.increasePersonaId.toLong(),
+            request.deletePersonaId.map { it.toLong() },
+        )
+    }
+
     fun addField(token: String, fieldType: FieldType) {
         val user = identityApi.getUserByToken(token)
 

src/main/kotlin/org/gitanimals/render/app/request/MergePersonaV2Request.kt

@@ -0,0 +1,6 @@
+package org.gitanimals.render.app.request
+
+data class MergePersonaV2Request(
+    val increasePersonaId: String,
+    val deletePersonaId: List<String>,
+)

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

@@ -7,6 +7,7 @@ import org.gitanimals.core.auth.RequiredUserEntryPoints
 import org.gitanimals.core.auth.UserEntryPoint
 import org.gitanimals.render.app.UserFacade
 import org.gitanimals.render.app.request.MergePersonaRequest
+import org.gitanimals.render.app.request.MergePersonaV2Request
 import org.gitanimals.render.controller.response.PersonaEnumResponse
 import org.gitanimals.render.controller.response.PersonaResponse
 import org.gitanimals.render.controller.response.UserResponse
@@ -70,6 +71,14 @@ class PersonaController(
         @RequestBody meregPersonaRequest: MergePersonaRequest,
     ) = userFacade.mergePersona(token, meregPersonaRequest)
 
+    @PutMapping(path = ["/personas/merges"], headers = ["Api-Version=2"])
+    @ResponseStatus(HttpStatus.OK)
+    @RequiredUserEntryPoints([UserEntryPoint.GITHUB])
+    fun mergePersonaV2(
+        @RequestHeader(HttpHeaders.AUTHORIZATION) token: String,
+        @RequestBody mergePersonaRequest: MergePersonaV2Request,
+    ) = userFacade.mergePersonaV2(token, mergePersonaRequest)
+
     @ExceptionHandler(IllegalArgumentException::class)
     @ResponseStatus(HttpStatus.BAD_REQUEST)
     fun handleIllegalArgumentException(exception: IllegalArgumentException): ErrorResponse =

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

@@ -126,6 +126,25 @@ class User(
         return increasePersona
     }
 
+    fun mergePersonaV2(increasePersonaId: Long, deletePersonaIds: List<Long>): Persona {
+        require(deletePersonaIds.contains(increasePersonaId).not()) {
+            "increasePersonaId \"$increasePersonaId\", deletePersonaId \"$deletePersonaIds\" must be different"
+        }
+
+        val increasePersona = personas.first { it.id == increasePersonaId }
+        val deletePersonas = personas.filter { it.id in deletePersonaIds }
+
+        val increaseLevel = deletePersonas.sumOf { deletePersona ->
+            max(deletePersona.level() / 2, 1)
+        }
+
+        increasePersona.level.value += increaseLevel
+
+        deletePersonas.forEach { deletePersona(it.id) }
+
+        return increasePersona
+    }
+
     fun deletePersona(personaId: Long): PersonaResponse {
         val persona = this.personas.find { it.id == personaId }
             ?: throw IllegalArgumentException("Cannot find persona by id \"$personaId\"")

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

@@ -151,6 +151,19 @@ class UserService(
         return PersonaResponse.from(user.mergePersona(increasePersonaId, deletePersonaId))
     }
 
+    @Transactional
+    @Retryable(retryFor = [ObjectOptimisticLockingFailureException::class], maxAttempts = 10)
+    fun mergePersonaV2(
+        name: String,
+        increasePersonaId: Long,
+        deletePersonaIds: List<Long>,
+    ): PersonaResponse {
+        val user = userRepository.findByName(name)
+            ?: throw IllegalArgumentException("Cannot find user by name \"$name\"")
+
+        return PersonaResponse.from(user.mergePersonaV2(increasePersonaId, deletePersonaIds))
+    }
+
     @Transactional
     @Retryable(retryFor = [ObjectOptimisticLockingFailureException::class], maxAttempts = 10)
     fun addField(name: String, fieldType: FieldType) {