Merge pull request #276 from OutDecision/issue/168

🎨 [UPDATE]: 랭킹 칭호 넘기기
OutDecision · May 31, 2024 · 02424f9 · 02424f9
2 parents 0f9474e + e14ec2a
commit 02424f9
Showing 4 changed files with 11 additions and 7 deletions.
diff --git a/src/main/java/KGUcapstone/OutDecision/domain/ranking/dto/RankingResponseDTO.java b/src/main/java/KGUcapstone/OutDecision/domain/ranking/dto/RankingResponseDTO.java
@@ -15,6 +15,7 @@ public static class RankingDTO{
         Long memberId;
         String userImg;
         String nickname;
+        String memberTitle;
         Integer point;
     }
 

diff --git a/src/main/java/KGUcapstone/OutDecision/domain/ranking/service/RedisRankingServiceImpl.java b/src/main/java/KGUcapstone/OutDecision/domain/ranking/service/RedisRankingServiceImpl.java
@@ -176,6 +176,7 @@ public RankingListDTO getTop100Rankings() {
             Member member = memberRepository.findById(memberId).get();
             String nickname = member.getNickname();
             String userImg = member.getUserImg();
+            String memberTitle = member.getUserTitle();
 
             if (point != prevScore) {
                 rank += sameRankCount;
@@ -188,7 +189,7 @@ public RankingListDTO getTop100Rankings() {
                 break; // 100위 이후의 데이터는 처리하지 않음
             }
 
-            RankingDTO rankingDTO = new RankingDTO(rank, memberId, userImg, nickname, point);
+            RankingDTO rankingDTO = new RankingDTO(rank, memberId, userImg, nickname, memberTitle, point);
             rankingDTOList.add(rankingDTO);
             prevScore = point;
         }
@@ -216,6 +217,7 @@ public RankingDTO memberRankingDTO(Long memberId) {
             Member member = memberRepository.findById(memberId).get();
             String nickname = member.getNickname();
             String userImg = member.getUserImg();
+            String memberTitle = member.getUserTitle();
 
             if (point != prevScore) {
                 rank += sameRankCount;
@@ -225,7 +227,7 @@ public RankingDTO memberRankingDTO(Long memberId) {
             }
 
             if (reqId.equals(id)) {
-                rankingDTO = new RankingDTO(rank, memberId, userImg, nickname, point);
+                rankingDTO = new RankingDTO(rank, memberId, userImg, nickname, memberTitle, point);
                 break;
             }
             prevScore = point;
@@ -256,6 +258,7 @@ public RankingListDTO getTop10Rankings() {
             Member member = memberRepository.findById(memberId).get();
             String nickname = member.getNickname();
             String userImg = member.getUserImg();
+            String memberTitle = member.getUserTitle();
 
             if (point != prevScore) {
                 rank += sameRankCount;
@@ -268,7 +271,7 @@ public RankingListDTO getTop10Rankings() {
                 break; // 10위 이후의 데이터는 처리하지 않음
             }
 
-            RankingDTO rankingDTO = new RankingDTO(rank, memberId, userImg, nickname, point);
+            RankingDTO rankingDTO = new RankingDTO(rank, memberId, userImg, nickname, memberTitle, point);
             rankingDTOList.add(rankingDTO);
             prevScore = point;
         }

diff --git a/src/main/java/KGUcapstone/OutDecision/domain/title/repository/TitleRepository.java b/src/main/java/KGUcapstone/OutDecision/domain/title/repository/TitleRepository.java
@@ -20,6 +20,7 @@ public interface TitleRepository extends JpaRepository<Title, Long> {
             "SUM(CASE WHEN t.romantist = true THEN 1 ELSE 0 END) + " +
             "SUM(CASE WHEN t.sprout = true THEN 1 ELSE 0 END) + " +
             "SUM(CASE WHEN t.traveler = true THEN 1 ELSE 0 END) + " +
+            "SUM(CASE WHEN t.hobbyist = true THEN 1 ELSE 0 END) + " +
             "SUM(CASE WHEN t.first = true THEN 1 ELSE 0 END) + " +
             "SUM(CASE WHEN t.second = true THEN 1 ELSE 0 END) + " +
             "SUM(CASE WHEN t.third = true THEN 1 ELSE 0 END) " +
@@ -28,13 +29,14 @@ public interface TitleRepository extends JpaRepository<Title, Long> {
 
     @Query("SELECT " +
             "GROUP_CONCAT(" +
-            "   CASE WHEN t.ceo = true THEN ',💸사장' ELSE '' END, " +
+            "   CASE WHEN t.ceo = true THEN '💸사장' ELSE '' END, " +
             "   CASE WHEN t.fashionista = true THEN ',🕶️패셔니스타' ELSE '' END, " +
             "   CASE WHEN t.foodie = true THEN ',🍴미식가' ELSE '' END, " +
             "   CASE WHEN t.greedy = true THEN ',😏욕심쟁이' ELSE '' END, " +
             "   CASE WHEN t.romantist = true THEN ',💖로맨티스트' ELSE '' END, " +
             "   CASE WHEN t.sprout = true THEN ',🌱새싹' ELSE '' END, " +
             "   CASE WHEN t.traveler = true THEN ',✈️트래블러' ELSE '' END, " +
+            "   CASE WHEN t.hobbyist = true THEN ',🎨취미부자' ELSE '' END, " +
             "   CASE WHEN t.first = true THEN ',🥇1위' ELSE '' END, " +
             "   CASE WHEN t.second = true THEN ',🥈2위' ELSE '' END, " +
             "   CASE WHEN t.third = true THEN ',🥉3위' ELSE '' END " +

diff --git a/src/main/java/KGUcapstone/OutDecision/domain/user/service/mypage/TitleServiceImpl.java b/src/main/java/KGUcapstone/OutDecision/domain/user/service/mypage/TitleServiceImpl.java
@@ -52,10 +52,8 @@ public List<String> myTitlesDTO() {
         else throw new MemberHandler(ErrorStatus.MEMBER_NOT_FOUND);
         // 문자열로 컬럼 이름 받아오기
         String findTrueColumByMemberId = titleRepository.findTrueColumByMemberId(memberId);
-        // 첫번째 글자 ',' 제거
-        String titleStr = findTrueColumByMemberId.toString().substring(1);
         // ','로 문자열 분류하여 리스트 만들어 반환
-        return Arrays.asList(titleStr.split(","));
+        return Arrays.asList(findTrueColumByMemberId.split(","));
     }
 
     // 칭호 획득 가능 여부 확인