Merge pull request #233 from team-winey/refactor/#232

[Refactor]#232 절약 누적횟수 추가
team-winey · Feb 22, 2024 · c29a4f5 · c29a4f5
2 parents 45ec08e + 403d971
commit c29a4f5
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 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
@@ -24,6 +24,7 @@ public static class UserData {
         private String userLevel;
         private Boolean fcmIsAllowed;
         private Long accumulatedAmount;
+        private Long accumulatedCount;
         private Long amountSavedHundredDays;
         private Long amountSavedTwoWeeks;
         private Long amountSpentTwoWeeks;
@@ -33,9 +34,9 @@ public static class UserData {
 
 
     public static UserResponseDto of(Long userId, String nickname, String userLevel,
-        Boolean fcmIsAllowed, Long accumulatedAmount, Long amountSavedHundredDays, Long amountSavedTwoWeeks,
+        Boolean fcmIsAllowed, Long accumulatedAmount,Long accumulatedCount , Long amountSavedHundredDays, Long amountSavedTwoWeeks,
         Long amountSpentTwoWeeks, Long remainingAmount, Long remainingCount) {
-        UserData userData = new UserData(userId, nickname, userLevel, fcmIsAllowed, accumulatedAmount,
+        UserData userData = new UserData(userId, nickname, userLevel, fcmIsAllowed, accumulatedAmount, accumulatedCount,
                 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
@@ -46,7 +46,8 @@ public UserResponseDto getUser(Long userId) {
         return UserResponseDto.of(user.getUserId(), user.getNickname(),
             user.getUserLevel().getName(),
             user.getFcmIsAllowed(),
-            user.getSavedAmount() == null ? 0L : user.getSavedAmount(),
+            savedAmountOfUser,
+            savedCountOfUser,
             amountSavedHundredDays == null ? 0L : amountSavedHundredDays,
             amountSavedTwoWeeks == null ? 0L : amountSavedTwoWeeks,
             amountSpentTwoWeeks == null ? 0L : amountSpentTwoWeeks,