From df0d7b6ed661685b6ac272867c12326244fbe7e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E1=84=8B=E1=85=B5=E1=86=B7=E1=84=8C=E1=85=AE=E1=84=86?= =?UTF-8?q?=E1=85=B5=E1=86=AB?= Date: Fri, 17 May 2024 08:40:06 +0100 Subject: [PATCH 01/10] =?UTF-8?q?feat=20-=20#134=20userId=ED=86=B5?= =?UTF-8?q?=ED=95=B4=EC=84=9C=20=ED=98=84=EC=9E=AC=EC=B1=8C=EB=A6=B0?= =?UTF-8?q?=EC=A7=80=20=EB=B0=98=ED=99=98=ED=95=98=EB=8A=94=20=EB=A9=94?= =?UTF-8?q?=EC=86=8C=EB=93=9C=20=EA=B5=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/hmh/domain/challenge/service/ChallengeService.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/main/java/sopt/org/hmh/domain/challenge/service/ChallengeService.java b/src/main/java/sopt/org/hmh/domain/challenge/service/ChallengeService.java index 9fe30142..0969eda6 100644 --- a/src/main/java/sopt/org/hmh/domain/challenge/service/ChallengeService.java +++ b/src/main/java/sopt/org/hmh/domain/challenge/service/ChallengeService.java @@ -23,6 +23,8 @@ import sopt.org.hmh.domain.dailychallenge.domain.Status; import sopt.org.hmh.domain.dailychallenge.repository.DailyChallengeRepository; import sopt.org.hmh.domain.user.domain.User; +import sopt.org.hmh.domain.user.domain.exception.UserError; +import sopt.org.hmh.domain.user.domain.exception.UserException; import sopt.org.hmh.domain.user.service.UserService; import java.time.LocalDate; @@ -95,6 +97,11 @@ public ChallengeResponse getChallenge(Long userId) { .build(); } + private Challenge findCurrentChallengeByUserId(Long userId) { + User user = userService.findByIdOrThrowException(userId); + return findByIdOrElseThrow(user.getCurrentChallengeId()); + } + public DailyChallengeResponse getDailyChallenge(Long userId) { Challenge challenge = this.findFirstByUserIdOrderByCreatedAtDescOrElseThrow(userId); From 53a7df0f6f5c79ce5860e5ecf02f78f932ac7576 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E1=84=8B=E1=85=B5=E1=86=B7=E1=84=8C=E1=85=AE=E1=84=86?= =?UTF-8?q?=E1=85=B5=E1=86=AB?= Date: Fri, 17 May 2024 08:40:51 +0100 Subject: [PATCH 02/10] =?UTF-8?q?feat=20-=20#134=20=EB=8B=AC=EC=84=B1?= =?UTF-8?q?=ED=98=84=ED=99=A9=EB=B7=B0=20=EC=B1=8C=EB=A6=B0=EC=A7=80=20?= =?UTF-8?q?=EC=A1=B0=ED=9A=8C=20=EB=B0=A9=EC=8B=9D=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sopt/org/hmh/domain/challenge/service/ChallengeService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/sopt/org/hmh/domain/challenge/service/ChallengeService.java b/src/main/java/sopt/org/hmh/domain/challenge/service/ChallengeService.java index 0969eda6..eecd5249 100644 --- a/src/main/java/sopt/org/hmh/domain/challenge/service/ChallengeService.java +++ b/src/main/java/sopt/org/hmh/domain/challenge/service/ChallengeService.java @@ -81,7 +81,7 @@ public Challenge addChallenge(Long userId, Integer period, Long goalTime, String } public ChallengeResponse getChallenge(Long userId) { - Challenge challenge = this.findFirstByUserIdOrderByCreatedAtDescOrElseThrow(userId); + Challenge challenge = findCurrentChallengeByUserId(userId); Integer todayIndex = calculateTodayIndex(challenge.getCreatedAt(), challenge.getPeriod()); return ChallengeResponse.builder() From bd191a5e6a80ac651cdce132de90a623799982de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E1=84=8B=E1=85=B5=E1=86=B7=E1=84=8C=E1=85=AE=E1=84=86?= =?UTF-8?q?=E1=85=B5=E1=86=AB?= Date: Fri, 17 May 2024 08:41:07 +0100 Subject: [PATCH 03/10] =?UTF-8?q?feat=20-=20#134=20=ED=99=88=EB=B7=B0=20?= =?UTF-8?q?=EC=B1=8C=EB=A6=B0=EC=A7=80=20=EC=A1=B0=ED=9A=8C=20=EB=B0=A9?= =?UTF-8?q?=EC=8B=9D=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sopt/org/hmh/domain/challenge/service/ChallengeService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/sopt/org/hmh/domain/challenge/service/ChallengeService.java b/src/main/java/sopt/org/hmh/domain/challenge/service/ChallengeService.java index eecd5249..664961e9 100644 --- a/src/main/java/sopt/org/hmh/domain/challenge/service/ChallengeService.java +++ b/src/main/java/sopt/org/hmh/domain/challenge/service/ChallengeService.java @@ -103,7 +103,7 @@ private Challenge findCurrentChallengeByUserId(Long userId) { } public DailyChallengeResponse getDailyChallenge(Long userId) { - Challenge challenge = this.findFirstByUserIdOrderByCreatedAtDescOrElseThrow(userId); + Challenge challenge = findCurrentChallengeByUserId(userId); return DailyChallengeResponse.builder() .status(Boolean.TRUE.equals(challenge.isChallengeFailedToday()) From d6c852572caad5c712fdfdc53d47c161edb00509 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E1=84=8B=E1=85=B5=E1=86=B7=E1=84=8C=E1=85=AE=E1=84=86?= =?UTF-8?q?=E1=85=B5=E1=86=AB?= Date: Fri, 17 May 2024 09:19:51 +0100 Subject: [PATCH 04/10] =?UTF-8?q?feat=20-=20#134=20currentChallengeId=20?= =?UTF-8?q?=EA=B0=80=EC=A0=B8=EC=98=AC=20=EB=95=8C=20=EC=97=90=EB=9F=AC=20?= =?UTF-8?q?=EC=B2=98=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/hmh/domain/user/domain/exception/UserError.java | 1 + .../sopt/org/hmh/domain/user/service/UserService.java | 9 +++++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/main/java/sopt/org/hmh/domain/user/domain/exception/UserError.java b/src/main/java/sopt/org/hmh/domain/user/domain/exception/UserError.java index 56ae426a..3f0ba624 100644 --- a/src/main/java/sopt/org/hmh/domain/user/domain/exception/UserError.java +++ b/src/main/java/sopt/org/hmh/domain/user/domain/exception/UserError.java @@ -10,6 +10,7 @@ public enum UserError implements ErrorBase { // 404 NOT FOUND NOT_FOUND_USER(HttpStatus.NOT_FOUND, "유저를 찾을 수 없습니다."), NOT_ENOUGH_POINTS(HttpStatus.BAD_REQUEST, "유저의 포인트가 부족합니다."), + NOT_FOUND_CURRENT_CHALLENGE_ID(HttpStatus.NOT_FOUND, "유저에서 현재 챌린지 id 정보를 찾을 수 없습니다.") ; private final HttpStatus status; diff --git a/src/main/java/sopt/org/hmh/domain/user/service/UserService.java b/src/main/java/sopt/org/hmh/domain/user/service/UserService.java index 4f7b591c..a631adb7 100644 --- a/src/main/java/sopt/org/hmh/domain/user/service/UserService.java +++ b/src/main/java/sopt/org/hmh/domain/user/service/UserService.java @@ -1,6 +1,8 @@ package sopt.org.hmh.domain.user.service; import java.util.List; +import java.util.Optional; + import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -10,6 +12,8 @@ import sopt.org.hmh.domain.auth.exception.AuthException; import sopt.org.hmh.domain.auth.repository.OnboardingInfoRepository; import sopt.org.hmh.domain.auth.repository.ProblemRepository; +import sopt.org.hmh.domain.challenge.domain.exception.ChallengeError; +import sopt.org.hmh.domain.challenge.domain.exception.ChallengeException; import sopt.org.hmh.domain.user.domain.OnboardingInfo; import sopt.org.hmh.domain.user.domain.OnboardingProblem; import sopt.org.hmh.domain.user.domain.User; @@ -102,6 +106,7 @@ public User findByIdOrThrowException(Long userId) { } public Long getCurrentChallengeIdByUserId(Long userId) { - return this.findByIdOrThrowException(userId).getCurrentChallengeId(); + return Optional.ofNullable(this.findByIdOrThrowException(userId).getCurrentChallengeId()) + .orElseThrow(() -> new UserException(UserError.NOT_FOUND_CURRENT_CHALLENGE_ID)); } -} +} \ No newline at end of file From 0761461b693f1699409aa8989e9e769e98b1fb3f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E1=84=8B=E1=85=B5=E1=86=B7=E1=84=8C=E1=85=AE=E1=84=86?= =?UTF-8?q?=E1=85=B5=E1=86=AB?= Date: Fri, 17 May 2024 09:20:45 +0100 Subject: [PATCH 05/10] =?UTF-8?q?feat=20-=20#134=20=EC=98=88=EC=A0=84=20?= =?UTF-8?q?=EC=B1=8C=EB=A6=B0=EC=A7=80=20=EC=A0=95=EB=B3=B4=20=EB=B6=88?= =?UTF-8?q?=EB=9F=AC=EC=98=AC=20=EB=95=8C=20=EC=B1=8C=EB=A6=B0=EC=A7=80=20?= =?UTF-8?q?=EC=A1=B0=ED=9A=8C=20=EB=B0=A9=EC=8B=9D=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hmh/domain/challenge/service/ChallengeService.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/main/java/sopt/org/hmh/domain/challenge/service/ChallengeService.java b/src/main/java/sopt/org/hmh/domain/challenge/service/ChallengeService.java index 664961e9..e1bb47e7 100644 --- a/src/main/java/sopt/org/hmh/domain/challenge/service/ChallengeService.java +++ b/src/main/java/sopt/org/hmh/domain/challenge/service/ChallengeService.java @@ -54,9 +54,11 @@ public Challenge addChallenge(Long userId, Integer period, Long goalTime, String .goalTime(goalTime) .build()); - Optional previousChallenge = challengeRepository.findFirstByUserIdOrderByCreatedAtDesc(userId); - if (previousChallenge.isPresent()) { - List previousApps = previousChallenge.get().getApps().stream() + User user = userService.findByIdOrThrowException(userId); + Long previousChallengeId = user.getCurrentChallengeId(); + if (previousChallengeId != null) { + Challenge previousChallenge = findByIdOrElseThrow(previousChallengeId); + List previousApps = previousChallenge.getApps().stream() .map(app -> new AppGoalTimeRequest(app.getAppCode(), app.getGoalTime())) .toList(); addApps(challenge, previousApps, os); @@ -74,7 +76,6 @@ public Challenge addChallenge(Long userId, Integer period, Long goalTime, String } dailyChallengeRepository.saveAll(dailyChallenges); - User user = userService.findByIdOrThrowException(userId); user.changeCurrentChallengeId(challenge.getId()); return challenge; From cc891ebcb71a611fe52990ea439d6760156865ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E1=84=8B=E1=85=B5=E1=86=B7=E1=84=8C=E1=85=AE=E1=84=86?= =?UTF-8?q?=E1=85=B5=E1=86=AB?= Date: Fri, 17 May 2024 09:21:00 +0100 Subject: [PATCH 06/10] =?UTF-8?q?chore=20-=20#134=20deprecated=EB=90=9C=20?= =?UTF-8?q?=EB=A9=94=EC=86=8C=EB=93=9C=20=EC=82=AD=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/challenge/repository/ChallengeRepository.java | 2 -- .../hmh/domain/challenge/service/ChallengeService.java | 9 --------- 2 files changed, 11 deletions(-) diff --git a/src/main/java/sopt/org/hmh/domain/challenge/repository/ChallengeRepository.java b/src/main/java/sopt/org/hmh/domain/challenge/repository/ChallengeRepository.java index 4ac00537..b426c20f 100644 --- a/src/main/java/sopt/org/hmh/domain/challenge/repository/ChallengeRepository.java +++ b/src/main/java/sopt/org/hmh/domain/challenge/repository/ChallengeRepository.java @@ -9,7 +9,5 @@ public interface ChallengeRepository extends JpaRepository { Optional findById(Long id); - Optional findFirstByUserIdOrderByCreatedAtDesc(Long userId); - void deleteByUserIdIn(List userId); } \ No newline at end of file diff --git a/src/main/java/sopt/org/hmh/domain/challenge/service/ChallengeService.java b/src/main/java/sopt/org/hmh/domain/challenge/service/ChallengeService.java index e1bb47e7..e03e8a1f 100644 --- a/src/main/java/sopt/org/hmh/domain/challenge/service/ChallengeService.java +++ b/src/main/java/sopt/org/hmh/domain/challenge/service/ChallengeService.java @@ -23,8 +23,6 @@ import sopt.org.hmh.domain.dailychallenge.domain.Status; import sopt.org.hmh.domain.dailychallenge.repository.DailyChallengeRepository; import sopt.org.hmh.domain.user.domain.User; -import sopt.org.hmh.domain.user.domain.exception.UserError; -import sopt.org.hmh.domain.user.domain.exception.UserException; import sopt.org.hmh.domain.user.service.UserService; import java.time.LocalDate; @@ -32,7 +30,6 @@ import java.time.temporal.ChronoUnit; import java.util.ArrayList; import java.util.List; -import java.util.Optional; @Service @RequiredArgsConstructor @@ -189,12 +186,6 @@ private void validateAppTime(Long appTime) { throw new AppException(AppError.INVALID_TIME_RANGE); } - @Deprecated - public Challenge findFirstByUserIdOrderByCreatedAtDescOrElseThrow(Long userId) { - return challengeRepository.findFirstByUserIdOrderByCreatedAtDesc(userId).orElseThrow( - () -> new ChallengeException(ChallengeError.CHALLENGE_NOT_FOUND)); - } - public Challenge findByIdOrElseThrow(Long challengeId) { return challengeRepository.findById(challengeId).orElseThrow( () -> new ChallengeException(ChallengeError.CHALLENGE_NOT_FOUND)); From 35ecf0c45bcd0a3edfcd9545985a7297bb8875af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E1=84=8B=E1=85=B5=E1=86=B7=E1=84=8C=E1=85=AE=E1=84=86?= =?UTF-8?q?=E1=85=B5=E1=86=AB?= Date: Fri, 17 May 2024 09:24:12 +0100 Subject: [PATCH 07/10] =?UTF-8?q?chore=20-=20#134=20=EC=B1=8C=EB=A6=B0?= =?UTF-8?q?=EC=A7=80=20=EC=A1=B0=ED=9A=8C=20=ED=95=A8=EC=88=98=20public?= =?UTF-8?q?=EC=9C=BC=EB=A1=9C=20=EB=B3=80=EA=B2=BD=20=EB=B0=8F=20=EC=9C=84?= =?UTF-8?q?=EC=B9=98=20=EC=9D=B4=EB=8F=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/challenge/service/ChallengeService.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/java/sopt/org/hmh/domain/challenge/service/ChallengeService.java b/src/main/java/sopt/org/hmh/domain/challenge/service/ChallengeService.java index e03e8a1f..55ca950f 100644 --- a/src/main/java/sopt/org/hmh/domain/challenge/service/ChallengeService.java +++ b/src/main/java/sopt/org/hmh/domain/challenge/service/ChallengeService.java @@ -74,7 +74,7 @@ public Challenge addChallenge(Long userId, Integer period, Long goalTime, String dailyChallengeRepository.saveAll(dailyChallenges); user.changeCurrentChallengeId(challenge.getId()); - + return challenge; } @@ -95,11 +95,6 @@ public ChallengeResponse getChallenge(Long userId) { .build(); } - private Challenge findCurrentChallengeByUserId(Long userId) { - User user = userService.findByIdOrThrowException(userId); - return findByIdOrElseThrow(user.getCurrentChallengeId()); - } - public DailyChallengeResponse getDailyChallenge(Long userId) { Challenge challenge = findCurrentChallengeByUserId(userId); @@ -191,6 +186,11 @@ public Challenge findByIdOrElseThrow(Long challengeId) { () -> new ChallengeException(ChallengeError.CHALLENGE_NOT_FOUND)); } + public Challenge findCurrentChallengeByUserId(Long userId) { + User user = userService.findByIdOrThrowException(userId); + return findByIdOrElseThrow(user.getCurrentChallengeId()); + } + public List getCurrentChallengeAppWithGoalTimeByChallengeId(Long challengeId) { return this.findByIdOrElseThrow(challengeId).getApps(); } From 6b3743fd0f8ca6b5dbe7217b839d725c2a827709 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E1=84=8B=E1=85=B5=E1=86=B7=E1=84=8C=E1=85=AE=E1=84=86?= =?UTF-8?q?=E1=85=B5=E1=86=AB?= Date: Fri, 17 May 2024 09:24:34 +0100 Subject: [PATCH 08/10] =?UTF-8?q?feat=20-=20#134=20=EC=95=B1=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80=20=EB=B0=8F=20=EC=82=AD=EC=A0=9C=20=EC=8B=9C=20?= =?UTF-8?q?=EC=B1=8C=EB=A6=B0=EC=A7=80=20=EC=A1=B0=ED=9A=8C=20=EB=B0=A9?= =?UTF-8?q?=EC=8B=9D=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hmh/domain/challenge/controller/ChallengeController.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/sopt/org/hmh/domain/challenge/controller/ChallengeController.java b/src/main/java/sopt/org/hmh/domain/challenge/controller/ChallengeController.java index 95f6bbfa..6c3dac82 100644 --- a/src/main/java/sopt/org/hmh/domain/challenge/controller/ChallengeController.java +++ b/src/main/java/sopt/org/hmh/domain/challenge/controller/ChallengeController.java @@ -60,7 +60,7 @@ public ResponseEntity> orderGetDailyChallen public ResponseEntity> orderAddApps(@UserId final Long userId, @RequestHeader("OS") final String os, @RequestBody final AppArrayGoalTimeRequest requests) { - Challenge challenge = challengeService.findFirstByUserIdOrderByCreatedAtDescOrElseThrow(userId); + Challenge challenge = challengeService.findCurrentChallengeByUserId(userId); challengeService.addApps(challenge, requests.apps(), os); return ResponseEntity @@ -74,7 +74,7 @@ public ResponseEntity> orderAddApps(@UserId final Long userId, public ResponseEntity> orderRemoveApp(@UserId final Long userId, @RequestHeader("OS") final String os, @RequestBody final AppRemoveRequest request) { - Challenge challenge = challengeService.findFirstByUserIdOrderByCreatedAtDescOrElseThrow(userId); + Challenge challenge = challengeService.findCurrentChallengeByUserId(userId); challengeService.removeApp(challenge, request, os); return ResponseEntity From 8301f747413535528b590f2bfdc7d457ed796926 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E1=84=8B=E1=85=B5=E1=86=B7=E1=84=8C=E1=85=AE=E1=84=86?= =?UTF-8?q?=E1=85=B5=E1=86=AB?= Date: Fri, 17 May 2024 09:49:17 +0100 Subject: [PATCH 09/10] =?UTF-8?q?feat=20-=20#117=20=EB=8B=AC=EC=84=B1?= =?UTF-8?q?=ED=98=84=ED=99=A9=EB=B7=B0=20response=EC=97=90=20=EC=B1=8C?= =?UTF-8?q?=EB=A6=B0=EC=A7=80=20=EC=8B=9C=EC=9E=91=EB=82=A0=EC=A7=9C(yyyy-?= =?UTF-8?q?MM-dd)=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hmh/domain/challenge/dto/response/ChallengeResponse.java | 1 + .../org/hmh/domain/challenge/service/ChallengeService.java | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/src/main/java/sopt/org/hmh/domain/challenge/dto/response/ChallengeResponse.java b/src/main/java/sopt/org/hmh/domain/challenge/dto/response/ChallengeResponse.java index 532d60c7..03d0891d 100644 --- a/src/main/java/sopt/org/hmh/domain/challenge/dto/response/ChallengeResponse.java +++ b/src/main/java/sopt/org/hmh/domain/challenge/dto/response/ChallengeResponse.java @@ -15,6 +15,7 @@ public record ChallengeResponse( Integer period, List statuses, Integer todayIndex, + String startDate, Long goalTime, List apps ) { diff --git a/src/main/java/sopt/org/hmh/domain/challenge/service/ChallengeService.java b/src/main/java/sopt/org/hmh/domain/challenge/service/ChallengeService.java index 55ca950f..be6b2be6 100644 --- a/src/main/java/sopt/org/hmh/domain/challenge/service/ChallengeService.java +++ b/src/main/java/sopt/org/hmh/domain/challenge/service/ChallengeService.java @@ -27,6 +27,7 @@ import java.time.LocalDate; import java.time.LocalDateTime; +import java.time.format.DateTimeFormatter; import java.time.temporal.ChronoUnit; import java.util.ArrayList; import java.util.List; @@ -82,6 +83,9 @@ public ChallengeResponse getChallenge(Long userId) { Challenge challenge = findCurrentChallengeByUserId(userId); Integer todayIndex = calculateTodayIndex(challenge.getCreatedAt(), challenge.getPeriod()); + DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd"); + String formattedStartDate = challenge.getCreatedAt().format(formatter); + return ChallengeResponse.builder() .period(challenge.getPeriod()) .statuses(challenge.getHistoryDailyChallenges() @@ -89,6 +93,7 @@ public ChallengeResponse getChallenge(Long userId) { .map(DailyChallenge::getStatus) .toList()) .todayIndex(todayIndex) + .startDate(formattedStartDate) .goalTime(challenge.getGoalTime()) .apps(challenge.getApps().stream() .map(app -> new AppGoalTimeResponse(app.getAppCode(), app.getGoalTime())).toList()) From 0b88979f401205d430d28e764a9bb7ed4c8a1a57 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E1=84=8B=E1=85=B5=E1=86=B7=E1=84=8C=E1=85=AE=E1=84=86?= =?UTF-8?q?=E1=85=B5=E1=86=AB?= Date: Mon, 20 May 2024 07:27:43 +0200 Subject: [PATCH 10/10] =?UTF-8?q?chore=20-=20#117=20toLocalDate=EC=99=80?= =?UTF-8?q?=20toString=20=EC=82=AC=EC=9A=A9=ED=95=B4=EC=84=9C=20=EC=8B=9C?= =?UTF-8?q?=EC=9E=91=EB=82=A0=EC=A7=9C=20=EB=B0=98=ED=99=98=ED=95=98?= =?UTF-8?q?=EA=B2=8C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/hmh/domain/challenge/service/ChallengeService.java | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/main/java/sopt/org/hmh/domain/challenge/service/ChallengeService.java b/src/main/java/sopt/org/hmh/domain/challenge/service/ChallengeService.java index be6b2be6..f05832e3 100644 --- a/src/main/java/sopt/org/hmh/domain/challenge/service/ChallengeService.java +++ b/src/main/java/sopt/org/hmh/domain/challenge/service/ChallengeService.java @@ -83,9 +83,6 @@ public ChallengeResponse getChallenge(Long userId) { Challenge challenge = findCurrentChallengeByUserId(userId); Integer todayIndex = calculateTodayIndex(challenge.getCreatedAt(), challenge.getPeriod()); - DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd"); - String formattedStartDate = challenge.getCreatedAt().format(formatter); - return ChallengeResponse.builder() .period(challenge.getPeriod()) .statuses(challenge.getHistoryDailyChallenges() @@ -93,7 +90,7 @@ public ChallengeResponse getChallenge(Long userId) { .map(DailyChallenge::getStatus) .toList()) .todayIndex(todayIndex) - .startDate(formattedStartDate) + .startDate(challenge.getCreatedAt().toLocalDate().toString()) .goalTime(challenge.getGoalTime()) .apps(challenge.getApps().stream() .map(app -> new AppGoalTimeResponse(app.getAppCode(), app.getGoalTime())).toList())