From 1bbefcbcd361c4307879ba949356083b54bd745d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B9=80=EB=AF=BC=EC=A4=80?= Date: Tue, 6 Dec 2022 00:09:12 +0900 Subject: [PATCH] =?UTF-8?q?:hammer:=20refactor:=20=EB=8F=88=EA=B8=B8=20?= =?UTF-8?q?=EC=95=8C=EB=A6=BC=20=EB=A1=9C=EC=A7=81=20=EB=B6=84=EA=B8=B0?= =?UTF-8?q?=EC=A0=90=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ceos/bankids/service/ChallengeServiceImpl.java | 6 ++++++ .../ceos/bankids/service/ExpoNotificationServiceImpl.java | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/ceos/bankids/service/ChallengeServiceImpl.java b/src/main/java/com/ceos/bankids/service/ChallengeServiceImpl.java index 6e35999..4cf5f20 100644 --- 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 index 06bbc87..692974b 100644 --- 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