[Feature] Daily 탄소 소비 조회 기능

server/src/main/java/com/soopgyeol/api/controller/UserCarbonLogController.java

@@ -40,17 +40,7 @@ public ResponseEntity<ApiResponse<UserCarbonLogSummaryResponse>> getLogsByDate(
         return ResponseEntity.ok(new ApiResponse<>(true, "조회 성공", logs));
     }
 
-    @GetMapping("/daily/challenge")
-    public ResponseEntity<ApiResponse<UserCarbonLogSummaryResponse>> 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));
-    }
 
 
 }

server/src/main/java/com/soopgyeol/api/repository/UserCarbonLogRepository.java

@@ -13,7 +13,7 @@ public interface UserCarbonLogRepository extends JpaRepository<UserCarbonLog, Lo
 
     List<UserCarbonLog> findByUserIdAndRecordedAtBetween(Long userId, LocalDateTime start, LocalDateTime end);
 
-    List<UserCarbonLog> findByUserIdAndRecordedAtBetweenAndIsFromChallengeTrue(Long userId, LocalDateTime start,
+    List<UserCarbonLog> findByUserIdAndRecordedAtBetweenAndIsFromChallengeFalse(Long userId, LocalDateTime start,
             LocalDateTime end);
 
     void deleteByUserId(Long userId);

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);
+
 }

server/src/main/java/com/soopgyeol/api/service/carbonlog/UserCarbonLogServiceImpl.java

@@ -95,7 +95,7 @@ public UserCarbonLogSummaryResponse getLogsByUserIdAndDate(Long userId, LocalDat
 
 
 
-                List<UserCarbonLog> logs = carbonLogRepository.findByUserIdAndRecordedAtBetween(userId, startOfDay,
+                List<UserCarbonLog> 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<UserCarbonLog> logs = carbonLogRepository.findByUserIdAndRecordedAtBetweenAndIsFromChallengeTrue(
-                        userId, start, end
-                );
-
-                int totalGrowthPoint = logs.stream()
-                        .mapToInt(UserCarbonLog::getGrowthPoint)
-                        .sum();
-
-                List<UserCarbonLogResponse> logDtos = logs.stream()
-                        .map(log -> UserCarbonLogResponse.builder()
-                                .product(log.getCarbonItem().getName())
-                                .growthPoint(log.getGrowthPoint())
-                                .build())
-                        .toList();
-
-                return UserCarbonLogSummaryResponse.builder()
-                        .logs(logDtos)
-                        .totalGrowthPoint(totalGrowthPoint)
-                        .build();
-        }
 
 
 }

server/src/main/resources/application.yml

@@ -20,7 +20,7 @@ openai:
     key: ${OPENAI_API_KEY}
 
 server:
-  port: 8080
+  port: 3004
 
 oauth:
   google: