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 15a1427..2966970 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/content/AudioContentRepository.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/content/AudioContentRepository.kt @@ -145,7 +145,7 @@ class AudioContentQueryRepositoryImpl(private val queryFactory: JPAQueryFactory) limit: Long ): List { val orderBy = when (sortType) { - SortType.NEWEST -> audioContent.createdAt.desc() + SortType.NEWEST -> audioContent.releaseDate.desc() SortType.PRICE_HIGH -> audioContent.price.desc() SortType.PRICE_LOW -> audioContent.price.asc() } @@ -290,13 +290,13 @@ class AudioContentQueryRepositoryImpl(private val queryFactory: JPAQueryFactory) .where(where) .offset(offset) .limit(limit) - .orderBy(audioContent.createdAt.desc()) + .orderBy(audioContent.releaseDate.desc()) .fetch() } override fun totalCountNewContentFor2Weeks(theme: String, memberId: Long, isAdult: Boolean): Int { var where = audioContent.isActive.isTrue - .and(audioContent.createdAt.goe(LocalDateTime.now().minusWeeks(2))) + .and(audioContent.releaseDate.goe(LocalDateTime.now().minusWeeks(2))) .and( audioContent.releaseDate.isNull .or(audioContent.releaseDate.loe(LocalDateTime.now())) @@ -330,7 +330,7 @@ class AudioContentQueryRepositoryImpl(private val queryFactory: JPAQueryFactory) limit: Long ): List { var where = audioContent.isActive.isTrue - .and(audioContent.createdAt.goe(LocalDateTime.now().minusWeeks(2))) + .and(audioContent.releaseDate.goe(LocalDateTime.now().minusWeeks(2))) .and( audioContent.releaseDate.isNull .or(audioContent.releaseDate.loe(LocalDateTime.now())) @@ -362,7 +362,7 @@ class AudioContentQueryRepositoryImpl(private val queryFactory: JPAQueryFactory) .where(where) .offset(offset) .limit(limit) - .orderBy(audioContent.createdAt.desc()) + .orderBy(audioContent.releaseDate.desc()) .fetch() } @@ -370,7 +370,7 @@ class AudioContentQueryRepositoryImpl(private val queryFactory: JPAQueryFactory) cloudfrontHost: String, isAdult: Boolean ): List { - var where = audioContent.createdAt.after(LocalDateTime.now().minusWeeks(2)) + var where = audioContent.releaseDate.after(LocalDateTime.now().minusWeeks(2)) .and(audioContent.isActive.isTrue) if (!isAdult) { diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/content/AudioContentService.kt b/src/main/kotlin/kr/co/vividnext/sodalive/content/AudioContentService.kt index 8e4efdb..11ae487 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/content/AudioContentService.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/content/AudioContentService.kt @@ -151,7 +151,7 @@ class AudioContentService( .withZoneSameInstant(ZoneId.of("UTC")) .toLocalDateTime() } else { - null + LocalDateTime.now() } // contentFile 체크 diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/creator/admin/content/CreatorAdminContentRepository.kt b/src/main/kotlin/kr/co/vividnext/sodalive/creator/admin/content/CreatorAdminContentRepository.kt index 3cb2364..e856992 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/creator/admin/content/CreatorAdminContentRepository.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/creator/admin/content/CreatorAdminContentRepository.kt @@ -94,7 +94,7 @@ class CreatorAdminAudioContentQueryRepositoryImpl( .where(where) .offset(offset) .limit(limit) - .orderBy(audioContent.id.desc()) + .orderBy(audioContent.releaseDate.desc()) .fetch() }