[Feat] 무의미한 값은 0으로 응답

team-winey · Jan 22, 2024 · cf6223d · cf6223d
1 parent b97eece
commit cf6223d
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/src/main/java/org/winey/server/service/UserService.java b/src/main/java/org/winey/server/service/UserService.java
@@ -76,10 +76,17 @@ public GetAchievementStatusResponseDto getAchievementStatus(Long userId) {
             .orElseThrow(() -> new NotFoundException(Error.NOT_FOUND_USER_EXCEPTION, Error.NOT_FOUND_USER_EXCEPTION.getMessage()));
 
         UserLevel nextUserLevel = UserLevel.getNextUserLevel(user.getUserLevel());
+
+        if (nextUserLevel == null) {
+            return GetAchievementStatusResponseDto.of(user.getUserLevel(), 0L, 0L);
+        }
+
+        long remainingAmount = nextUserLevel.getMinimumAmount() - user.getSavedAmount();
+        long remainingCount = nextUserLevel.getMinimumCount() - user.getSavedCount();
         return GetAchievementStatusResponseDto.of(
             user.getUserLevel(),
-            nextUserLevel == null ? null : nextUserLevel.getMinimumAmount() - user.getSavedAmount(),
-            nextUserLevel == null ? null : nextUserLevel.getMinimumCount() - user.getSavedCount()
+            remainingAmount < 0 ? 0L : remainingAmount,
+            remainingCount < 0 ? 0L : remainingCount
         );
     }