Merge pull request #284 from 42organization/GGBE4-85--UserGameCoinRes…

…ultDto-error [GGBE4-85--UserGameCoinResultDto-error] UserGameCoinResultDto error 수정
42organization · Sep 19, 2023 · b38513d · b38513d
2 parents 78ce437 + 7e34ed2
commit b38513d
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/src/main/java/com/gg/server/domain/coin/service/UserCoinChangeService.java b/src/main/java/com/gg/server/domain/coin/service/UserCoinChangeService.java
@@ -30,7 +30,7 @@ public int addAttendanceCoin(User user){
         if (coinHistoryService.hasAttendedToday(user))
             throw new UserAlreadyAttendanceException();
         int coinIncrement = coinPolicyRepository.findTopByOrderByCreatedAtDesc()
-                .orElseThrow(() -> new CoinPolicyNotFoundException()).getAttendance();
+                .orElseThrow(CoinPolicyNotFoundException::new).getAttendance();
         user.addGgCoin(coinIncrement);
         coinHistoryService.addAttendanceCoinHistory(user);
         return coinIncrement;
@@ -58,7 +58,8 @@ public void giftItemCoin(Item item, Integer price, User user, User giftTarget){
     @Transactional
     public UserGameCoinResultDto addNormalGameCoin(Long userId) {
         User user = userRepository.findById(userId).orElseThrow(UserNotFoundException::new);
-        int coinIncrement = coinPolicyRepository.findTopByOrderByCreatedAtDesc().getNormal();
+        int coinIncrement = coinPolicyRepository.findTopByOrderByCreatedAtDesc()
+                .orElseThrow(CoinPolicyNotFoundException::new).getNormal();
 
         user.addGgCoin(coinIncrement);
         coinHistoryService.addNormalCoin(user);
@@ -84,9 +85,9 @@ private boolean userIsWinner(Long gameId, User user) {
 
         for(Team team: teams) {
             for (TeamUser teamUser : team.getTeamUsers()){
-                if (teamUser.getUser().getId() == user.getId() && team.getWin() == true)
+                if (teamUser.getUser().getId() == user.getId() && team.getWin())
                     return true;
-                else if (teamUser.getUser().getId() == user.getId() && team.getWin() == false)
+                else if (teamUser.getUser().getId() == user.getId() && !team.getWin())
                     return false;
             }
         }