From 932d18345ce86d672cd140dcdf89066d0d440d3d Mon Sep 17 00:00:00 2001 From: kang Date: Sat, 30 Nov 2024 22:45:04 +0900 Subject: [PATCH 1/2] chore: update yml --- Donut-Server-yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Donut-Server-yml b/Donut-Server-yml index ec430df..e3dd671 160000 --- a/Donut-Server-yml +++ b/Donut-Server-yml @@ -1 +1 @@ -Subproject commit ec430df423b5cd1201bf0906a759be7fcdd2549e +Subproject commit e3dd6719b7f4f32d9b242942fad3c7a9f25239ae From bd36a6d7c0672c35d3c503dba07a7b608621b367 Mon Sep 17 00:00:00 2001 From: kang Date: Sat, 30 Nov 2024 22:51:56 +0900 Subject: [PATCH 2/2] fix: improve product query logic with updated date range --- src/main/java/zero/eight/donut/service/HistoryGiverService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/zero/eight/donut/service/HistoryGiverService.java b/src/main/java/zero/eight/donut/service/HistoryGiverService.java index 2241ec0..2aa37ba 100644 --- a/src/main/java/zero/eight/donut/service/HistoryGiverService.java +++ b/src/main/java/zero/eight/donut/service/HistoryGiverService.java @@ -57,7 +57,7 @@ public ApiResponse getDonationList(LocalDateTime donateDate){ //한달 간 기부한 gift 목록 조회 YearMonth yearMonth = YearMonth.from(donateDate); - List giftList = giftRepository.findAllByGiverIdAndCreatedAtBetween(giver.getId(), donateDate, yearMonth.atEndOfMonth().atStartOfDay()); + List giftList = giftRepository.findAllByGiverIdAndCreatedAtBetween(giver.getId(), donateDate, yearMonth.atEndOfMonth().atTime(23, 59, 59, 999999999)); Long unreceived = 0L, received = 0L, msg = 0L; List donationList = new ArrayList<>();