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