Merge pull request #281 from bankidz/dev

🔨 refactor: 돈길 알림 로직 분기점 수정
bankidz · Dec 5, 2022 · c588a26 · c588a26
2 parents 3fccf06 + 1bbefcb
commit c588a26
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/src/main/java/com/ceos/bankids/service/ChallengeServiceImpl.java b/src/main/java/com/ceos/bankids/service/ChallengeServiceImpl.java
@@ -157,10 +157,16 @@ public ChallengeListMapperDTO readWalkingChallenge(Challenge challenge) {
             }
         }
         if (falseCnt >= risk) {
+            if (challenge.getChallengeStatus() == failed) {
+                return new ChallengeListMapperDTO(challenge, progressDTOList, false);
+            }
             challenge.setChallengeStatus(failed);
             challengeRepository.save(challenge);
             return new ChallengeListMapperDTO(challenge, progressDTOList, true);
         } else if (diffWeeks > challenge.getWeeks()) {
+            if (challenge.getChallengeStatus() == achieved) {
+                return new ChallengeListMapperDTO(challenge, progressDTOList, false);
+            }
             challenge.setChallengeStatus(achieved);
             challengeRepository.save(challenge);
             return new ChallengeListMapperDTO(challenge, progressDTOList, true);

diff --git a/src/main/java/com/ceos/bankids/service/ExpoNotificationServiceImpl.java b/src/main/java/com/ceos/bankids/service/ExpoNotificationServiceImpl.java
@@ -274,7 +274,7 @@ public void challengeFailedNotification(User contractUser, ChallengeUser challen
                 notificationCategory, "/");
         }
         log.info("부모 유저 id = {}에게 유저 id = {}의 돈길 id = {} 돈길 실패 알림 전송", contractUser.getId(),
-            challengeUser.getChallenge().getId(), challengeUser.getChallenge().getId());
+            challengeUser.getUser().getId(), challengeUser.getChallenge().getId());
     }
 
     @Async