diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/content/AudioContentRepository.kt b/src/main/kotlin/kr/co/vividnext/sodalive/content/AudioContentRepository.kt index 685d7fa..038f732 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/content/AudioContentRepository.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/content/AudioContentRepository.kt @@ -477,7 +477,7 @@ class AudioContentQueryRepositoryImpl(private val queryFactory: JPAQueryFactory) .innerJoin(audioContent.theme, audioContentTheme) .where(where) .groupBy(audioContent.id) - .orderBy(order.can.sum().desc()) + .orderBy(order.can.sum().desc(), audioContent.createdAt.asc()) .offset(offset) .limit(limit) .fetch() diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/content/main/AudioContentMainService.kt b/src/main/kotlin/kr/co/vividnext/sodalive/content/main/AudioContentMainService.kt index d54007c..5b6b050 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/content/main/AudioContentMainService.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/content/main/AudioContentMainService.kt @@ -132,11 +132,11 @@ class AudioContentMainService( val currentDateTime = LocalDateTime.now() val startDate = currentDateTime + .minusWeeks(1) + .with(TemporalAdjusters.previousOrSame(DayOfWeek.MONDAY)) .withHour(15) .withMinute(0) .withSecond(0) - .minusWeeks(1) - .with(TemporalAdjusters.previousOrSame(DayOfWeek.MONDAY)) val endDate = startDate .plusDays(7) @@ -146,8 +146,8 @@ class AudioContentMainService( val contentRankingItemList = repository .getAudioContentRanking( cloudfrontHost = imageHost, - startDate = startDate, - endDate = endDate, + startDate = startDate.minusDays(1), + endDate = endDate.minusDays(1), isAdult = isAdult )