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() }