Skip to content

Commit 7aa4633

Browse files
committed
feat - #188 success api에도 적용
1 parent 507229d commit 7aa4633

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

src/main/java/sopt/org/hmh/domain/dailychallenge/controller/DailyChallengeController.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,6 @@ public ResponseEntity<BaseResponse<ChallengeStatusesResponse>> orderChangeStatus
4747
return ResponseEntity
4848
.status(DailyChallengeSuccess.SEND_FINISHED_DAILY_CHALLENGE_SUCCESS.getHttpStatus())
4949
.body(BaseResponse.success(DailyChallengeSuccess.SEND_FINISHED_DAILY_CHALLENGE_SUCCESS,
50-
new ChallengeStatusesResponse(dailyChallengeFacade.changeDailyChallengeStatusByIsSuccess(userId, request))));
50+
new ChallengeStatusesResponse(dailyChallengeFacade.changeDailyChallengeStatusByIsSuccess(userId, request, timeZone))));
5151
}
5252
}

src/main/java/sopt/org/hmh/domain/dailychallenge/service/DailyChallengeFacade.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ public List<Status> addFinishedDailyChallengeHistory(Long userId, FinishedDailyC
3131

3232
request.finishedDailyChallenges().forEach(challengeRequest -> {
3333
dailyChallengeService.validatePeriodIndex(challengeRequest.challengePeriodIndex(), todayIndex);
34+
3435
DailyChallenge dailyChallenge = dailyChallengeService
3536
.findDailyChallengeByChallengePeriodIndex(challenge, challengeRequest.challengePeriodIndex());
3637
dailyChallengeService.changeStatusByCurrentStatus(dailyChallenge);
@@ -41,10 +42,13 @@ public List<Status> addFinishedDailyChallengeHistory(Long userId, FinishedDailyC
4142
}
4243

4344
@Transactional
44-
public List<Status> changeDailyChallengeStatusByIsSuccess(Long userId, FinishedDailyChallengeStatusListRequest request) {
45+
public List<Status> changeDailyChallengeStatusByIsSuccess(Long userId, FinishedDailyChallengeStatusListRequest request, String timeZone) {
4546
Challenge challenge = challengeService.findByIdOrElseThrow(userService.getCurrentChallengeIdByUserId(userId));
47+
Integer todayIndex = dailyChallengeService.calculateTodayIndex(challenge, LocalDate.now(ZoneId.of(timeZone)));
4648

4749
request.finishedDailyChallenges().forEach(challengeRequest -> {
50+
dailyChallengeService.validatePeriodIndex(challengeRequest.challengePeriodIndex(), todayIndex);
51+
4852
DailyChallenge dailyChallenge = dailyChallengeService
4953
.findDailyChallengeByChallengePeriodIndex(challenge, challengeRequest.challengePeriodIndex());
5054
if (challengeRequest.isSuccess()) {

0 commit comments

Comments
 (0)