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/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/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(); 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..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,17 +8,19 @@ 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; 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/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/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..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 @@ -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") +@RequestMapping("/api/v1/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; 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] 단위 테스트")