Merge pull request #116 from Ong-gi-Jong-gi/feature/TSK-55/prepare

[TSK-55] 시연 리허설 준비
Ong-gi-Jong-gi · Jul 24, 2024 · effb3c4 · effb3c4
2 parents e53fa5d + 0f182bd
commit effb3c4
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/src/main/java/ongjong/namanmoo/controller/ChallengeController.java b/src/main/java/ongjong/namanmoo/controller/ChallengeController.java
@@ -113,6 +113,7 @@ public ApiResponse<List<ChallengeListDto>> getChallengeList(@RequestParam("chall
         Member member = memberService.findMemberByLoginId(); // 로그인한 멤버 찾기
         List<ChallengeListDto> 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
@@ -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; // 나머지 엑스텀프
         }