From c406d2167441cd1da2734f641563aaf009bd22cd Mon Sep 17 00:00:00 2001 From: Klaus Date: Tue, 21 May 2024 15:29:30 +0900 Subject: [PATCH] =?UTF-8?q?=EC=BD=98=ED=85=90=EC=B8=A0=EB=B3=84=20?= =?UTF-8?q?=EB=88=84=EC=A0=81=EC=A0=95=EC=82=B0=20-=20=EC=B7=A8=EC=86=8C?= =?UTF-8?q?=EB=90=9C=20=EC=A3=BC=EB=AC=B8=EC=9D=80=20=EB=B0=98=EC=98=81?= =?UTF-8?q?=EB=90=98=EC=A7=80=20=EC=95=8A=EB=8F=84=EB=A1=9D=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/calculate/AdminCalculateQueryRepository.kt | 2 ++ .../calculate/CreatorAdminCalculateQueryRepository.kt | 10 ++++++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/admin/calculate/AdminCalculateQueryRepository.kt b/src/main/kotlin/kr/co/vividnext/sodalive/admin/calculate/AdminCalculateQueryRepository.kt index 2f61759..6c43dab 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/admin/calculate/AdminCalculateQueryRepository.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/admin/calculate/AdminCalculateQueryRepository.kt @@ -92,6 +92,7 @@ class AdminCalculateQueryRepository(private val queryFactory: JPAQueryFactory) { .from(order) .innerJoin(order.audioContent, audioContent) .innerJoin(audioContent.member, member) + .where(order.isActive.isTrue) .groupBy(member.id, audioContent.id, order.can) .fetch() .size @@ -113,6 +114,7 @@ class AdminCalculateQueryRepository(private val queryFactory: JPAQueryFactory) { .from(order) .innerJoin(order.audioContent, audioContent) .innerJoin(audioContent.member, member) + .where(order.isActive.isTrue) .groupBy(member.id, audioContent.id, order.type, order.can) .offset(offset) .limit(limit) 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 40b83c0..a6d49df 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 @@ -147,7 +147,10 @@ class CreatorAdminCalculateQueryRepository(private val queryFactory: JPAQueryFac .from(order) .innerJoin(order.audioContent, audioContent) .innerJoin(audioContent.member, member) - .where(audioContent.member.id.eq(memberId)) + .where( + audioContent.member.id.eq(memberId) + .and(order.isActive.isTrue) + ) .groupBy(member.id, audioContent.id, order.can) .fetch() .size @@ -173,7 +176,10 @@ class CreatorAdminCalculateQueryRepository(private val queryFactory: JPAQueryFac .from(order) .innerJoin(order.audioContent, audioContent) .innerJoin(audioContent.member, member) - .where(audioContent.member.id.eq(memberId)) + .where( + audioContent.member.id.eq(memberId) + .and(order.isActive.isTrue) + ) .groupBy(member.id, audioContent.id, order.type, order.can) .offset(offset) .limit(limit)