From a215d027ecb0ad664bc25585abb643f834b829be Mon Sep 17 00:00:00 2001 From: Klaus Date: Tue, 14 Nov 2023 13:41:32 +0900 Subject: [PATCH 1/3] =?UTF-8?q?=ED=81=AC=EB=A6=AC=EC=97=90=EC=9D=B4?= =?UTF-8?q?=ED=84=B0=20=EA=B4=80=EB=A6=AC=EC=9E=90=20-=20=EC=9D=BC?= =?UTF-8?q?=EC=9E=90=EB=B3=84=20=EC=BD=98=ED=85=90=EC=B8=A0=20=EC=A0=95?= =?UTF-8?q?=EC=82=B0=20=ED=8E=98=EC=9D=B4=EC=A7=95=20=EC=95=88=EB=90=98?= =?UTF-8?q?=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 --- .../admin/calculate/CreatorAdminCalculateQueryRepository.kt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/creator/admin/calculate/CreatorAdminCalculateQueryRepository.kt b/src/main/kotlin/kr/co/vividnext/sodalive/creator/admin/calculate/CreatorAdminCalculateQueryRepository.kt index 0a9e488..8616741 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/creator/admin/calculate/CreatorAdminCalculateQueryRepository.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/creator/admin/calculate/CreatorAdminCalculateQueryRepository.kt @@ -96,8 +96,8 @@ class CreatorAdminCalculateQueryRepository(private val queryFactory: JPAQueryFac startDate: LocalDateTime, endDate: LocalDateTime, memberId: Long, - offset: Long = 0, - limit: Long = 20 + offset: Long, + limit: Long ): List { val orderFormattedDate = getFormattedDate(order.createdAt) return queryFactory @@ -125,9 +125,9 @@ class CreatorAdminCalculateQueryRepository(private val queryFactory: JPAQueryFac .and(order.createdAt.loe(endDate)) ) .groupBy(audioContent.id, order.type, orderFormattedDate, order.can) - .orderBy(member.id.desc(), orderFormattedDate.desc(), audioContent.id.asc()) .offset(offset) .limit(limit) + .orderBy(member.id.desc(), orderFormattedDate.desc(), audioContent.id.asc()) .fetch() } -- 2.40.1 From cb9ba824cfd8f7f31cf57c61dfa50ad8d3a50bc7 Mon Sep 17 00:00:00 2001 From: Klaus Date: Tue, 14 Nov 2023 13:59:22 +0900 Subject: [PATCH 2/3] =?UTF-8?q?=ED=81=AC=EB=A6=AC=EC=97=90=EC=9D=B4?= =?UTF-8?q?=ED=84=B0=20=EA=B4=80=EB=A6=AC=EC=9E=90=20-=20=EC=9D=BC?= =?UTF-8?q?=EC=9E=90=EB=B3=84=20=EC=BD=98=ED=85=90=EC=B8=A0=20=EC=A0=95?= =?UTF-8?q?=EC=82=B0=20=ED=8E=98=EC=9D=B4=EC=A7=95=20=EC=95=88=EB=90=98?= =?UTF-8?q?=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 --- .../creator/admin/calculate/CreatorAdminCalculateService.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/creator/admin/calculate/CreatorAdminCalculateService.kt b/src/main/kotlin/kr/co/vividnext/sodalive/creator/admin/calculate/CreatorAdminCalculateService.kt index 56c1b58..30c8c54 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/creator/admin/calculate/CreatorAdminCalculateService.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/creator/admin/calculate/CreatorAdminCalculateService.kt @@ -87,7 +87,8 @@ class CreatorAdminCalculateService(private val repository: CreatorAdminCalculate @Transactional(readOnly = true) @Cacheable( cacheNames = ["cache_ttl_3_hours"], - key = "'creatorCalculateContentList:' + " + "#memberId + ':' + #startDateStr + ':' + #endDateStr" + key = "'creatorCumulativeSalesByContent:' + " + + "#startDateStr + ':' + #endDateStr + ':' + #memberId + ':' + #offset + ':' + #limit" ) fun getCalculateContentList( startDateStr: String, -- 2.40.1 From 216f983d36c2f319d03638d621e45758d2a75296 Mon Sep 17 00:00:00 2001 From: Klaus Date: Tue, 14 Nov 2023 14:11:26 +0900 Subject: [PATCH 3/3] =?UTF-8?q?=ED=81=AC=EB=A6=AC=EC=97=90=EC=9D=B4?= =?UTF-8?q?=ED=84=B0=20=EA=B4=80=EB=A6=AC=EC=9E=90=20-=20=EC=9D=BC?= =?UTF-8?q?=EC=9E=90=EB=B3=84=20=EC=BD=98=ED=85=90=EC=B8=A0=20=EC=A0=95?= =?UTF-8?q?=EC=82=B0=20=ED=8E=98=EC=9D=B4=EC=A7=95=20=EC=95=88=EB=90=98?= =?UTF-8?q?=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 --- .../creator/admin/calculate/CreatorAdminCalculateService.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/creator/admin/calculate/CreatorAdminCalculateService.kt b/src/main/kotlin/kr/co/vividnext/sodalive/creator/admin/calculate/CreatorAdminCalculateService.kt index 30c8c54..4cec361 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/creator/admin/calculate/CreatorAdminCalculateService.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/creator/admin/calculate/CreatorAdminCalculateService.kt @@ -87,7 +87,7 @@ class CreatorAdminCalculateService(private val repository: CreatorAdminCalculate @Transactional(readOnly = true) @Cacheable( cacheNames = ["cache_ttl_3_hours"], - key = "'creatorCumulativeSalesByContent:' + " + + key = "'creatorCalculateContentList:' + " + "#startDateStr + ':' + #endDateStr + ':' + #memberId + ':' + #offset + ':' + #limit" ) fun getCalculateContentList( -- 2.40.1