Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[TSK-55] 시연 리허설 준비 #116

Merged
merged 1 commit into from
Jul 24, 2024
+5 −4
Merged

[TSK-55] 시연 리허설 준비 #116

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/main/java/ongjong/namanmoo/controller/ChallengeController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
})
Expand Down
8 changes: 4 additions & 4 deletions src/main/java/ongjong/namanmoo/service/LuckyServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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; // 나머지 엑스텀프
}
Expand Down