Merge pull request #183 from 8attery/feat/40-project

Fix(#171-project): 배터리 수준 조회 atStartOfDay() 추가
9uttery · May 25, 2023 · 37f7384 · 37f7384
2 parents 1ad65f2 + 4ded34c
commit 37f7384
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/main/java/com/_8attery/seesaw/domain/battery/BatteryRepository.java b/src/main/java/com/_8attery/seesaw/domain/battery/BatteryRepository.java
@@ -69,7 +69,7 @@ public interface BatteryRepository extends JpaRepository<Battery, Long> {
             "where b2.user.id=:userId " +
             "and b1.createdAt between :startDate and :endDate " +
             "order by b1.createdAt desc")
-    List<BatteryPercentResponseDto> findUserBatteryHistory(@Param("userId") Long userId, @Param("startDate") LocalDate startDate, @Param("endDate") LocalDate endDate);
+    List<BatteryPercentResponseDto> findUserBatteryHistory(@Param("userId") Long userId, @Param("startDate") LocalDateTime startDate, @Param("endDate") LocalDateTime endDate);
 
 
     // 배터리 증감 조회 (30일 증감 내역)

diff --git a/src/main/java/com/_8attery/seesaw/service/battery/BatteryService.java b/src/main/java/com/_8attery/seesaw/service/battery/BatteryService.java
@@ -109,8 +109,8 @@ public List<BatteryPercentResponseDto> getUserBatteryHistory(Long userId) throws
 //            LocalDateTime endDate = LocalDateTime.now();  // Current date and time
 //            LocalDateTime startDate = endDate.minusDays(7);  // 7 days ago
 
-            LocalDate endDate = LocalDate.now();  // Current date and time
-            LocalDate startDate = endDate.minusDays(7);  // 7 days ago
+            LocalDateTime endDate = LocalDate.now().atStartOfDay();  // Current date and time
+            LocalDateTime startDate = endDate.minusDays(7);  // 7 days ago
 
             return batteryRepository.findUserBatteryHistory(userId, startDate, endDate);