Merge pull request '콘텐츠별 누적정산' (#181) from test into main

Reviewed-on: #181

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)

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)