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