Merge pull request #40 from molohala/Feature/ranking

feat :: add isBlockedUser field
molohala · Jul 20, 2024 · 3ce4e3e · 3ce4e3e
2 parents deb4e3c + 41f6288
commit 3ce4e3e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/grow-core/src/main/kotlin/com/molohala/grow/core/rank/application/service/RankServiceImpl.kt b/grow-core/src/main/kotlin/com/molohala/grow/core/rank/application/service/RankServiceImpl.kt
@@ -48,7 +48,7 @@ class RankServiceImpl(
     private fun getRankForKey(key: String): RankingTimedListRes {
         val zSet = redisTemplate.opsForZSet()
         val member = memberSessionHolder.current()
-        val blocks = blockRepository.findByUserId(member.id!!)
+        val blocks = blockRepository.findByUserId(member.id!!).associate { it.blockedUserId to Unit /* inspired by java's internal hash set implementation */ } //.map { it.blockedUserId }.toSet()
 
         val lastNano = 2L * 60L * 60L * 1_000L * 1_000_000L - redisTemplate.getExpire(key, TimeUnit.NANOSECONDS)
 
@@ -66,10 +66,7 @@ class RankServiceImpl(
                     keepCount++
                 }
                 prevScore = score
-                RankingRes(value.memberId, value.name, value.socialId, rank, score)
-            }
-            .filter { res ->
-                blocks.firstOrNull { it.blockedUserId == res.memberId } == null
+                RankingRes(value.memberId, value.name, value.socialId, rank, blocks.contains(value.memberId), score)
             }
 
         return RankingTimedListRes(LocalDateTime.now().minusNanos(lastNano), map)

diff --git a/grow-core/src/main/kotlin/com/molohala/grow/core/rank/domain/dto/res/RankingRes.kt b/grow-core/src/main/kotlin/com/molohala/grow/core/rank/domain/dto/res/RankingRes.kt
@@ -5,5 +5,6 @@ data class RankingRes(
     val memberName: String,
     val socialId: String,
     val rank: Int,
+    val isBlockedUser: Boolean,
     val count: Long,
-)
+)