klaus
/
sodalive-backend-spring-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request 'test' (#88) from test into main 

Reviewed-on: #88
This commit is contained in:
klaus 2023-11-14 11:09:14 +00:00
parent 049e654535 8d32f1b3bd
commit e09a59c5b4
1 changed files with 8 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/main/kotlin/kr/co/vividnext/sodalive/admin/calculate/AdminCalculateQueryRepository.kt
View File

@ -6,8 +6,6 @@ import com.querydsl.core.types.dsl.StringTemplate
import com.querydsl.jpa.impl.JPAQueryFactory import com.querydsl.jpa.impl.JPAQueryFactory
import kr.co.vividnext.sodalive.can.use.CanUsage import kr.co.vividnext.sodalive.can.use.CanUsage
import kr.co.vividnext.sodalive.can.use.QUseCan.useCan import kr.co.vividnext.sodalive.can.use.QUseCan.useCan
import kr.co.vividnext.sodalive.can.use.QUseCanCalculate.useCanCalculate
import kr.co.vividnext.sodalive.can.use.UseCanCalculateStatus
import kr.co.vividnext.sodalive.content.QAudioContent.audioContent import kr.co.vividnext.sodalive.content.QAudioContent.audioContent
import kr.co.vividnext.sodalive.content.order.QOrder.order import kr.co.vividnext.sodalive.content.order.QOrder.order
import kr.co.vividnext.sodalive.live.room.QLiveRoom.liveRoom import kr.co.vividnext.sodalive.live.room.QLiveRoom.liveRoom
@ -29,16 +27,15 @@ class AdminCalculateQueryRepository(private val queryFactory: JPAQueryFactory) {
liveRoom.title, liveRoom.title,
liveRoom.price, liveRoom.price,
useCan.canUsage, useCan.canUsage,
useCanCalculate.id.count(), useCan.id.count(),
useCanCalculate.can.sum() useCan.can.add(useCan.rewardCan).sum()
) )
) )
.from(useCanCalculate) .from(useCan)
.innerJoin(useCanCalculate.useCan, useCan)
.innerJoin(useCan.room, liveRoom) .innerJoin(useCan.room, liveRoom)
.innerJoin(liveRoom.member, member) .innerJoin(liveRoom.member, member)
.where( .where(
useCanCalculate.status.eq(UseCanCalculateStatus.RECEIVED) useCan.isRefund.isFalse
.and(liveRoom.beginDateTime.goe(startDate)) .and(liveRoom.beginDateTime.goe(startDate))
.and(liveRoom.beginDateTime.loe(endDate)) .and(liveRoom.beginDateTime.loe(endDate))
) )
@ -62,14 +59,11 @@ class AdminCalculateQueryRepository(private val queryFactory: JPAQueryFactory) {
order.can.sum() order.can.sum()
) )
) )
.from(useCanCalculate) .from(order)
.innerJoin(useCanCalculate.useCan, useCan)
.innerJoin(useCan.order, order)
.innerJoin(order.audioContent, audioContent) .innerJoin(order.audioContent, audioContent)
.innerJoin(audioContent.member, member) .innerJoin(audioContent.member, member)
.where( .where(
useCanCalculate.status.eq(UseCanCalculateStatus.RECEIVED) order.createdAt.goe(startDate)
.and(order.createdAt.goe(startDate))
.and(order.createdAt.loe(endDate)) .and(order.createdAt.loe(endDate))
) )
.groupBy(audioContent.id, order.type, orderFormattedDate, order.can) .groupBy(audioContent.id, order.type, orderFormattedDate, order.can)
@ -141,13 +135,11 @@ class AdminCalculateQueryRepository(private val queryFactory: JPAQueryFactory) {
useCan.can.add(useCan.rewardCan).sum() useCan.can.add(useCan.rewardCan).sum()
) )
) )
.from(useCanCalculate) .from(useCan)
.innerJoin(useCanCalculate.useCan, useCan)
.innerJoin(useCan.audioContent, audioContent) .innerJoin(useCan.audioContent, audioContent)
.innerJoin(audioContent.member, member) .innerJoin(audioContent.member, member)
.where( .where(
useCanCalculate.status.eq(UseCanCalculateStatus.RECEIVED) useCan.isRefund.isFalse
.and(useCan.isRefund.isFalse)
.and(useCan.canUsage.eq(CanUsage.DONATION)) .and(useCan.canUsage.eq(CanUsage.DONATION))
.and(useCan.createdAt.goe(startDate)) .and(useCan.createdAt.goe(startDate))
.and(useCan.createdAt.loe(endDate)) .and(useCan.createdAt.loe(endDate))