From fb1d648fe2f421bd2db5e8cba61e1addd1a0b4c1 Mon Sep 17 00:00:00 2001 From: minsub Date: Mon, 7 Jul 2025 00:42:58 +0900 Subject: [PATCH] =?UTF-8?q?refactor:=20=EA=B8=B0=EB=B3=B8=20=ED=83=84?= =?UTF-8?q?=EC=86=8C=20=EA=B2=80=EC=83=89=EB=A7=8C=20=EB=B0=98=ED=99=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/UserCarbonLogController.java | 10 -------- .../repository/UserCarbonLogRepository.java | 2 +- .../carbonlog/UserCarbonLogService.java | 3 +-- .../carbonlog/UserCarbonLogServiceImpl.java | 25 +------------------ server/src/main/resources/application.yml | 2 +- 5 files changed, 4 insertions(+), 38 deletions(-) diff --git a/server/src/main/java/com/soopgyeol/api/controller/UserCarbonLogController.java b/server/src/main/java/com/soopgyeol/api/controller/UserCarbonLogController.java index ed6a678..2f79b0e 100644 --- a/server/src/main/java/com/soopgyeol/api/controller/UserCarbonLogController.java +++ b/server/src/main/java/com/soopgyeol/api/controller/UserCarbonLogController.java @@ -40,17 +40,7 @@ public ResponseEntity> getLogsByDate( return ResponseEntity.ok(new ApiResponse<>(true, "조회 성공", logs)); } - @GetMapping("/daily/challenge") - public ResponseEntity> getChallengeLogsByDate( - @AuthenticationPrincipal CustomUserDetails userDetails, - @RequestParam @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate date) { - UserCarbonLogSummaryResponse summaryResponse = userCarbonLogService.getChallengeLogsByUserIdAndDate( - userDetails.getUserId(), date - ); - - return ResponseEntity.ok(new ApiResponse<>(true, "챌린지 탄소 활동 조회 성공", summaryResponse)); - } } diff --git a/server/src/main/java/com/soopgyeol/api/repository/UserCarbonLogRepository.java b/server/src/main/java/com/soopgyeol/api/repository/UserCarbonLogRepository.java index c5dc5f1..21cd98a 100644 --- a/server/src/main/java/com/soopgyeol/api/repository/UserCarbonLogRepository.java +++ b/server/src/main/java/com/soopgyeol/api/repository/UserCarbonLogRepository.java @@ -13,7 +13,7 @@ public interface UserCarbonLogRepository extends JpaRepository findByUserIdAndRecordedAtBetween(Long userId, LocalDateTime start, LocalDateTime end); - List findByUserIdAndRecordedAtBetweenAndIsFromChallengeTrue(Long userId, LocalDateTime start, + List findByUserIdAndRecordedAtBetweenAndIsFromChallengeFalse(Long userId, LocalDateTime start, LocalDateTime end); void deleteByUserId(Long userId); diff --git a/server/src/main/java/com/soopgyeol/api/service/carbonlog/UserCarbonLogService.java b/server/src/main/java/com/soopgyeol/api/service/carbonlog/UserCarbonLogService.java index 4a79766..6d0a40f 100644 --- a/server/src/main/java/com/soopgyeol/api/service/carbonlog/UserCarbonLogService.java +++ b/server/src/main/java/com/soopgyeol/api/service/carbonlog/UserCarbonLogService.java @@ -12,6 +12,5 @@ public interface UserCarbonLogService { UserCarbonLogSummaryResponse getLogsByUserIdAndDate(Long userId, LocalDate date); - // 챌린지 로그만 조회 - UserCarbonLogSummaryResponse getChallengeLogsByUserIdAndDate(Long userId, LocalDate date); + } diff --git a/server/src/main/java/com/soopgyeol/api/service/carbonlog/UserCarbonLogServiceImpl.java b/server/src/main/java/com/soopgyeol/api/service/carbonlog/UserCarbonLogServiceImpl.java index 7f951a5..ef12dd8 100644 --- a/server/src/main/java/com/soopgyeol/api/service/carbonlog/UserCarbonLogServiceImpl.java +++ b/server/src/main/java/com/soopgyeol/api/service/carbonlog/UserCarbonLogServiceImpl.java @@ -95,7 +95,7 @@ public UserCarbonLogSummaryResponse getLogsByUserIdAndDate(Long userId, LocalDat - List logs = carbonLogRepository.findByUserIdAndRecordedAtBetween(userId, startOfDay, + List logs = carbonLogRepository.findByUserIdAndRecordedAtBetweenAndIsFromChallengeFalse(userId, startOfDay, endOfDay); int totalGrowthPoint = logs.stream() @@ -115,30 +115,7 @@ public UserCarbonLogSummaryResponse getLogsByUserIdAndDate(Long userId, LocalDat .build(); } - public UserCarbonLogSummaryResponse getChallengeLogsByUserIdAndDate(Long userId, LocalDate date) { - LocalDateTime start = date.atStartOfDay(); - LocalDateTime end = date.atTime(LocalTime.MAX); - List logs = carbonLogRepository.findByUserIdAndRecordedAtBetweenAndIsFromChallengeTrue( - userId, start, end - ); - - int totalGrowthPoint = logs.stream() - .mapToInt(UserCarbonLog::getGrowthPoint) - .sum(); - - List logDtos = logs.stream() - .map(log -> UserCarbonLogResponse.builder() - .product(log.getCarbonItem().getName()) - .growthPoint(log.getGrowthPoint()) - .build()) - .toList(); - - return UserCarbonLogSummaryResponse.builder() - .logs(logDtos) - .totalGrowthPoint(totalGrowthPoint) - .build(); - } } diff --git a/server/src/main/resources/application.yml b/server/src/main/resources/application.yml index a599472..784e4ee 100644 --- a/server/src/main/resources/application.yml +++ b/server/src/main/resources/application.yml @@ -20,7 +20,7 @@ openai: key: ${OPENAI_API_KEY} server: - port: 8080 + port: 3004 oauth: google: