Merge pull request 'test' (#281) from test into main

Reviewed-on: #281

src/main/kotlin/kr/co/vividnext/sodalive/admin/marketing/statistics/AdminAdStatisticsRepository.kt

@@ -14,17 +14,18 @@ import java.time.LocalDateTime
 @Repository
 class AdminAdStatisticsRepository(private val queryFactory: JPAQueryFactory) {
     fun getAdStatisticsDataTotalCount(): Int {
-        return queryFactory
+        return (
-            .select(adTrackingHistory.id.pid)
+            queryFactory
-            .from(adTrackingHistory)
+                .select(adTrackingHistory.id.pid.count())
-            .groupBy(
+                .from(adTrackingHistory)
-                getFormattedDate(adTrackingHistory.id.createdAt),
+                .groupBy(
-                adTrackingHistory.mediaGroup,
+                    getFormattedDate(adTrackingHistory.id.createdAt),
-                adTrackingHistory.id.pid,
+                    adTrackingHistory.mediaGroup,
-                adTrackingHistory.pidName
+                    adTrackingHistory.id.pid,
-            )
+                    adTrackingHistory.pidName
-            .fetch()
+                )
-            .size
+                .fetchOne() ?: 0L
+            ).toInt()
     }
 
     fun getAdStatisticsDataList(offset: Long, limit: Long): List<GetAdminAdStatisticsItem> {

src/main/kotlin/kr/co/vividnext/sodalive/marketing/AdMediaPartnerRepository.kt

@@ -45,7 +45,7 @@ class AdMediaPartnerQueryRepositoryImpl(private val queryFactory: JPAQueryFactor
                 )
             )
             .from(adMediaPartner)
-            .orderBy(adMediaPartner.isActive.desc(), adMediaPartner.id.asc())
+            .orderBy(adMediaPartner.isActive.desc(), adMediaPartner.id.desc())
             .offset(offset)
             .limit(limit)
             .fetch()