diff --git a/src/main/java/ongjong/namanmoo/controller/ChallengeController.java b/src/main/java/ongjong/namanmoo/controller/ChallengeController.java index 1451fa0..99adc5c 100644 --- a/src/main/java/ongjong/namanmoo/controller/ChallengeController.java +++ b/src/main/java/ongjong/namanmoo/controller/ChallengeController.java @@ -113,6 +113,7 @@ public ApiResponse> getChallengeList(@RequestParam("chall Member member = memberService.findMemberByLoginId(); // 로그인한 멤버 찾기 List challengeList = challenges.stream() .map(challenge -> { + boolean isComplete = answerService.findIsCompleteAnswer(challenge, member); return new ChallengeListDto(challenge, isComplete); }) diff --git a/src/main/java/ongjong/namanmoo/service/LuckyServiceImpl.java b/src/main/java/ongjong/namanmoo/service/LuckyServiceImpl.java index 2fbd22e..64d2f74 100644 --- a/src/main/java/ongjong/namanmoo/service/LuckyServiceImpl.java +++ b/src/main/java/ongjong/namanmoo/service/LuckyServiceImpl.java @@ -125,12 +125,12 @@ public Integer calculateLuckyStatus(Lucky lucky, String answerCreateDate, String Long betweenLuckyAnswer = DateUtil.getInstance().getDateDifference(luckyStartDate, answerCreateDate); if (betweenLuckyAnswer == 1) { return 1; // 1일 and (미참여 or 참여) : 새싹 - } else if (betweenLuckyAnswer == 15 && answerContent == null) { - return 1; // 15일 and 미참여 : 새싹 +// } else if (betweenLuckyAnswer == 15 && answerContent == null) { +// return 1; // 15일 and 미참여 : 새싹 } else if (betweenLuckyAnswer == 15) { return 2; // 15일 and 참여 : 행운이 - } else if (betweenLuckyAnswer == 30 && answerContent == null) { - return 2; // 30일 and 미참여 : 행운이 +// } else if (betweenLuckyAnswer == 30 && answerContent == null) { +// return 2; // 30일 and 미참여 : 행운이 } else { return 3; // 나머지 엑스텀프 }