Merge pull request #46 from KNU-HAEDAL/refactor/rank

[Refactor]: 챌린지그룹별 랭킹 페이징 코드 개선
KNU-HAEDAL · Jul 21, 2024 · 59f6138 · 59f6138
2 parents 5c7cf1c + db5fc75
commit 59f6138
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 19 deletions.
diff --git a/...rver/app/src/main/java/org/haedal/zzansuni/domain/challengegroup/ChallengeGroupModel.java b/...rver/app/src/main/java/org/haedal/zzansuni/domain/challengegroup/ChallengeGroupModel.java
@@ -3,6 +3,7 @@
 import lombok.Builder;
 import org.haedal.zzansuni.domain.challengegroup.challenge.ChallengeModel;
 import org.haedal.zzansuni.domain.challengegroup.image.ChallengeGroupImage;
+import org.haedal.zzansuni.domain.challengegroup.userexp.ChallengeGroupUserExp;
 import org.haedal.zzansuni.domain.user.UserModel;
 
 import java.time.LocalDate;
@@ -119,6 +120,13 @@ public record Ranking(
             Integer rank,
             Integer accumulatedPoint
     ) {
+        public static Ranking from(ChallengeGroupUserExp challengeGroupUserExp, int rank) {
+            return Ranking.builder()
+                    .user(UserModel.Main.from(challengeGroupUserExp.getUser()))
+                    .rank(rank)
+                    .accumulatedPoint(challengeGroupUserExp.getTotalExp())
+                    .build();
+        }
     }
 
 }
diff --git a/...p/src/main/java/org/haedal/zzansuni/domain/challengegroup/ChallengeGroupQueryService.java b/...p/src/main/java/org/haedal/zzansuni/domain/challengegroup/ChallengeGroupQueryService.java
@@ -39,27 +39,20 @@ public Page<ChallengeGroupModel.Info> getChallengeGroupsShortsPaging(Pageable pa
         return challengeGroups.map(ChallengeGroupModel.Info::from);
     }
 
+    @Transactional(readOnly = true)
     public Page<ChallengeGroupModel.Ranking> getChallengeGroupRankingsPaging(Long challengeGroupId, Pageable pageable) {
         Page<ChallengeGroupUserExp> challengeGroupUserExps
-                = challengeGroupReader.getByChallengeGroupId(challengeGroupId, pageable);
-
-        return getRankingPage(pageable, challengeGroupUserExps);
+                = challengeGroupReader.getUserExpPagingWithUserByChallengeGroupId(challengeGroupId, pageable);
+
+        // Page<ChallengeGroupUserExp>를 Page<ChallengeGroupModel.Ranking>으로 변환
+        // [rank]는 [Pageable]의 위치에 따라 계산된다.
+        return challengeGroupUserExps.map(e->{
+            int rank = challengeGroupUserExps.getNumber() * challengeGroupUserExps.getSize() + 1
+                    + challengeGroupUserExps.getContent().indexOf(e);
+            return ChallengeGroupModel.Ranking.from(e, rank);
+        });
     }
 
-    private static PageImpl<ChallengeGroupModel.Ranking> getRankingPage(Pageable pageable, Page<ChallengeGroupUserExp> challengeGroupUserExps) {
-        List<ChallengeGroupModel.Ranking> rankings = new ArrayList<>();
-        for(int i = 0; i < challengeGroupUserExps.getContent().size(); i++) {
-            Integer rank = challengeGroupUserExps.getNumber() * challengeGroupUserExps.getSize() + 1 + i;
-            ChallengeGroupUserExp challengeGroupUserExp = challengeGroupUserExps.getContent().get(i);
-            var rankingModel = ChallengeGroupModel.Ranking.builder()
-                    .user(UserModel.Main.from(challengeGroupUserExp.getUser()))
-                    .accumulatedPoint(challengeGroupUserExp.getTotalExp())
-                    .rank(rank)
-                    .build();
-            rankings.add(rankingModel);
-        }
-        return new PageImpl<>(rankings, pageable, challengeGroupUserExps.getTotalElements());
-    }
 
     public ChallengeGroupModel.Ranking getChallengeGroupRanking(Long challengeGroupId, Long id) {
         return challengeGroupReader.getRanking(challengeGroupId, id);

diff --git a/...ver/app/src/main/java/org/haedal/zzansuni/domain/challengegroup/ChallengeGroupReader.java b/...ver/app/src/main/java/org/haedal/zzansuni/domain/challengegroup/ChallengeGroupReader.java
@@ -17,7 +17,7 @@ public interface ChallengeGroupReader {
 
     Optional<ChallengeGroupUserExp> findByChallengeGroupIdAndUserId(Long challengeGroupId, Long userId);
 
-    Page<ChallengeGroupUserExp> getByChallengeGroupId(Long challengeGroupId, Pageable pageable);
+    Page<ChallengeGroupUserExp> getUserExpPagingWithUserByChallengeGroupId(Long challengeGroupId, Pageable pageable);
 
     ChallengeGroupModel.Ranking getRanking(Long challengeGroupId, Long userId);
 }
diff --git a/...main/java/org/haedal/zzansuni/infrastructure/challengegroup/ChallengeGroupReaderImpl.java b/...main/java/org/haedal/zzansuni/infrastructure/challengegroup/ChallengeGroupReaderImpl.java
@@ -94,7 +94,7 @@ public Optional<ChallengeGroupUserExp> findByChallengeGroupIdAndUserId(Long chal
     }
 
     @Override
-    public Page<ChallengeGroupUserExp> getByChallengeGroupId(Long challengeGroupId, Pageable pageable) {
+    public Page<ChallengeGroupUserExp> getUserExpPagingWithUserByChallengeGroupId(Long challengeGroupId, Pageable pageable) {
         Long count = queryFactory
                 .select(challengeGroupUserExp.count())
                 .from(challengeGroupUserExp)
@@ -104,6 +104,7 @@ public Page<ChallengeGroupUserExp> getByChallengeGroupId(Long challengeGroupId,
         List<ChallengeGroupUserExp> page = queryFactory
                 .selectFrom(challengeGroupUserExp)
                 .where(challengeGroupUserExp.challengeGroup.id.eq(challengeGroupId))
+                .innerJoin(challengeGroupUserExp.user).fetchJoin()
                 .orderBy(challengeGroupUserExp.totalExp.desc())
                 .offset(pageable.getOffset())
                 .limit(pageable.getPageSize())