release: 1.8.4 (#336)

Author: devxb

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

@@ -27,6 +27,7 @@ class GetRankByUsernameFacade(
         )
 
         return RankResponse(
+            id = userContributionRank.userId.toString(),
             rank = rankQueryResponse.rank,
             image = userContributionRank.image,
             name = userContributionRank.username,

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

@@ -23,9 +23,15 @@ class RankQueryFacade(
         size: Int,
         type: RankQueryRepository.Type,
     ): List<RankResponse> {
-        val rankWithIds =
-            rankQueryRepository.findAllRank(rankStartedAt = rank, limit = rank + size, type = type)
-                .associate { it.rank to it.id }
+        require(size > 1) { "Size must be lager than 1. size: $size" }
+        require(size <= 20) { "Maximum request size is 20. size: $size" }
+        require(rank > 0) { "Rank must be larger than 0. rank: $rank" }
+
+        val rankWithIds = rankQueryRepository.findAllRank(
+            rankStartedAt = rank,
+            limit = rank + size - 1,
+            type = type
+        ).associate { it.rank to it.id }
 
         return when (type) {
             WEEKLY_GUILD_CONTRIBUTIONS -> guildContributionRankService.findAllByRankIds(rankWithIds)

src/main/kotlin/org/gitanimals/rank/domain/GuildContributionRankService.kt

@@ -39,6 +39,7 @@ class GuildContributionRankService(
 
         return guildContributionRankRepository.findAllById(rankIds).map {
             RankResponse(
+                id = it.guildId.toString(),
                 rank = idWithRank[it.id]
                     ?: throw IllegalStateException("Cannot find rank value by id ${it.id}"),
                 image = it.image,

src/main/kotlin/org/gitanimals/rank/domain/UserContributionRankService.kt

@@ -20,7 +20,8 @@ class UserContributionRankService(
         val userRank = runCatching {
             userContributionRankRepository.findByUserId(updateUserContributionRank.userId)?.also {
                 it.weeklyContributions += updateUserContributionRank.weeklyContributions
-            } ?: throw IllegalArgumentException("Cannot find UserContributionRank by userId: \"${updateUserContributionRank.userId}\"")
+            }
+                ?: throw IllegalArgumentException("Cannot find UserContributionRank by userId: \"${updateUserContributionRank.userId}\"")
         }.getOrElse {
             userContributionRankRepository.save(updateUserContributionRank)
         }
@@ -41,6 +42,7 @@ class UserContributionRankService(
 
         return userContributionRankRepository.findAllById(rankIds).map {
             RankResponse(
+                id = it.userId.toString(),
                 rank = idWithRank[it.id]
                     ?: throw IllegalStateException("Cannot find rank value by id ${it.id}"),
                 image = it.image,

src/main/kotlin/org/gitanimals/rank/domain/response/RankResponse.kt

@@ -1,6 +1,7 @@
 package org.gitanimals.rank.domain.response
 
 data class RankResponse(
+    val id: String,
     val rank: Int,
     val image: String,
     val name: String,