diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/admin/content/curation/AdminContentCurationRepository.kt b/src/main/kotlin/kr/co/vividnext/sodalive/admin/content/curation/AdminContentCurationRepository.kt index c010b03..610a1c1 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/admin/content/curation/AdminContentCurationRepository.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/admin/content/curation/AdminContentCurationRepository.kt @@ -112,7 +112,10 @@ class AdminContentCurationQueryRepositoryImpl( series.isActive.isTrue .and(series.member.isNotNull) .and(series.title.contains(searchWord)) - .and(audioContentCurationItem.id.isNull) + .and( + audioContentCurationItem.id.isNull + .or(audioContentCurationItem.isActive.isFalse) + ) ) .fetch() } diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/content/main/tab/series/AudioContentMainTabSeriesService.kt b/src/main/kotlin/kr/co/vividnext/sodalive/content/main/tab/series/AudioContentMainTabSeriesService.kt index 479c015..44d256f 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/content/main/tab/series/AudioContentMainTabSeriesService.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/content/main/tab/series/AudioContentMainTabSeriesService.kt @@ -130,6 +130,7 @@ class AudioContentMainTabSeriesService( ) ) } + .filter { it.items.isNotEmpty() } return GetContentMainTabSeriesResponse( contentBannerList = contentBannerList, diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/content/series/ContentSeriesRepository.kt b/src/main/kotlin/kr/co/vividnext/sodalive/content/series/ContentSeriesRepository.kt index 97631d0..0dd3803 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/content/series/ContentSeriesRepository.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/content/series/ContentSeriesRepository.kt @@ -233,6 +233,8 @@ class ContentSeriesQueryRepositoryImpl( var where = series.isActive.isTrue .and(member.isActive.isTrue) .and(member.role.eq(MemberRole.CREATOR)) + .and(audioContentCuration.id.eq(curationId)) + .and(audioContentCurationItem.isActive.isTrue) .and(blockMember.id.isNull) if (!isAdult) { @@ -247,6 +249,7 @@ class ContentSeriesQueryRepositoryImpl( .innerJoin(series.member, member) .leftJoin(blockMember).on(blockMemberCondition) .where(where) + .orderBy(audioContentCurationItem.orders.asc()) .fetch() } }