Merge pull request #231 from team-winey/refactor/#230

team-winey · Feb 22, 2024 · 45ec08e · 45ec08e
2 parents e46cc3c + 32b916c
commit 45ec08e
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 4 deletions.
diff --git a/src/main/java/org/winey/server/controller/response/user/UserResponseDto.java b/src/main/java/org/winey/server/controller/response/user/UserResponseDto.java
@@ -1,5 +1,7 @@
 package org.winey.server.controller.response.user;
 
+import org.winey.server.domain.user.UserLevel;
+
 import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
@@ -25,14 +27,16 @@ public static class UserData {
         private Long amountSavedHundredDays;
         private Long amountSavedTwoWeeks;
         private Long amountSpentTwoWeeks;
+        private Long remainingAmount;
+        private Long remainingCount;
     }
 
 
     public static UserResponseDto of(Long userId, String nickname, String userLevel,
         Boolean fcmIsAllowed, Long accumulatedAmount, Long amountSavedHundredDays, Long amountSavedTwoWeeks,
-        Long amountSpentTwoWeeks) {
+        Long amountSpentTwoWeeks, Long remainingAmount, Long remainingCount) {
         UserData userData = new UserData(userId, nickname, userLevel, fcmIsAllowed, accumulatedAmount,
-                amountSavedHundredDays, amountSavedTwoWeeks, amountSpentTwoWeeks);
+                amountSavedHundredDays, amountSavedTwoWeeks, amountSpentTwoWeeks,remainingAmount,remainingCount);
         return new UserResponseDto(userData);
     }
 }
diff --git a/src/main/java/org/winey/server/service/UserService.java b/src/main/java/org/winey/server/service/UserService.java
@@ -35,12 +35,23 @@ public UserResponseDto getUser(Long userId) {
         Long amountSavedTwoWeeks = feedRepository.getSavedAmountForPeriod(user, twoWeeksAgo);
         Long amountSpentTwoWeeks = feedRepository.getSpentAmountForPeriod(user, twoWeeksAgo);
 
+        UserLevel nextUserLevel = UserLevel.getNextUserLevel(user.getUserLevel());
+
+        long savedAmountOfUser = user.getSavedAmount() == null ? 0L : user.getSavedAmount();  //기존의 getSavedAmount()했을 시 null -> 0L로 처리
+        long savedCountOfUser = user.getSavedCount() == null ? 0L : user.getSavedCount();     //위와 이유 같음.
+
+        long remainingAmount = nextUserLevel == null ? 0L : nextUserLevel.getMinimumAmount() - savedAmountOfUser;
+        long remainingCount = nextUserLevel == null ? 0L : nextUserLevel.getMinimumCount() - savedCountOfUser;
+
         return UserResponseDto.of(user.getUserId(), user.getNickname(),
-            user.getUserLevel().getName(), user.getFcmIsAllowed(),
+            user.getUserLevel().getName(),
+            user.getFcmIsAllowed(),
             user.getSavedAmount() == null ? 0L : user.getSavedAmount(),
             amountSavedHundredDays == null ? 0L : amountSavedHundredDays,
             amountSavedTwoWeeks == null ? 0L : amountSavedTwoWeeks,
-            amountSpentTwoWeeks == null ? 0L : amountSpentTwoWeeks
+            amountSpentTwoWeeks == null ? 0L : amountSpentTwoWeeks,
+            remainingAmount < 0 ? 0L : remainingAmount,
+            remainingCount < 0 ? 0L : remainingCount
         );
     }