release: 1.1.1 (#234)

git-goods · Jan 6, 2025 · 779cd62 · 779cd62
2 parents 2d75a1c + 65b60f4
commit 779cd62
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 20 deletions.
diff --git a/src/main/kotlin/org/gitanimals/guild/app/DrawGuildFacade.kt b/src/main/kotlin/org/gitanimals/guild/app/DrawGuildFacade.kt
@@ -43,19 +43,19 @@ class DrawGuildFacade(
     }
 
     private fun getRenderUsers(guild: Guild): List<RenderApi.UserResponse> {
-        val userIdAndPersonaIdRequests = guild.getMembers().map {
-            RenderApi.UserIdAndPersonaIdRequest(
+        val usernameAndPersonaIdRequests = guild.getMembers().map {
+            RenderApi.UsernameAndPersonaIdRequest(
                 personaId = it.personaId,
-                userId = it.userId,
+                username = it.name,
             )
-        } + RenderApi.UserIdAndPersonaIdRequest(
+        } + RenderApi.UsernameAndPersonaIdRequest(
             personaId = guild.getLeaderPersonaId(),
-            userId = guild.getLeaderUserId(),
+            username = guild.getLeaderName(),
         )
 
         return renderApi.getAllPersonasByUserIdsAndPersonaIds(
             internalSecret = internalSecret,
-            userIdAndPersonaIdRequests = userIdAndPersonaIdRequests,
+            usernameAndPersonaIdRequests = usernameAndPersonaIdRequests,
         )
     }
 

diff --git a/src/main/kotlin/org/gitanimals/guild/app/RenderApi.kt b/src/main/kotlin/org/gitanimals/guild/app/RenderApi.kt
@@ -14,7 +14,7 @@ interface RenderApi {
     @GetExchange("/internals/personas/all")
     fun getAllPersonasByUserIdsAndPersonaIds(
         @RequestHeader(INTERNAL_SECRET_KEY) internalSecret: String,
-        @RequestBody userIdAndPersonaIdRequests: List<UserIdAndPersonaIdRequest>,
+        @RequestBody usernameAndPersonaIdRequests: List<UsernameAndPersonaIdRequest>,
     ): List<UserResponse>
 
     data class UserResponse(
@@ -31,8 +31,8 @@ interface RenderApi {
         )
     }
 
-    data class UserIdAndPersonaIdRequest(
-        val userId: Long,
+    data class UsernameAndPersonaIdRequest(
+        val username: String,
         val personaId: Long,
     )
 

diff --git a/src/main/kotlin/org/gitanimals/render/controller/InternalPersonaController.kt b/src/main/kotlin/org/gitanimals/render/controller/InternalPersonaController.kt
@@ -5,7 +5,7 @@ import org.gitanimals.core.AuthorizationException
 import org.gitanimals.render.app.UserFacade
 import org.gitanimals.render.controller.request.AddMultiplyPersonaRequest
 import org.gitanimals.render.controller.request.AddPersonaRequest
-import org.gitanimals.render.controller.request.UserIdAndPersonaIdRequest
+import org.gitanimals.render.controller.request.UsernameAndPersonaIdRequest
 import org.gitanimals.render.controller.response.ErrorResponse
 import org.gitanimals.render.controller.response.PersonaResponse
 import org.gitanimals.render.controller.response.UserResponse
@@ -86,14 +86,14 @@ class InternalPersonaController(
     @GetMapping("/internals/personas/all")
     @ResponseStatus(HttpStatus.OK)
     fun getAllPersonasByUserIdsAndPersonaIds(
-        @RequestBody userIdAndPersonaIdRequests: List<UserIdAndPersonaIdRequest>
+        @RequestBody usernameAndPersonaIdRequests: List<UsernameAndPersonaIdRequest>
     ): List<UserResponse> {
-        val users = userService.findAllUsersByIdWithContributions(
-            userIdAndPersonaIdRequests.map { it.userId }.toSet()
+        val users = userService.findAllUsersByNameWithContributions(
+            usernameAndPersonaIdRequests.map { it.username }.toSet()
         )
 
         return users.map { user ->
-            val personaId = userIdAndPersonaIdRequests.first { it.userId == user.id }.personaId
+            val personaId = usernameAndPersonaIdRequests.first { it.username == user.name }.personaId
             UserResponse.fromWithSpecificPersona(user, listOf(personaId))
         }
     }

diff --git a/...ller/request/UserIdAndPersonaIdRequest.kt → ...er/request/UsernameAndPersonaIdRequest.kt b/...ller/request/UserIdAndPersonaIdRequest.kt → ...er/request/UsernameAndPersonaIdRequest.kt
@@ -1,6 +1,6 @@
 package org.gitanimals.render.controller.request
 
-data class UserIdAndPersonaIdRequest(
-    val userId: Long,
+data class UsernameAndPersonaIdRequest(
+    val username: String,
     val personaId: Long,
 )
diff --git a/src/main/kotlin/org/gitanimals/render/domain/UserRepository.kt b/src/main/kotlin/org/gitanimals/render/domain/UserRepository.kt
@@ -21,10 +21,10 @@ interface UserRepository : JpaRepository<User, Long> {
         """
             select u from user as u
             left join fetch u.contributions
-            where u.id in :userIds
+            where u.name in :usernames
         """
     )
-    fun findAllByIdsWithContributions(@Param("userIds") userIds: Set<Long>): List<User>
+    fun findAllByIdsWithContributions(@Param("usernames") usernames: Set<String>): List<User>
 
     fun existsByName(name: String): Boolean
 }
diff --git a/src/main/kotlin/org/gitanimals/render/domain/UserService.kt b/src/main/kotlin/org/gitanimals/render/domain/UserService.kt
@@ -160,8 +160,8 @@ class UserService(
             ?: throw IllegalArgumentException("Cannot find matched persona \"$personaId\" by user name \"$name\"")
     }
 
-    fun findAllUsersByIdWithContributions(userIds: Set<Long>): List<User> {
-        return userRepository.findAllByIdsWithContributions(userIds)
+    fun findAllUsersByNameWithContributions(usernames: Set<String>): List<User> {
+        return userRepository.findAllByIdsWithContributions(usernames)
     }
 
     companion object {