From 75dbfad3a70259a6db20ceb34a6facf95d9e744d Mon Sep 17 00:00:00 2001 From: Klaus Date: Wed, 27 Sep 2023 23:22:16 +0900 Subject: [PATCH] =?UTF-8?q?=ED=9B=84=EC=9B=90=EC=88=9C=EC=9C=84=20-=20?= =?UTF-8?q?=EC=9C=A0=EB=A3=8C=EB=9D=BC=EC=9D=B4=EB=B8=8C=20=EC=9E=85?= =?UTF-8?q?=EC=9E=A5=20=EC=BA=94=20=EB=B0=98=EC=98=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../explorer/ExplorerQueryRepository.kt | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/explorer/ExplorerQueryRepository.kt b/src/main/kotlin/kr/co/vividnext/sodalive/explorer/ExplorerQueryRepository.kt index 208465c..6af9d76 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/explorer/ExplorerQueryRepository.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/explorer/ExplorerQueryRepository.kt @@ -66,7 +66,10 @@ class ExplorerQueryRepository( .innerJoin(useCanCalculate.useCan, useCan) .where( useCanCalculate.status.eq(UseCanCalculateStatus.RECEIVED) - .and(useCan.canUsage.eq(CanUsage.DONATION)) + .and( + useCan.canUsage.eq(CanUsage.DONATION) + .or(useCan.canUsage.eq(CanUsage.LIVE)) + ) .and(useCan.isRefund.isFalse) .and(useCanCalculate.recipientCreatorId.eq(creatorId)) .and( @@ -99,9 +102,12 @@ class ExplorerQueryRepository( .innerJoin(useCanCalculate.useCan, useCan) .innerJoin(useCan.member, userMember) .where( - useCan.canUsage.eq(CanUsage.DONATION) - .and(useCan.isRefund.isFalse) + useCan.isRefund.isFalse .and(useCanCalculate.recipientCreatorId.eq(creatorId)) + .and( + useCan.canUsage.eq(CanUsage.DONATION) + .or(useCan.canUsage.eq(CanUsage.LIVE)) + ) ) .groupBy(useCan.member.id) .orderBy(donation.desc()) @@ -126,9 +132,12 @@ class ExplorerQueryRepository( .offset(offset) .limit(limit) .where( - useCan.canUsage.eq(CanUsage.DONATION) - .and(useCan.isRefund.isFalse) + useCan.isRefund.isFalse .and(useCanCalculate.recipientCreatorId.eq(creatorId)) + .and( + useCan.canUsage.eq(CanUsage.DONATION) + .or(useCan.canUsage.eq(CanUsage.LIVE)) + ) ) .groupBy(useCan.member.id) .orderBy(donation.desc(), member.id.desc())