fix: 우리학교 마스코트 조회 API response 수정

Team-UMC · Feb 19, 2024 · 8866052 · 8866052
1 parent 19f8c33
commit 8866052
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/...ain/java/com/umc/networkingService/domain/university/dto/response/UniversityResponse.java b/...ain/java/com/umc/networkingService/domain/university/dto/response/UniversityResponse.java
@@ -94,12 +94,13 @@ public static void setRank(JoinContributionRank joinContributionRank ,Integer ne
     @NoArgsConstructor
     @AllArgsConstructor // 학교 마스코트
     public static class joinUniversityMascot {
+        String universityName;
         Integer level;
         Long point;
+        Long levelUpPoint;
         Integer rank;
         String mascotImage;
         List<String> mascotDialog;
-        String universityImage;
 
         public static joinUniversityMascot setRank(joinUniversityMascot universityMascot, Integer rank) {
             universityMascot.rank = rank;

diff --git a/src/main/java/com/umc/networkingService/domain/university/mapper/UniversityMapper.java b/src/main/java/com/umc/networkingService/domain/university/mapper/UniversityMapper.java
@@ -65,14 +65,15 @@ public static List<UniversityResponse.JoinContributionRank> toJoinContributionRa
 
     // 학교 마스코트 조회
     public static UniversityResponse.joinUniversityMascot toJoinUniversityMascot(
-            University university, Mascot mascot
+            University university, Mascot mascot, Long levelUpPoint
     ){
         return UniversityResponse.joinUniversityMascot.builder()
+                .universityName(university.getName())
                 .mascotDialog(mascot.getRandomDialogues())
                 .mascotImage(mascot.getImage())
                 .level(university.getCurrentLevel())
                 .point(university.getTotalPoint())
-                .universityImage(university.getUniversityLogo())
+                .levelUpPoint(levelUpPoint)
                 .build();
     }
 

diff --git a/src/main/java/com/umc/networkingService/domain/university/service/UniversityServiceImpl.java b/src/main/java/com/umc/networkingService/domain/university/service/UniversityServiceImpl.java
@@ -98,11 +98,13 @@ public UniversityResponse.JoinContributionRanks joinContributionRankingList(Memb
     @Transactional(readOnly = true)    //우리 대학교 마스코트 조회
     public UniversityResponse.joinUniversityMascot joinUniversityMascot(Member member) {
         Member memberEntity = memberService.findByMemberId(member.getId());
+        University university = memberEntity.getUniversity();
 
         UniversityResponse.joinUniversityMascot universityMascot
                 = UniversityMapper.toJoinUniversityMascot(
-                memberEntity.getUniversity()
-                ,memberEntity.getUniversity().getMascot()
+                university
+                ,university.getMascot(),
+                (long) (university.getCurrentLevel() * 200)
         );
 
         List<University> universityRankList = universityRepository.findAllByOrderByTotalPointDesc(); //랭킹 순 정렬