Merge pull request #294 from 42organization/dev

[REFACTOR] RankDto 수정
42organization · Sep 20, 2023 · 5666569 · 5666569
2 parents b035c0f + 3b006cf
commit 5666569
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/src/main/java/com/gg/server/domain/rank/dto/RankDto.java b/src/main/java/com/gg/server/domain/rank/dto/RankDto.java
@@ -1,6 +1,7 @@
 package com.gg.server.domain.rank.dto;
 
 import com.gg.server.domain.rank.redis.RankRedis;
+import com.gg.server.domain.user.data.User;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Getter;
@@ -19,14 +20,14 @@ public class RankDto {
     private String textColor;
 
 
-    public static RankDto from(RankRedis rankRedis, int rank) {
+    public static RankDto from(User user, RankRedis rankRedis, Integer rank) {
         RankDto dto = RankDto.builder()
-                .intraId(rankRedis.getIntraId())
+                .intraId(user.getIntraId())
                 .rank(rank)
                 .ppp(rankRedis.getPpp())
                 .statusMessage(rankRedis.getStatusMessage())
                 .tierImageUri(rankRedis.getTierImageUri())
-                .textColor(rankRedis.getTextColor())
+                .textColor(user.getTextColor())
                 .build();
         return dto;
     }

diff --git a/src/main/java/com/gg/server/domain/rank/service/RankService.java b/src/main/java/com/gg/server/domain/rank/service/RankService.java
@@ -118,9 +118,14 @@ private List<RankDto> createRankList(int startRank, int endRank, Season season)
         List<RankRedis> userRanks = redisRepository.findRanksByUserIds(hashKey, userIds);
         List<RankDto> rankList = new ArrayList<>();
 
-        for (RankRedis userRank : userRanks) {
-            rankList.add(RankDto.from(userRank, ++startRank));
+        for (int i = 0; i <  userRanks.size(); i++) {
+            User user = userRepository.findById(userIds.get(i)).orElseThrow(UserNotFoundException::new);
+            rankList.add(RankDto.from(user, userRanks.get(i), ++startRank));
         }
+//        for (RankRedis userRank : userRanks) {
+//            rankList.add(RankDto.from())
+//            rankList.add(RankDto.from(userRank, ++startRank));
+//        }
         return rankList;
     }
 }