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 index 9be55f9..619980c 100644 --- 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 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 index 3891e73..1f494c3 100644 --- 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,7 +24,7 @@ public class SimpleMemberResponseDto { private String memberLevelName; @Schema(description = "n번째 챌린지", example = "3") - private Integer participateNum; + private Integer participateChallengeNum; public static SimpleMemberResponseDto from(Member member) { @@ -32,7 +32,7 @@ public static SimpleMemberResponseDto from(Member member) { .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/cider-api/src/main/java/com/cmc/domains/member/dto/response/mypage/MyLevelInfoResponseDto.java b/cider-api/src/main/java/com/cmc/domains/member/dto/response/mypage/MyLevelInfoResponseDto.java index f5e5282..a6ff8a5 100644 --- a/cider-api/src/main/java/com/cmc/domains/member/dto/response/mypage/MyLevelInfoResponseDto.java +++ b/cider-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 index 8705b85..d445227 100644 --- 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 { - @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 index ffadb99..00b2e45 100644 --- 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);