src/main/kotlin/kr/co/vividnext/sodalive/content/main/tab/content/ContentMainTabTagCurationRepository.kt

@@ -20,6 +20,10 @@ class ContentMainTabTagCurationRepository(
 ) {
     fun getTagList(isAdult: Boolean): List<String> {
         var where = contentHashTagCuration.isActive.isTrue
+            .and(audioContent.isActive.isTrue)
+            .and(audioContent.duration.isNotNull)
+            .and(audioContent.limited.isNull)
+            .and(contentHashTagCurationItem.isActive.isTrue)
 
         if (!isAdult) {
             where = where.and(contentHashTagCuration.isAdult.isFalse)
@@ -28,7 +32,12 @@ class ContentMainTabTagCurationRepository(
         return queryFactory
             .select(contentHashTagCuration.tag)
             .from(contentHashTagCuration)
+            .innerJoin(contentHashTagCurationItem)
+            .on(contentHashTagCurationItem.curation.id.eq(contentHashTagCuration.id))
+            .innerJoin(contentHashTagCurationItem.content, audioContent)
             .where(where)
+            .groupBy(contentHashTagCuration.id)
+            .having(contentHashTagCurationItem.id.countDistinct().gt(0))
             .orderBy(contentHashTagCuration.orders.asc())
             .fetch()
     }