fix: 마이페이지 경험치 퍼센트 로직 수정

Central-MakeUs · Aug 10, 2023 · 701bbea · 701bbea
1 parent bd30e2e
commit 701bbea
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/cider-api/src/main/java/com/cmc/domains/member/controller/MemberController.java b/cider-api/src/main/java/com/cmc/domains/member/controller/MemberController.java
@@ -105,7 +105,7 @@ public ResponseEntity<MyPageResponseDto> getMyPage(@Parameter(hidden = true) @Re
         MyActivityInfoResponseDto myActivityInfo = MyActivityInfoResponseDto.from(member);
 
         // TODO : 레벨, 경험치 정보 - 로직 구체화
-        LevelInfoResponseDto nextLevel = memberService.getLevel(member.getMemberLevel());
+        LevelInfoResponseDto nextLevel = memberService.getNextLevel(member.getMemberLevel());
         MyLevelInfoResponseDto myLevelInfo = MyLevelInfoResponseDto.from(member, LevelInfoResponseDto.from(member.getMemberLevel()), nextLevel);
 
         return ResponseEntity.ok(MyPageResponseDto.from(simpleMember, myActivityInfo, myLevelInfo));

diff --git a/cider-api/src/main/java/com/cmc/domains/member/dto/response/SimpleMemberResponseDto.java b/cider-api/src/main/java/com/cmc/domains/member/dto/response/SimpleMemberResponseDto.java
@@ -24,15 +24,15 @@ public class SimpleMemberResponseDto {
     private String memberLevelName;
 
     @Schema(description = "n번째 챌린지", example = "3")
-    private Integer participateNum;
+    private Integer participateChallengeNum;
 
     public static SimpleMemberResponseDto from(Member member) {
 
         return SimpleMemberResponseDto.builder()
                 .memberName(member.getMemberName())
                 .profilePath(member.getProfilePath())
                 .memberLevelName("LV " + member.getMemberLevel().getMemberLevelId() + " " + member.getMemberLevel().getLevelName())
-                .participateNum(member.getParticipates().size())    // TODO: 반려된 챌린지 예외처리
+                .participateChallengeNum(member.getParticipates().size())    // TODO: 반려된 챌린지 예외처리
                 .build();
     }
 }
diff --git a/...-api/src/main/java/com/cmc/domains/member/dto/response/mypage/MyLevelInfoResponseDto.java b/...-api/src/main/java/com/cmc/domains/member/dto/response/mypage/MyLevelInfoResponseDto.java
@@ -28,8 +28,8 @@ public static MyLevelInfoResponseDto from(Member member, LevelInfoResponseDto cu
 
         return new MyLevelInfoResponseDtoBuilder()
                 .myLevel(member.getMemberLevel().getMemberLevelId())
-                .levelPercent((int) ((member.getMemberExperience() / (nextLevel.getRequiredExperience() - currentLevel.getRequiredExperience())) * 0.01))
-                .percentComment(MemberLevel.getPercentComment((int) ((member.getMemberExperience() / (nextLevel.getRequiredExperience() - currentLevel.getRequiredExperience())) * 0.01)))
+                .levelPercent((int)((double) member.getMemberExperience() / (nextLevel.getRequiredExperience() - currentLevel.getRequiredExperience()) * 100))
+                .percentComment(MemberLevel.getPercentComment((((int)((double) member.getMemberExperience() / (nextLevel.getRequiredExperience() - currentLevel.getRequiredExperience())) * 100))))
                 .experienceLeft(nextLevel.getRequiredExperience() - member.getMemberExperience())
                 .myLevelName(member.getMemberLevel().getLevelName())
                 .currentLevel(currentLevel)

diff --git a/cider-api/src/main/java/com/cmc/domains/member/repository/MemberLevelRepository.java b/cider-api/src/main/java/com/cmc/domains/member/repository/MemberLevelRepository.java
@@ -9,6 +9,6 @@
 @Repository
 public interface MemberLevelRepository extends JpaRepository<MemberLevel, Integer> {
 
-    @Query("select l from MemberLevel l where l.memberLevelId =:i+1")
+    @Query("select l from MemberLevel l where l.memberLevelId =:i")
     LevelInfoResponseDto getNextLevel(int i);
 }
diff --git a/cider-api/src/main/java/com/cmc/domains/member/service/MemberService.java b/cider-api/src/main/java/com/cmc/domains/member/service/MemberService.java
@@ -86,7 +86,7 @@ private boolean isValidNickName(String nickname) {
         return !memberRepository.existsByMemberName(nickname);
     }
 
-    public LevelInfoResponseDto getLevel(MemberLevel memberLevel) {
+    public LevelInfoResponseDto getNextLevel(MemberLevel memberLevel) {
 
         // TODO : 만렙 처리
         return memberLevelRepository.getNextLevel(memberLevel.getMemberLevelId() + 1);