From 5708f4f059dcd3f412998ad22fd2d2901bcf5a8f Mon Sep 17 00:00:00 2001
From: Klaus <klaus@vividnext.co.kr>
Date: Mon, 17 Mar 2025 14:39:01 +0900
Subject: [PATCH] =?UTF-8?q?=EA=B4=80=EB=A6=AC=EC=9E=90=20=EA=B4=91?=
 =?UTF-8?q?=EA=B3=A0=ED=86=B5=EA=B3=84,=20=EC=9D=BC=EB=B3=84=20=EC=A0=84?=
 =?UTF-8?q?=EC=B2=B4=20=ED=9A=8C=EC=9B=90=20=EC=88=98=20-=20=EB=82=A0?=
 =?UTF-8?q?=EC=A7=9C=20=EB=82=B4=EB=A6=BC=EC=B0=A8=EC=88=9C=EC=9C=BC?=
 =?UTF-8?q?=EB=A1=9C=20=EC=A0=95=EB=A0=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../admin/statistics/ad/AdminAdStatisticsRepository.kt | 10 +++++++++-
 .../member/AdminMemberStatisticsRepository.kt          |  6 +++---
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/admin/statistics/ad/AdminAdStatisticsRepository.kt b/src/main/kotlin/kr/co/vividnext/sodalive/admin/statistics/ad/AdminAdStatisticsRepository.kt
index 143777b..750a3ab 100644
--- a/src/main/kotlin/kr/co/vividnext/sodalive/admin/statistics/ad/AdminAdStatisticsRepository.kt
+++ b/src/main/kotlin/kr/co/vividnext/sodalive/admin/statistics/ad/AdminAdStatisticsRepository.kt
@@ -13,10 +13,17 @@ import java.time.LocalDateTime
 
 @Repository
 class AdminAdStatisticsRepository(private val queryFactory: JPAQueryFactory) {
-    fun getAdStatisticsDataTotalCount(): Int {
+    fun getAdStatisticsDataTotalCount(
+        startDate: LocalDateTime,
+        endDate: LocalDateTime
+    ): Int {
         return queryFactory
             .select(adTrackingHistory.id.pid)
             .from(adTrackingHistory)
+            .where(
+                adTrackingHistory.id.createdAt.goe(startDate),
+                adTrackingHistory.id.createdAt.loe(endDate)
+            )
             .groupBy(
                 getFormattedDate(adTrackingHistory.id.createdAt),
                 adTrackingHistory.mediaGroup,
@@ -115,6 +122,7 @@ class AdminAdStatisticsRepository(private val queryFactory: JPAQueryFactory) {
                 adTrackingHistory.id.pid,
                 adTrackingHistory.pidName
             )
+            .orderBy(getFormattedDate(adTrackingHistory.id.createdAt).desc())
             .offset(offset)
             .limit(limit)
             .fetch()
diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/admin/statistics/member/AdminMemberStatisticsRepository.kt b/src/main/kotlin/kr/co/vividnext/sodalive/admin/statistics/member/AdminMemberStatisticsRepository.kt
index 4dff07c..1333993 100644
--- a/src/main/kotlin/kr/co/vividnext/sodalive/admin/statistics/member/AdminMemberStatisticsRepository.kt
+++ b/src/main/kotlin/kr/co/vividnext/sodalive/admin/statistics/member/AdminMemberStatisticsRepository.kt
@@ -80,9 +80,9 @@ class AdminMemberStatisticsRepository(private val queryFactory: JPAQueryFactory)
                 member.createdAt.loe(endDate)
             )
             .groupBy(getFormattedDate(member.createdAt))
+            .orderBy(getFormattedDate(member.createdAt).desc())
             .offset(offset)
             .limit(limit)
-            .orderBy(member.createdAt.desc())
             .fetch()
     }
 
@@ -105,9 +105,9 @@ class AdminMemberStatisticsRepository(private val queryFactory: JPAQueryFactory)
                 signOut.createdAt.loe(endDate)
             )
             .groupBy(getFormattedDate(signOut.createdAt))
+            .orderBy(getFormattedDate(signOut.createdAt).desc())
             .offset(offset)
             .limit(limit)
-            .orderBy(signOut.createdAt.desc())
             .fetch()
     }
 
@@ -134,9 +134,9 @@ class AdminMemberStatisticsRepository(private val queryFactory: JPAQueryFactory)
                 charge.createdAt.loe(endDate)
             )
             .groupBy(getFormattedDate(charge.createdAt))
+            .orderBy(getFormattedDate(charge.createdAt).desc())
             .offset(offset)
             .limit(limit)
-            .orderBy(charge.createdAt.desc())
             .fetch()
     }