From b0349ac13366e36fe5789fbdfd685206f81795a3 Mon Sep 17 00:00:00 2001 From: Klaus Date: Sun, 9 Mar 2025 17:38:04 +0900 Subject: [PATCH 1/2] =?UTF-8?q?=EB=A7=88=EC=BC=80=ED=8C=85=20-=20=EA=B4=91?= =?UTF-8?q?=EA=B3=A0=20=ED=86=B5=EA=B3=84=20-=20=EC=A0=84=EC=B2=B4=20?= =?UTF-8?q?=EA=B0=9C=EC=88=98=EB=A5=BC=20size=EB=A1=9C=20=EA=B5=AC?= =?UTF-8?q?=ED=95=98=EC=A7=80=20=EC=95=8A=EA=B3=A0=20count=20=ED=95=A8?= =?UTF-8?q?=EC=88=98=EB=A5=BC=20=EC=9D=B4=EC=9A=A9=ED=95=98=EB=8F=84?= =?UTF-8?q?=EB=A1=9D=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../statistics/AdminAdStatisticsRepository.kt | 23 ++++++++++--------- 1 file changed, 12 insertions(+), 11 deletions(-) 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 6cd8046..a15d326 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 @@ -14,17 +14,18 @@ import java.time.LocalDateTime @Repository class AdminAdStatisticsRepository(private val queryFactory: JPAQueryFactory) { fun getAdStatisticsDataTotalCount(): Int { - return queryFactory - .select(adTrackingHistory.id.pid) - .from(adTrackingHistory) - .groupBy( - getFormattedDate(adTrackingHistory.id.createdAt), - adTrackingHistory.mediaGroup, - adTrackingHistory.id.pid, - adTrackingHistory.pidName - ) - .fetch() - .size + return ( + queryFactory + .select(adTrackingHistory.id.pid.count()) + .from(adTrackingHistory) + .groupBy( + getFormattedDate(adTrackingHistory.id.createdAt), + adTrackingHistory.mediaGroup, + adTrackingHistory.id.pid, + adTrackingHistory.pidName + ) + .fetchOne() ?: 0L + ).toInt() } fun getAdStatisticsDataList(offset: Long, limit: Long): List { -- 2.40.1 From 48677a5a246af3262f67d024f47bd143d731706c Mon Sep 17 00:00:00 2001 From: Klaus Date: Mon, 10 Mar 2025 13:50:16 +0900 Subject: [PATCH 2/2] =?UTF-8?q?=EB=A7=88=EC=BC=80=ED=8C=85=20-=20=EB=A7=A4?= =?UTF-8?q?=EC=B2=B4=20=ED=8C=8C=ED=8A=B8=EB=84=88=20=EC=BD=94=EB=93=9C=20?= =?UTF-8?q?=EC=A0=95=EB=A0=AC=20=EC=88=98=EC=A0=95=20-=20id=20=EC=98=A4?= =?UTF-8?q?=EB=A6=84=EC=B0=A8=EC=88=9C=EC=97=90=EC=84=9C=20=EB=82=B4?= =?UTF-8?q?=EB=A6=BC=EC=B0=A8=EC=88=9C=EC=9C=BC=EB=A1=9C=20=EB=B3=80?= =?UTF-8?q?=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../co/vividnext/sodalive/marketing/AdMediaPartnerRepository.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/marketing/AdMediaPartnerRepository.kt b/src/main/kotlin/kr/co/vividnext/sodalive/marketing/AdMediaPartnerRepository.kt index 2886fbc..954ff66 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/marketing/AdMediaPartnerRepository.kt +++ b/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() -- 2.40.1