From 0aecd36956981c171d1cc239dfded2dc6fe0d393 Mon Sep 17 00:00:00 2001 From: Klaus Date: Mon, 16 Oct 2023 22:38:23 +0900 Subject: [PATCH] =?UTF-8?q?=EC=BD=98=ED=85=90=EC=B8=A0=20=EB=A9=94?= =?UTF-8?q?=EC=9D=B8=20-=20=EC=9D=B8=EA=B8=B0=20=EC=BD=98=ED=85=90?= =?UTF-8?q?=EC=B8=A0=20=EC=A7=91=EA=B3=84=EB=82=A0=EC=A7=9C=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../vividnext/sodalive/content/AudioContentRepository.kt | 2 +- .../sodalive/content/main/AudioContentMainService.kt | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) 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 )