From fc2737921be2249dfec15468e9ee6899faca8c7b Mon Sep 17 00:00:00 2001 From: Klaus Date: Wed, 30 Aug 2023 00:18:59 +0900 Subject: [PATCH] =?UTF-8?q?=ED=9B=84=EC=9B=90=20=EC=A0=84=EC=B2=B4?= =?UTF-8?q?=EB=B3=B4=EA=B8=B0=20-=20=ED=95=98=EB=8B=A8=20=EB=9E=AD?= =?UTF-8?q?=ED=82=B9=EC=97=90=20=EC=BD=98=ED=85=90=EC=B8=A0=20=ED=9B=84?= =?UTF-8?q?=EC=9B=90=EB=8F=84=20=ED=8F=AC=ED=95=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../explorer/ExplorerQueryRepository.kt | 20 ++++++++----------- 1 file changed, 8 insertions(+), 12 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 f921b16..5783c1f 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/explorer/ExplorerQueryRepository.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/explorer/ExplorerQueryRepository.kt @@ -90,20 +90,18 @@ class ExplorerQueryRepository( } fun getMemberDonationRankingTotal(creatorId: Long): Int { - val creatorMember = QMember("creator") val userMember = QMember("user") val donation = useCan.rewardCan.add(useCan.can).sum() return queryFactory .select(userMember.id) - .from(useCan) - .join(useCan.room, liveRoom) - .join(liveRoom.member, creatorMember) - .join(useCan.member, userMember) + .from(useCanCalculate) + .innerJoin(useCanCalculate.useCan, useCan) + .innerJoin(useCan.member, userMember) .where( useCan.canUsage.eq(CanUsage.DONATION) .and(useCan.isRefund.isFalse) - .and(creatorMember.id.eq(creatorId)) + .and(useCanCalculate.recipientCreatorId.eq(creatorId)) ) .groupBy(useCan.member.id) .orderBy(donation.desc()) @@ -117,22 +115,20 @@ class ExplorerQueryRepository( offset: Long = 0, withDonationCan: Boolean ): List { - val creator = QMember("creator") val member = QMember("user") val donation = useCan.rewardCan.add(useCan.can).sum() return queryFactory .select(member, donation) - .from(useCan) - .join(useCan.room, liveRoom) - .join(liveRoom.member, creator) - .join(useCan.member, member) + .from(useCanCalculate) + .innerJoin(useCanCalculate.useCan, useCan) + .innerJoin(useCan.member, member) .offset(offset) .limit(limit) .where( useCan.canUsage.eq(CanUsage.DONATION) .and(useCan.isRefund.isFalse) - .and(creator.id.eq(creatorId)) + .and(useCanCalculate.recipientCreatorId.eq(creatorId)) ) .groupBy(useCan.member.id) .orderBy(donation.desc(), member.id.desc()) -- 2.40.1