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

Compare commits

base: klaus:fe4ecd0ad84ee36c674461cee6130d4aa50faf13
Branches Tags
klaus:test
klaus:main
..
compare: klaus:78d476fe80600884409a3a11cb8f16af38d58b63
Branches Tags
klaus:main
klaus:test

No commits in common. "fe4ecd0ad84ee36c674461cee6130d4aa50faf13" and "78d476fe80600884409a3a11cb8f16af38d58b63" have entirely different histories.
fe4ecd0ad8 ... 78d476fe80

2 changed files with 4 additions and 5 deletions
Show Stats Expand all files Collapse all files

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

@ -96,8 +96,8 @@ class CreatorAdminCalculateQueryRepository(private val queryFactory: JPAQueryFac
startDate: LocalDateTime, startDate: LocalDateTime,
endDate: LocalDateTime, endDate: LocalDateTime,
memberId: Long, memberId: Long,
offset: Long, offset: Long = 0,
limit: Long limit: Long = 20
): List<GetCalculateContentQueryData> { ): List<GetCalculateContentQueryData> {
val orderFormattedDate = getFormattedDate(order.createdAt) val orderFormattedDate = getFormattedDate(order.createdAt)
return queryFactory return queryFactory
@ -125,9 +125,9 @@ class CreatorAdminCalculateQueryRepository(private val queryFactory: JPAQueryFac
.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)
.orderBy(member.id.desc(), orderFormattedDate.desc(), audioContent.id.asc())
.offset(offset) .offset(offset)
.limit(limit) .limit(limit)
.orderBy(member.id.desc(), orderFormattedDate.desc(), audioContent.id.asc())
.fetch() .fetch()
} }

3
src/main/kotlin/kr/co/vividnext/sodalive/creator/admin/calculate/CreatorAdminCalculateService.kt
View File

@ -87,8 +87,7 @@ class CreatorAdminCalculateService(private val repository: CreatorAdminCalculate
@Transactional(readOnly = true) @Transactional(readOnly = true)
@Cacheable( @Cacheable(
cacheNames = ["cache_ttl_3_hours"], cacheNames = ["cache_ttl_3_hours"],
key = "'creatorCalculateContentList:' + " + key = "'creatorCalculateContentList:' + " + "#memberId + ':' + #startDateStr + ':' + #endDateStr"
"#startDateStr + ':' + #endDateStr + ':' + #memberId + ':' + #offset + ':' + #limit"
) )
fun getCalculateContentList( fun getCalculateContentList(
startDateStr: String, startDateStr: String,