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

Compare commits

base: klaus:720ee63505ccb31bbb7daa3211a71ec824fda4ab
Branches Tags
klaus:test
klaus:main
..
compare: klaus:6efab40a85821db764fa27f3090ce91b321dd49a
Branches Tags
klaus:main
klaus:test

No commits in common. "720ee63505ccb31bbb7daa3211a71ec824fda4ab" and "6efab40a85821db764fa27f3090ce91b321dd49a" have entirely different histories.
720ee63505 ... 6efab40a85

3 changed files with 8 additions and 7 deletions
Show Stats Expand all files Collapse all files

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

@ -65,7 +65,6 @@ class AdminCalculateQueryRepository(private val queryFactory: JPAQueryFactory) {
.where( .where(
order.createdAt.goe(startDate) order.createdAt.goe(startDate)
.and(order.createdAt.loe(endDate)) .and(order.createdAt.loe(endDate))
.and(order.isActive.isTrue)
) )
.groupBy(audioContent.id, order.type, orderFormattedDate, order.can) .groupBy(audioContent.id, order.type, orderFormattedDate, order.can)
.orderBy(member.id.desc(), orderFormattedDate.desc(), audioContent.id.asc()) .orderBy(member.id.desc(), orderFormattedDate.desc(), audioContent.id.asc())

4
src/main/kotlin/kr/co/vividnext/sodalive/content/AudioContentController.kt
View File

@ -105,7 +105,7 @@ class AudioContentController(private val service: AudioContentService) {
fun getAudioContentList( fun getAudioContentList(
@RequestParam("creator-id") creatorId: Long, @RequestParam("creator-id") creatorId: Long,
@RequestParam("sort-type", required = false) sortType: SortType = SortType.NEWEST, @RequestParam("sort-type", required = false) sortType: SortType = SortType.NEWEST,
@RequestParam("category-id", required = false) categoryId: Long? = 0, @RequestParam("category-id", required = false) categoryId: Long = 0,
@AuthenticationPrincipal(expression = "#this == 'anonymousUser' ? null : member") member: Member?, @AuthenticationPrincipal(expression = "#this == 'anonymousUser' ? null : member") member: Member?,
pageable: Pageable pageable: Pageable
) = run { ) = run {
@ -115,7 +115,7 @@ class AudioContentController(private val service: AudioContentService) {
service.getAudioContentList( service.getAudioContentList(
creatorId = creatorId, creatorId = creatorId,
sortType = sortType, sortType = sortType,
categoryId = categoryId ?: 0, categoryId = categoryId,
member = member, member = member,
offset = pageable.offset, offset = pageable.offset,
limit = pageable.pageSize.toLong() limit = pageable.pageSize.toLong()

10
src/main/kotlin/kr/co/vividnext/sodalive/creator/admin/calculate/CreatorAdminCalculateQueryRepository.kt
View File

@ -116,14 +116,16 @@ class CreatorAdminCalculateQueryRepository(private val queryFactory: JPAQueryFac
order.can.sum() order.can.sum()
) )
) )
.from(order) .from(useCanCalculate)
.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(
order.createdAt.goe(startDate) useCanCalculate.status.eq(UseCanCalculateStatus.RECEIVED)
.and(useCanCalculate.recipientCreatorId.eq(memberId))
.and(order.createdAt.goe(startDate))
.and(order.createdAt.loe(endDate)) .and(order.createdAt.loe(endDate))
.and(order.isActive.isTrue)
.and(order.creator.id.eq(memberId))
) )
.groupBy(audioContent.id, order.type, orderFormattedDate, order.can) .groupBy(audioContent.id, order.type, orderFormattedDate, order.can)
.offset(offset) .offset(offset)