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

test #260

Merged
klaus merged 6 commits from test into main 2025-02-18 18:13:26 +00:00
Conversation 0 Commits 6 Files Changed 10 +11 -25
3 changed files with 11 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 7041aff350 - Show all commits

4
src/main/kotlin/kr/co/vividnext/sodalive/content/main/tab/series/AudioContentMainTabSeriesService.kt
View File

@@ -184,9 +184,7 @@ class AudioContentMainTabSeriesService(
val totalCount = rankingService.getCompleteSeriesRankingTotalCount( val totalCount = rankingService.getCompleteSeriesRankingTotalCount(
memberId = memberId, memberId = memberId,
isAdult = isAdult, isAdult = isAdult
startDate = monthlyRankingStartDate,
endDate = monthlyRankingEndDate
) )
val items = rankingService.getCompleteSeriesRanking( val items = rankingService.getCompleteSeriesRanking(

24
src/main/kotlin/kr/co/vividnext/sodalive/rank/RankingRepository.kt
View File

@@ -209,12 +209,7 @@ class RankingRepository(
.fetch() .fetch()
} }
fun getCompleteSeriesRankingTotalCount( fun getCompleteSeriesRankingTotalCount(memberId: Long, isAdult: Boolean): Int {
memberId: Long,
isAdult: Boolean,
startDate: LocalDateTime,
endDate: LocalDateTime
): Int {
val blockMemberCondition = blockMember.member.id.eq(member.id) val blockMemberCondition = blockMember.member.id.eq(member.id)
.and(blockMember.isActive.isTrue) .and(blockMember.isActive.isTrue)
.and(blockMember.blockedMember.id.eq(memberId)) .and(blockMember.blockedMember.id.eq(memberId))
@@ -228,9 +223,6 @@ class RankingRepository(
.and(audioContent.duration.isNotNull) .and(audioContent.duration.isNotNull)
.and(audioContent.limited.isNull) .and(audioContent.limited.isNull)
.and(blockMember.id.isNull) .and(blockMember.id.isNull)
.and(order.isActive.isTrue)
.and(order.createdAt.goe(startDate))
.and(order.createdAt.lt(endDate))
if (!isAdult) { if (!isAdult) {
where = where.and(series.isAdult.isFalse) where = where.and(series.isAdult.isFalse)
@@ -242,11 +234,9 @@ class RankingRepository(
.innerJoin(seriesContent.series, series) .innerJoin(seriesContent.series, series)
.innerJoin(seriesContent.content, audioContent) .innerJoin(seriesContent.content, audioContent)
.innerJoin(series.member, member) .innerJoin(series.member, member)
.leftJoin(order).on(audioContent.id.eq(order.audioContent.id))
.leftJoin(blockMember).on(blockMemberCondition) .leftJoin(blockMember).on(blockMemberCondition)
.where(where) .where(where)
.groupBy(series.id) .groupBy(series.id)
.orderBy(order.can.sum().desc())
.fetch() .fetch()
.size .size
} }
@@ -263,6 +253,11 @@ class RankingRepository(
.and(blockMember.isActive.isTrue) .and(blockMember.isActive.isTrue)
.and(blockMember.blockedMember.id.eq(memberId)) .and(blockMember.blockedMember.id.eq(memberId))
val orderCondition = order.isActive.isTrue
.and(audioContent.id.eq(order.audioContent.id))
.and(order.createdAt.goe(startDate))
.and(order.createdAt.lt(endDate))
var where = series.isActive.isTrue var where = series.isActive.isTrue
.and(series.state.eq(SeriesState.COMPLETE)) .and(series.state.eq(SeriesState.COMPLETE))
.and(audioContent.isActive.isTrue) .and(audioContent.isActive.isTrue)
@@ -272,9 +267,6 @@ class RankingRepository(
.and(audioContent.duration.isNotNull) .and(audioContent.duration.isNotNull)
.and(audioContent.limited.isNull) .and(audioContent.limited.isNull)
.and(blockMember.id.isNull) .and(blockMember.id.isNull)
.and(order.isActive.isTrue)
.and(order.createdAt.goe(startDate))
.and(order.createdAt.lt(endDate))
if (!isAdult) { if (!isAdult) {
where = where.and(series.isAdult.isFalse) where = where.and(series.isAdult.isFalse)
@@ -286,11 +278,11 @@ class RankingRepository(
.innerJoin(seriesContent.series, series) .innerJoin(seriesContent.series, series)
.innerJoin(seriesContent.content, audioContent) .innerJoin(seriesContent.content, audioContent)
.innerJoin(series.member, member) .innerJoin(series.member, member)
.leftJoin(order).on(audioContent.id.eq(order.audioContent.id)) .leftJoin(order).on(orderCondition)
.leftJoin(blockMember).on(blockMemberCondition) .leftJoin(blockMember).on(blockMemberCondition)
.where(where) .where(where)
.groupBy(series.id) .groupBy(series.id)
.orderBy(order.can.sum().desc()) .orderBy(order.id.count().desc(), series.id.desc())
.offset(offset) .offset(offset)
.limit(limit) .limit(limit)
.fetch() .fetch()

8
src/main/kotlin/kr/co/vividnext/sodalive/rank/RankingService.kt
View File

@@ -84,15 +84,11 @@ class RankingService(
fun getCompleteSeriesRankingTotalCount( fun getCompleteSeriesRankingTotalCount(
memberId: Long, memberId: Long,
isAdult: Boolean, isAdult: Boolean
startDate: LocalDateTime,
endDate: LocalDateTime
): Int { ): Int {
return repository.getCompleteSeriesRankingTotalCount( return repository.getCompleteSeriesRankingTotalCount(
memberId = memberId, memberId = memberId,
isAdult = isAdult, isAdult = isAdult
startDate = startDate,
endDate = endDate
) )
} }