From 537ec88d05f2e4deb9669f67391cfb67f7a76e09 Mon Sep 17 00:00:00 2001 From: Klaus Date: Mon, 17 Mar 2025 17:44:14 +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-=201=ED=8E=98?= =?UTF-8?q?=EC=9D=B4=EC=A7=80=20=EC=9D=B4=EC=99=B8=EC=97=90=20=EB=8D=B0?= =?UTF-8?q?=EC=9D=B4=ED=84=B0=EA=B0=80=20=EB=B3=B4=EC=9D=B4=EC=A7=80=20?= =?UTF-8?q?=EC=95=8A=EB=8A=94=20=EB=B2=84=EA=B7=B8=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../member/AdminMemberStatisticsRepository.kt | 27 +++---------------- .../member/AdminMemberStatisticsService.kt | 12 +++------ 2 files changed, 6 insertions(+), 33 deletions(-) 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 1333993..e2f52a3 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 @@ -61,12 +61,7 @@ class AdminMemberStatisticsRepository(private val queryFactory: JPAQueryFactory) .sumOf { it.memberCount } } - fun getSignUpCountInRange( - startDate: LocalDateTime, - endDate: LocalDateTime, - offset: Long, - limit: Long - ): List { + fun getSignUpCountInRange(startDate: LocalDateTime, endDate: LocalDateTime): List { return queryFactory .select( QDateAndMemberCount( @@ -81,17 +76,10 @@ class AdminMemberStatisticsRepository(private val queryFactory: JPAQueryFactory) ) .groupBy(getFormattedDate(member.createdAt)) .orderBy(getFormattedDate(member.createdAt).desc()) - .offset(offset) - .limit(limit) .fetch() } - fun getSignOutCountInRange( - startDate: LocalDateTime, - endDate: LocalDateTime, - offset: Long, - limit: Long - ): List { + fun getSignOutCountInRange(startDate: LocalDateTime, endDate: LocalDateTime): List { return queryFactory .select( QDateAndMemberCount( @@ -106,17 +94,10 @@ class AdminMemberStatisticsRepository(private val queryFactory: JPAQueryFactory) ) .groupBy(getFormattedDate(signOut.createdAt)) .orderBy(getFormattedDate(signOut.createdAt).desc()) - .offset(offset) - .limit(limit) .fetch() } - fun getPaymentMemberCountInRange( - startDate: LocalDateTime, - endDate: LocalDateTime, - offset: Long, - limit: Long - ): List { + fun getPaymentMemberCountInRange(startDate: LocalDateTime, endDate: LocalDateTime): List { return queryFactory .select( QDateAndMemberCount( @@ -135,8 +116,6 @@ class AdminMemberStatisticsRepository(private val queryFactory: JPAQueryFactory) ) .groupBy(getFormattedDate(charge.createdAt)) .orderBy(getFormattedDate(charge.createdAt).desc()) - .offset(offset) - .limit(limit) .fetch() } diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/admin/statistics/member/AdminMemberStatisticsService.kt b/src/main/kotlin/kr/co/vividnext/sodalive/admin/statistics/member/AdminMemberStatisticsService.kt index 2024110..f124a49 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/admin/statistics/member/AdminMemberStatisticsService.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/admin/statistics/member/AdminMemberStatisticsService.kt @@ -61,23 +61,17 @@ class AdminMemberStatisticsService(private val repository: AdminMemberStatistics val signUpCountInRange = repository.getSignUpCountInRange( startDate = startDateTime, - endDate = endDateTime, - offset = pageable.offset, - limit = pageable.pageSize.toLong() + endDate = endDateTime ).associateBy({ it.date }, { it.memberCount }) val signOutCountInRange = repository.getSignOutCountInRange( startDate = startDateTime, - endDate = endDateTime, - offset = pageable.offset, - limit = pageable.pageSize.toLong() + endDate = endDateTime ).associateBy({ it.date }, { it.memberCount }) val paymentMemberCountInRange = repository.getPaymentMemberCountInRange( startDate = startDateTime, - endDate = endDateTime, - offset = pageable.offset, - limit = pageable.pageSize.toLong() + endDate = endDateTime ) val paymentMemberCountInRangeMap = paymentMemberCountInRange.associateBy({ it.date }, { it.memberCount })