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

test #286

Merged
klaus merged 6 commits from test into main 2025-03-14 16:11:18 +00:00
Conversation 0 Commits 6 Files Changed 6 +4 -4
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit b817a230fd - Show all commits

8
src/main/kotlin/kr/co/vividnext/sodalive/admin/statistics/member/AdminMemberStatisticsRepository.kt
View File

@@ -44,12 +44,12 @@ class AdminMemberStatisticsRepository(private val queryFactory: JPAQueryFactory)
.select(
QDateAndMemberCount(
getFormattedDate(charge.createdAt),
member.id.countDistinct().castToNum(Int::class.java)
Expressions.numberTemplate(Int::class.java, "COUNT(DISTINCT {0})", member.id)
)
)
.from(charge)
.innerJoin(charge.member, member)
.leftJoin(charge.payment, payment)
.innerJoin(charge.payment, payment)
.where(
charge.status.eq(ChargeStatus.CHARGE),
payment.status.eq(PaymentStatus.COMPLETE),
@@ -119,12 +119,12 @@ class AdminMemberStatisticsRepository(private val queryFactory: JPAQueryFactory)
.select(
QDateAndMemberCount(
getFormattedDate(charge.createdAt),
member.id.countDistinct().castToNum(Int::class.java)
Expressions.numberTemplate(Int::class.java, "COUNT(DISTINCT {0})", member.id)
)
)
.from(charge)
.innerJoin(charge.member, member)
.leftJoin(charge.payment, payment)
.innerJoin(charge.payment, payment)
.where(
charge.status.eq(ChargeStatus.CHARGE),
payment.status.eq(PaymentStatus.COMPLETE),