From 3e25accaa3d6340dc22ddb9f50d578f0fce26afc Mon Sep 17 00:00:00 2001
From: Klaus <klaus@vividnext.co.kr>
Date: Tue, 11 Mar 2025 16:38:58 +0900
Subject: [PATCH] =?UTF-8?q?=EA=B4=80=EB=A6=AC=EC=9E=90=20=EB=A7=88?=
 =?UTF-8?q?=EC=BC=80=ED=8C=85=20-=20=EA=B4=91=EA=B3=A0=20=ED=86=B5?=
 =?UTF-8?q?=EA=B3=84=20-=20=EB=82=A0=EC=A7=9C=EB=B3=84=20=EA=B2=80?=
 =?UTF-8?q?=EC=83=89=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../statistics/AdminAdStatisticsController.kt       |  9 ++++++++-
 .../statistics/AdminAdStatisticsRepository.kt       | 11 ++++++++++-
 .../statistics/AdminAdStatisticsService.kt          | 13 +++++++++++--
 3 files changed, 29 insertions(+), 4 deletions(-)

diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/admin/marketing/statistics/AdminAdStatisticsController.kt b/src/main/kotlin/kr/co/vividnext/sodalive/admin/marketing/statistics/AdminAdStatisticsController.kt
index 1848592..6249319 100644
--- a/src/main/kotlin/kr/co/vividnext/sodalive/admin/marketing/statistics/AdminAdStatisticsController.kt
+++ b/src/main/kotlin/kr/co/vividnext/sodalive/admin/marketing/statistics/AdminAdStatisticsController.kt
@@ -5,6 +5,7 @@ import org.springframework.data.domain.Pageable
 import org.springframework.security.access.prepost.PreAuthorize
 import org.springframework.web.bind.annotation.GetMapping
 import org.springframework.web.bind.annotation.RequestMapping
+import org.springframework.web.bind.annotation.RequestParam
 import org.springframework.web.bind.annotation.RestController
 
 @RestController
@@ -12,8 +13,14 @@ import org.springframework.web.bind.annotation.RestController
 @RequestMapping("/admin/marketing/statistics")
 class AdminAdStatisticsController(private val service: AdminAdStatisticsService) {
     @GetMapping
-    fun getStatistics(pageable: Pageable) = ApiResponse.ok(
+    fun getStatistics(
+        @RequestParam startDateStr: String,
+        @RequestParam endDateStr: String,
+        pageable: Pageable
+    ) = ApiResponse.ok(
         service.getStatistics(
+            startDateStr = startDateStr,
+            endDateStr = endDateStr,
             offset = pageable.offset,
             limit = pageable.pageSize.toLong()
         )
diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/admin/marketing/statistics/AdminAdStatisticsRepository.kt b/src/main/kotlin/kr/co/vividnext/sodalive/admin/marketing/statistics/AdminAdStatisticsRepository.kt
index 98985c7..cd7f46c 100644
--- a/src/main/kotlin/kr/co/vividnext/sodalive/admin/marketing/statistics/AdminAdStatisticsRepository.kt
+++ b/src/main/kotlin/kr/co/vividnext/sodalive/admin/marketing/statistics/AdminAdStatisticsRepository.kt
@@ -28,7 +28,12 @@ class AdminAdStatisticsRepository(private val queryFactory: JPAQueryFactory) {
             ).toInt()
     }
 
-    fun getAdStatisticsDataList(offset: Long, limit: Long): List<GetAdminAdStatisticsItem> {
+    fun getAdStatisticsDataList(
+        startDate: LocalDateTime,
+        endDate: LocalDateTime,
+        offset: Long,
+        limit: Long
+    ): List<GetAdminAdStatisticsItem> {
         val signUpCount = CaseBuilder()
             .`when`(adTrackingHistory.id.type.eq(AdTrackingHistoryType.SIGNUP))
             .then(1)
@@ -101,6 +106,10 @@ class AdminAdStatisticsRepository(private val queryFactory: JPAQueryFactory) {
                 )
             )
             .from(adTrackingHistory)
+            .where(
+                adTrackingHistory.id.createdAt.goe(startDate),
+                adTrackingHistory.id.createdAt.loe(endDate)
+            )
             .groupBy(
                 getFormattedDate(adTrackingHistory.id.createdAt),
                 adTrackingHistory.mediaGroup,
diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/admin/marketing/statistics/AdminAdStatisticsService.kt b/src/main/kotlin/kr/co/vividnext/sodalive/admin/marketing/statistics/AdminAdStatisticsService.kt
index 6e1bb5c..262272d 100644
--- a/src/main/kotlin/kr/co/vividnext/sodalive/admin/marketing/statistics/AdminAdStatisticsService.kt
+++ b/src/main/kotlin/kr/co/vividnext/sodalive/admin/marketing/statistics/AdminAdStatisticsService.kt
@@ -1,14 +1,23 @@
 package kr.co.vividnext.sodalive.admin.marketing.statistics
 
+import kr.co.vividnext.sodalive.extensions.convertLocalDateTime
 import org.springframework.stereotype.Service
 
 @Service
 class AdminAdStatisticsService(
     private val repository: AdminAdStatisticsRepository
 ) {
-    fun getStatistics(offset: Long, limit: Long): GetAdminAdStatisticsResponse {
+    fun getStatistics(
+        startDateStr: String,
+        endDateStr: String,
+        offset: Long,
+        limit: Long
+    ): GetAdminAdStatisticsResponse {
+        val startDate = startDateStr.convertLocalDateTime()
+        val endDate = endDateStr.convertLocalDateTime(hour = 23, minute = 59, second = 59)
+
         val totalCount = repository.getAdStatisticsDataTotalCount()
-        val items = repository.getAdStatisticsDataList(offset, limit)
+        val items = repository.getAdStatisticsDataList(startDate, endDate, offset, limit)
 
         return GetAdminAdStatisticsResponse(
             totalCount = totalCount,