From cbe631579d3ff07aef926fb50ee77c7f97a488c0 Mon Sep 17 00:00:00 2001 From: pywoo Date: Thu, 31 Jul 2025 17:46:10 +0900 Subject: [PATCH 1/5] =?UTF-8?q?=F0=9F=90=9B=20fix:=20LocalDateTime?= =?UTF-8?q?=EC=9C=BC=EB=A1=9C=20=ED=83=80=EC=9E=85=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/date/repository/DateCourseRepository.java | 3 ++- .../service/query/DateCourseLogQueryServiceImpl.java | 6 +++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/withtime/be/withtimebe/domain/date/repository/DateCourseRepository.java b/src/main/java/org/withtime/be/withtimebe/domain/date/repository/DateCourseRepository.java index adeb353..dbef02c 100644 --- a/src/main/java/org/withtime/be/withtimebe/domain/date/repository/DateCourseRepository.java +++ b/src/main/java/org/withtime/be/withtimebe/domain/date/repository/DateCourseRepository.java @@ -1,11 +1,12 @@ package org.withtime.be.withtimebe.domain.date.repository; import java.time.LocalDate; +import java.time.LocalDateTime; import org.springframework.data.jpa.repository.JpaRepository; import org.withtime.be.withtimebe.domain.date.entity.DateCourse; public interface DateCourseRepository extends JpaRepository { - Long countByCreatedAtBetween(LocalDate startTime, LocalDate endTime); + Long countByCreatedAtBetween(LocalDateTime startTime, LocalDateTime endTime); Long countByMemberId(Long memberId); } diff --git a/src/main/java/org/withtime/be/withtimebe/domain/log/datecourselog/service/query/DateCourseLogQueryServiceImpl.java b/src/main/java/org/withtime/be/withtimebe/domain/log/datecourselog/service/query/DateCourseLogQueryServiceImpl.java index a721d4f..2be0400 100644 --- a/src/main/java/org/withtime/be/withtimebe/domain/log/datecourselog/service/query/DateCourseLogQueryServiceImpl.java +++ b/src/main/java/org/withtime/be/withtimebe/domain/log/datecourselog/service/query/DateCourseLogQueryServiceImpl.java @@ -1,6 +1,7 @@ package org.withtime.be.withtimebe.domain.log.datecourselog.service.query; import java.time.LocalDate; +import java.time.LocalDateTime; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -29,7 +30,10 @@ public DateCourseLogResponseDTO.FindAverageDateCourseCount findAverageDateCourse LocalDate oneMonthAgo = now.minusDays(30); // 최근 1개월동안 생성된 데이트 코스 - Long dateCourseCount = dateCourseRepository.countByCreatedAtBetween(oneMonthAgo, now); + Long dateCourseCount = dateCourseRepository.countByCreatedAtBetween( + oneMonthAgo.atStartOfDay(), + now.plusDays(1).atStartOfDay() + ); // 전체 멤버 수 Long memberCount = memberRepository.count(); From ba61c1bbe79b78d1aa161f837eb7e274a3489092 Mon Sep 17 00:00:00 2001 From: pywoo Date: Thu, 31 Jul 2025 17:51:08 +0900 Subject: [PATCH 2/5] =?UTF-8?q?=F0=9F=9A=80=20chore:=20=EC=8A=A4=EC=9B=A8?= =?UTF-8?q?=EA=B1=B0=20Tag=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../withtimebe/domain/faq/controller/FaqCommandController.java | 2 ++ .../be/withtimebe/domain/faq/controller/FaqQueryController.java | 2 ++ .../datecourselog/controller/DateCourseLogQueryController.java | 2 ++ .../dateplacelog/controller/DatePlaceLogQueryController.java | 2 ++ .../controller/PlaceCategoryLogQueryController.java | 2 ++ .../notice/controller/command/NoticeCommandController.java | 2 ++ .../domain/notice/controller/query/NoticeQueryController.java | 2 ++ 7 files changed, 14 insertions(+) diff --git a/src/main/java/org/withtime/be/withtimebe/domain/faq/controller/FaqCommandController.java b/src/main/java/org/withtime/be/withtimebe/domain/faq/controller/FaqCommandController.java index 6d5495f..4cb5a6c 100644 --- a/src/main/java/org/withtime/be/withtimebe/domain/faq/controller/FaqCommandController.java +++ b/src/main/java/org/withtime/be/withtimebe/domain/faq/controller/FaqCommandController.java @@ -20,12 +20,14 @@ import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.responses.ApiResponse; import io.swagger.v3.oas.annotations.responses.ApiResponses; +import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.validation.Valid; import lombok.AllArgsConstructor; @RestController @AllArgsConstructor @RequestMapping("/api/v1/faqs") +@Tag(name = "자주 묻는 질문 수정 관련 API") public class FaqCommandController { private final FaqCommandService faqCommandService; diff --git a/src/main/java/org/withtime/be/withtimebe/domain/faq/controller/FaqQueryController.java b/src/main/java/org/withtime/be/withtimebe/domain/faq/controller/FaqQueryController.java index e16b5ec..214fd0e 100644 --- a/src/main/java/org/withtime/be/withtimebe/domain/faq/controller/FaqQueryController.java +++ b/src/main/java/org/withtime/be/withtimebe/domain/faq/controller/FaqQueryController.java @@ -20,11 +20,13 @@ import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.responses.ApiResponse; import io.swagger.v3.oas.annotations.responses.ApiResponses; +import io.swagger.v3.oas.annotations.tags.Tag; import lombok.AllArgsConstructor; @RestController @AllArgsConstructor @RequestMapping("/api/v1/faqs") +@Tag(name = "자주 묻는 질문 조회 관련 API") public class FaqQueryController { private final FaqQueryService faqQueryService; diff --git a/src/main/java/org/withtime/be/withtimebe/domain/log/datecourselog/controller/DateCourseLogQueryController.java b/src/main/java/org/withtime/be/withtimebe/domain/log/datecourselog/controller/DateCourseLogQueryController.java index 9656523..2d692d3 100644 --- a/src/main/java/org/withtime/be/withtimebe/domain/log/datecourselog/controller/DateCourseLogQueryController.java +++ b/src/main/java/org/withtime/be/withtimebe/domain/log/datecourselog/controller/DateCourseLogQueryController.java @@ -13,11 +13,13 @@ import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.responses.ApiResponse; import io.swagger.v3.oas.annotations.responses.ApiResponses; +import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; @RestController @RequiredArgsConstructor @RequestMapping("/api/v1/logs/datecourses") +@Tag(name = "데이트 코스 통계 관련 API") public class DateCourseLogQueryController { private final DateCourseLogQueryService dateCourseLogQueryService; diff --git a/src/main/java/org/withtime/be/withtimebe/domain/log/dateplacelog/controller/DatePlaceLogQueryController.java b/src/main/java/org/withtime/be/withtimebe/domain/log/dateplacelog/controller/DatePlaceLogQueryController.java index c3a1c1d..f1ec109 100644 --- a/src/main/java/org/withtime/be/withtimebe/domain/log/dateplacelog/controller/DatePlaceLogQueryController.java +++ b/src/main/java/org/withtime/be/withtimebe/domain/log/dateplacelog/controller/DatePlaceLogQueryController.java @@ -14,11 +14,13 @@ import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.responses.ApiResponse; import io.swagger.v3.oas.annotations.responses.ApiResponses; +import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; @RestController @RequiredArgsConstructor @RequestMapping("/api/v1/logs/dateplaces") +@Tag(name = "데이트 장소 통계 관련 API") public class DatePlaceLogQueryController { private final DatePlaceLogQueryService datePlaceLogQueryService; diff --git a/src/main/java/org/withtime/be/withtimebe/domain/log/placecategorylog/controller/PlaceCategoryLogQueryController.java b/src/main/java/org/withtime/be/withtimebe/domain/log/placecategorylog/controller/PlaceCategoryLogQueryController.java index f3435a5..53356ed 100644 --- a/src/main/java/org/withtime/be/withtimebe/domain/log/placecategorylog/controller/PlaceCategoryLogQueryController.java +++ b/src/main/java/org/withtime/be/withtimebe/domain/log/placecategorylog/controller/PlaceCategoryLogQueryController.java @@ -14,11 +14,13 @@ import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.responses.ApiResponse; import io.swagger.v3.oas.annotations.responses.ApiResponses; +import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; @RestController @RequiredArgsConstructor @RequestMapping("/api/v1/logs/keyword") +@Tag(name = "키워드 통계 관련 API") public class PlaceCategoryLogQueryController { private final PlaceCategoryLogQueryService placeCategoryLogQueryService; diff --git a/src/main/java/org/withtime/be/withtimebe/domain/notice/controller/command/NoticeCommandController.java b/src/main/java/org/withtime/be/withtimebe/domain/notice/controller/command/NoticeCommandController.java index 0a7d641..d498134 100644 --- a/src/main/java/org/withtime/be/withtimebe/domain/notice/controller/command/NoticeCommandController.java +++ b/src/main/java/org/withtime/be/withtimebe/domain/notice/controller/command/NoticeCommandController.java @@ -21,12 +21,14 @@ import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.responses.ApiResponse; import io.swagger.v3.oas.annotations.responses.ApiResponses; +import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.validation.Valid; import lombok.RequiredArgsConstructor; @RestController @RequiredArgsConstructor @RequestMapping("/api/v1/admin/notices") +@Tag(name = "공지사항 수정 관련 API") public class NoticeCommandController { private final NoticeCommandService noticeCommandService; diff --git a/src/main/java/org/withtime/be/withtimebe/domain/notice/controller/query/NoticeQueryController.java b/src/main/java/org/withtime/be/withtimebe/domain/notice/controller/query/NoticeQueryController.java index 3cae7be..52329e3 100644 --- a/src/main/java/org/withtime/be/withtimebe/domain/notice/controller/query/NoticeQueryController.java +++ b/src/main/java/org/withtime/be/withtimebe/domain/notice/controller/query/NoticeQueryController.java @@ -25,11 +25,13 @@ import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.responses.ApiResponse; import io.swagger.v3.oas.annotations.responses.ApiResponses; +import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; @RestController @RequiredArgsConstructor @RequestMapping("/api/v1/notices") +@Tag(name = "공지사항 조회 관련 API") public class NoticeQueryController { private final NoticeQueryService noticeQueryService; From 6db90e401259f0be4bcb34094580d75a9816fc21 Mon Sep 17 00:00:00 2001 From: pywoo Date: Thu, 31 Jul 2025 17:57:03 +0900 Subject: [PATCH 3/5] =?UTF-8?q?=F0=9F=90=9B=20fix:=20=EC=97=94=EB=93=9C?= =?UTF-8?q?=ED=8F=AC=EC=9D=B8=ED=8A=B8=20=EC=98=A4=EB=A5=98=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../notice/controller/command/NoticeCommandController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/withtime/be/withtimebe/domain/notice/controller/command/NoticeCommandController.java b/src/main/java/org/withtime/be/withtimebe/domain/notice/controller/command/NoticeCommandController.java index d498134..1765dc3 100644 --- a/src/main/java/org/withtime/be/withtimebe/domain/notice/controller/command/NoticeCommandController.java +++ b/src/main/java/org/withtime/be/withtimebe/domain/notice/controller/command/NoticeCommandController.java @@ -27,7 +27,7 @@ @RestController @RequiredArgsConstructor -@RequestMapping("/api/v1/admin/notices") +@RequestMapping("/api/v1/notices") @Tag(name = "공지사항 수정 관련 API") public class NoticeCommandController { From 123484a4b751b8f34b322efa7e2fc87548cd4020 Mon Sep 17 00:00:00 2001 From: pywoo Date: Fri, 1 Aug 2025 01:14:11 +0900 Subject: [PATCH 4/5] =?UTF-8?q?=F0=9F=90=9B=20fix:=20=ED=8C=A8=ED=82=A4?= =?UTF-8?q?=EC=A7=80=EB=AA=85=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dateplacelog/controller/DatePlaceLogQueryController.java | 2 +- .../log/dateplacelog/converter/DatePlaceLogConverter.java | 3 +-- .../log/dateplacelog/{entity => model}/DatePlaceLog.java | 2 +- .../log/dateplacelog/repository/DatePlaceLogRepository.java | 2 +- .../log/dateplacelog/scheduler/DatePlaceLogScheduler.java | 2 +- .../dateplacelog/service/query/DatePlaceLogQueryService.java | 2 +- .../service/query/DatePlaceLogQueryServiceImpl.java | 2 +- .../service/query/PlaceCategoryLogQueryServiceImpl.java | 5 +++-- .../service/query/DatePlaceLogQueryServiceImplTest.java | 3 +-- 9 files changed, 11 insertions(+), 12 deletions(-) rename src/main/java/org/withtime/be/withtimebe/domain/log/dateplacelog/{entity => model}/DatePlaceLog.java (90%) diff --git a/src/main/java/org/withtime/be/withtimebe/domain/log/dateplacelog/controller/DatePlaceLogQueryController.java b/src/main/java/org/withtime/be/withtimebe/domain/log/dateplacelog/controller/DatePlaceLogQueryController.java index f1ec109..85f2b2d 100644 --- a/src/main/java/org/withtime/be/withtimebe/domain/log/dateplacelog/controller/DatePlaceLogQueryController.java +++ b/src/main/java/org/withtime/be/withtimebe/domain/log/dateplacelog/controller/DatePlaceLogQueryController.java @@ -8,7 +8,7 @@ import org.springframework.web.bind.annotation.RestController; import org.withtime.be.withtimebe.domain.log.dateplacelog.converter.DatePlaceLogConverter; import org.withtime.be.withtimebe.domain.log.dateplacelog.dto.DatePlaceLogResponseDTO; -import org.withtime.be.withtimebe.domain.log.dateplacelog.entity.DatePlaceLog; +import org.withtime.be.withtimebe.domain.log.dateplacelog.model.DatePlaceLog; import org.withtime.be.withtimebe.domain.log.dateplacelog.service.query.DatePlaceLogQueryService; import io.swagger.v3.oas.annotations.Operation; diff --git a/src/main/java/org/withtime/be/withtimebe/domain/log/dateplacelog/converter/DatePlaceLogConverter.java b/src/main/java/org/withtime/be/withtimebe/domain/log/dateplacelog/converter/DatePlaceLogConverter.java index 046ada7..b20806f 100644 --- a/src/main/java/org/withtime/be/withtimebe/domain/log/dateplacelog/converter/DatePlaceLogConverter.java +++ b/src/main/java/org/withtime/be/withtimebe/domain/log/dateplacelog/converter/DatePlaceLogConverter.java @@ -1,11 +1,10 @@ package org.withtime.be.withtimebe.domain.log.dateplacelog.converter; import java.time.LocalDate; -import java.time.LocalTime; import java.util.List; import org.withtime.be.withtimebe.domain.log.dateplacelog.dto.DatePlaceLogResponseDTO; -import org.withtime.be.withtimebe.domain.log.dateplacelog.entity.DatePlaceLog; +import org.withtime.be.withtimebe.domain.log.dateplacelog.model.DatePlaceLog; public class DatePlaceLogConverter { diff --git a/src/main/java/org/withtime/be/withtimebe/domain/log/dateplacelog/entity/DatePlaceLog.java b/src/main/java/org/withtime/be/withtimebe/domain/log/dateplacelog/model/DatePlaceLog.java similarity index 90% rename from src/main/java/org/withtime/be/withtimebe/domain/log/dateplacelog/entity/DatePlaceLog.java rename to src/main/java/org/withtime/be/withtimebe/domain/log/dateplacelog/model/DatePlaceLog.java index c18530a..2ae50c3 100644 --- a/src/main/java/org/withtime/be/withtimebe/domain/log/dateplacelog/entity/DatePlaceLog.java +++ b/src/main/java/org/withtime/be/withtimebe/domain/log/dateplacelog/model/DatePlaceLog.java @@ -1,4 +1,4 @@ -package org.withtime.be.withtimebe.domain.log.dateplacelog.entity; +package org.withtime.be.withtimebe.domain.log.dateplacelog.model; import java.time.LocalDate; diff --git a/src/main/java/org/withtime/be/withtimebe/domain/log/dateplacelog/repository/DatePlaceLogRepository.java b/src/main/java/org/withtime/be/withtimebe/domain/log/dateplacelog/repository/DatePlaceLogRepository.java index ca92174..acef037 100644 --- a/src/main/java/org/withtime/be/withtimebe/domain/log/dateplacelog/repository/DatePlaceLogRepository.java +++ b/src/main/java/org/withtime/be/withtimebe/domain/log/dateplacelog/repository/DatePlaceLogRepository.java @@ -1,7 +1,7 @@ package org.withtime.be.withtimebe.domain.log.dateplacelog.repository; import org.springframework.data.mongodb.repository.MongoRepository; -import org.withtime.be.withtimebe.domain.log.dateplacelog.entity.DatePlaceLog; +import org.withtime.be.withtimebe.domain.log.dateplacelog.model.DatePlaceLog; public interface DatePlaceLogRepository extends MongoRepository { } diff --git a/src/main/java/org/withtime/be/withtimebe/domain/log/dateplacelog/scheduler/DatePlaceLogScheduler.java b/src/main/java/org/withtime/be/withtimebe/domain/log/dateplacelog/scheduler/DatePlaceLogScheduler.java index 75911f1..3982543 100644 --- a/src/main/java/org/withtime/be/withtimebe/domain/log/dateplacelog/scheduler/DatePlaceLogScheduler.java +++ b/src/main/java/org/withtime/be/withtimebe/domain/log/dateplacelog/scheduler/DatePlaceLogScheduler.java @@ -9,7 +9,7 @@ import org.springframework.transaction.annotation.Transactional; import org.withtime.be.withtimebe.domain.date.repository.DatePlaceRepository; import org.withtime.be.withtimebe.domain.log.dateplacelog.converter.DatePlaceLogConverter; -import org.withtime.be.withtimebe.domain.log.dateplacelog.entity.DatePlaceLog; +import org.withtime.be.withtimebe.domain.log.dateplacelog.model.DatePlaceLog; import org.withtime.be.withtimebe.domain.log.dateplacelog.repository.DatePlaceLogRepository; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/org/withtime/be/withtimebe/domain/log/dateplacelog/service/query/DatePlaceLogQueryService.java b/src/main/java/org/withtime/be/withtimebe/domain/log/dateplacelog/service/query/DatePlaceLogQueryService.java index 80d1f8e..24d82ef 100644 --- a/src/main/java/org/withtime/be/withtimebe/domain/log/dateplacelog/service/query/DatePlaceLogQueryService.java +++ b/src/main/java/org/withtime/be/withtimebe/domain/log/dateplacelog/service/query/DatePlaceLogQueryService.java @@ -2,7 +2,7 @@ import java.util.List; -import org.withtime.be.withtimebe.domain.log.dateplacelog.entity.DatePlaceLog; +import org.withtime.be.withtimebe.domain.log.dateplacelog.model.DatePlaceLog; public interface DatePlaceLogQueryService { List findMonthlyDatePlaceLogList(); diff --git a/src/main/java/org/withtime/be/withtimebe/domain/log/dateplacelog/service/query/DatePlaceLogQueryServiceImpl.java b/src/main/java/org/withtime/be/withtimebe/domain/log/dateplacelog/service/query/DatePlaceLogQueryServiceImpl.java index 372fa40..5cab6d5 100644 --- a/src/main/java/org/withtime/be/withtimebe/domain/log/dateplacelog/service/query/DatePlaceLogQueryServiceImpl.java +++ b/src/main/java/org/withtime/be/withtimebe/domain/log/dateplacelog/service/query/DatePlaceLogQueryServiceImpl.java @@ -11,7 +11,7 @@ import org.springframework.data.mongodb.core.aggregation.SortOperation; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import org.withtime.be.withtimebe.domain.log.dateplacelog.entity.DatePlaceLog; +import org.withtime.be.withtimebe.domain.log.dateplacelog.model.DatePlaceLog; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/org/withtime/be/withtimebe/domain/log/placecategorylog/service/query/PlaceCategoryLogQueryServiceImpl.java b/src/main/java/org/withtime/be/withtimebe/domain/log/placecategorylog/service/query/PlaceCategoryLogQueryServiceImpl.java index 88a4f4b..ee77aae 100644 --- a/src/main/java/org/withtime/be/withtimebe/domain/log/placecategorylog/service/query/PlaceCategoryLogQueryServiceImpl.java +++ b/src/main/java/org/withtime/be/withtimebe/domain/log/placecategorylog/service/query/PlaceCategoryLogQueryServiceImpl.java @@ -2,6 +2,7 @@ import java.time.DayOfWeek; import java.time.LocalDate; +import java.time.temporal.TemporalAdjusters; import java.util.List; import org.springframework.stereotype.Service; @@ -23,8 +24,8 @@ public List findWeeklyPlaceCategoryLogList() { LocalDate now = LocalDate.now(); - LocalDate startOfWeek = now.with(DayOfWeek.MONDAY); - LocalDate endOfWeek = now.with(DayOfWeek.SUNDAY); + LocalDate startOfWeek = now.with(TemporalAdjusters.previousOrSame(DayOfWeek.MONDAY)); + LocalDate endOfWeek = now.with(TemporalAdjusters.nextOrSame(DayOfWeek.SUNDAY)); return placeCategoryLogRepository.findByDateBetween(startOfWeek, endOfWeek); } diff --git a/src/test/java/org/withtime/be/withtimebe/domain/log/dateplacelog/service/query/DatePlaceLogQueryServiceImplTest.java b/src/test/java/org/withtime/be/withtimebe/domain/log/dateplacelog/service/query/DatePlaceLogQueryServiceImplTest.java index 42bdadd..9423091 100644 --- a/src/test/java/org/withtime/be/withtimebe/domain/log/dateplacelog/service/query/DatePlaceLogQueryServiceImplTest.java +++ b/src/test/java/org/withtime/be/withtimebe/domain/log/dateplacelog/service/query/DatePlaceLogQueryServiceImplTest.java @@ -1,7 +1,6 @@ package org.withtime.be.withtimebe.domain.log.dateplacelog.service.query; import static org.assertj.core.api.Assertions.*; -import static org.junit.jupiter.api.Assertions.*; import static org.mockito.ArgumentMatchers.*; import static org.mockito.BDDMockito.*; @@ -19,7 +18,7 @@ import org.springframework.data.mongodb.core.MongoTemplate; import org.springframework.data.mongodb.core.aggregation.Aggregation; import org.springframework.data.mongodb.core.aggregation.AggregationResults; -import org.withtime.be.withtimebe.domain.log.dateplacelog.entity.DatePlaceLog; +import org.withtime.be.withtimebe.domain.log.dateplacelog.model.DatePlaceLog; @ExtendWith(MockitoExtension.class) @DisplayName("[DatePlaceLogQueryService] 단위 테스트") From 41355e8a8b7ddf2f8137ff6036ae8f372759c59d Mon Sep 17 00:00:00 2001 From: pywoo Date: Fri, 1 Aug 2025 01:15:53 +0900 Subject: [PATCH 5/5] =?UTF-8?q?=F0=9F=90=9B=20fix:=20=EC=BD=94=EB=93=9C=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/query/PlaceCategoryLogQueryServiceImpl.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/withtime/be/withtimebe/domain/log/placecategorylog/service/query/PlaceCategoryLogQueryServiceImpl.java b/src/main/java/org/withtime/be/withtimebe/domain/log/placecategorylog/service/query/PlaceCategoryLogQueryServiceImpl.java index ee77aae..88a4f4b 100644 --- a/src/main/java/org/withtime/be/withtimebe/domain/log/placecategorylog/service/query/PlaceCategoryLogQueryServiceImpl.java +++ b/src/main/java/org/withtime/be/withtimebe/domain/log/placecategorylog/service/query/PlaceCategoryLogQueryServiceImpl.java @@ -2,7 +2,6 @@ import java.time.DayOfWeek; import java.time.LocalDate; -import java.time.temporal.TemporalAdjusters; import java.util.List; import org.springframework.stereotype.Service; @@ -24,8 +23,8 @@ public List findWeeklyPlaceCategoryLogList() { LocalDate now = LocalDate.now(); - LocalDate startOfWeek = now.with(TemporalAdjusters.previousOrSame(DayOfWeek.MONDAY)); - LocalDate endOfWeek = now.with(TemporalAdjusters.nextOrSame(DayOfWeek.SUNDAY)); + LocalDate startOfWeek = now.with(DayOfWeek.MONDAY); + LocalDate endOfWeek = now.with(DayOfWeek.SUNDAY); return placeCategoryLogRepository.findByDateBetween(startOfWeek, endOfWeek); }