src/main/kotlin/kr/co/vividnext/sodalive/content/AudioContentRepository.kt

@@ -24,7 +24,6 @@ import kr.co.vividnext.sodalive.content.theme.QAudioContentTheme.audioContentThe
 import kr.co.vividnext.sodalive.event.QEvent.event
 import kr.co.vividnext.sodalive.member.MemberRole
 import kr.co.vividnext.sodalive.member.QMember.member
-import kr.co.vividnext.sodalive.member.block.QBlockMember.blockMember
 import org.springframework.beans.factory.annotation.Value
 import org.springframework.data.jpa.repository.JpaRepository
 import org.springframework.stereotype.Repository
@@ -62,14 +61,14 @@ interface AudioContentQueryRepository {
     ): List<OtherContentResponse>
 
     fun findByTheme(
+        cloudfrontHost: String,
         memberId: Long,
         theme: String = "",
         sortType: SortType = SortType.NEWEST,
         isAdult: Boolean = false,
         contentType: ContentType,
         offset: Long = 0,
-        limit: Long = 20,
+        limit: Long = 20
-        isFree: Boolean = false
     ): List<GetAudioContentMainItem>
 
     fun totalCountByTheme(
@@ -105,6 +104,7 @@ interface AudioContentQueryRepository {
     fun getAudioContentCurations(isAdult: Boolean): List<AudioContentCuration>
     fun findAudioContentByCurationId(
         curationId: Long,
+        cloudfrontHost: String,
         isAdult: Boolean,
         contentType: ContentType
     ): List<GetAudioContentMainItem>
@@ -334,19 +334,15 @@ class AudioContentQueryRepositoryImpl(
     }
 
     override fun findByTheme(
+        cloudfrontHost: String,
         memberId: Long,
         theme: String,
         sortType: SortType,
         isAdult: Boolean,
         contentType: ContentType,
         offset: Long,
-        limit: Long,
+        limit: Long
-        isFree: Boolean
     ): List<GetAudioContentMainItem> {
-        val blockMemberCondition = blockMember.member.id.eq(member.id)
-            .and(blockMember.isActive.isTrue)
-            .and(blockMember.blockedMember.id.eq(memberId))
-
         val orderBy = when (sortType) {
             SortType.NEWEST -> listOf(audioContent.releaseDate.desc(), audioContent.id.desc())
             SortType.PRICE_HIGH -> listOf(
@@ -369,7 +365,6 @@ class AudioContentQueryRepositoryImpl(
                     .or(audioContent.releaseDate.loe(LocalDateTime.now()))
                     .or(audioContent.member.id.eq(memberId))
             )
-            .and(blockMember.id.isNull)
 
         if (!isAdult) {
             where = where.and(audioContent.isAdult.isFalse)
@@ -385,18 +380,14 @@ class AudioContentQueryRepositoryImpl(
             where = where.and(audioContentTheme.theme.eq(theme))
         }
 
-        if (isFree) {
-            where = where.and(audioContent.price.loe(0))
-        }
-
         return queryFactory
             .select(
                 QGetAudioContentMainItem(
                     audioContent.id,
-                    audioContent.coverImage.prepend("/").prepend(imageHost),
+                    audioContent.coverImage.prepend("/").prepend(cloudfrontHost),
                     audioContent.title,
                     member.id,
-                    member.profileImage.prepend("/").prepend(imageHost),
+                    member.profileImage.prepend("/").prepend(cloudfrontHost),
                     member.nickname,
                     audioContent.price,
                     audioContent.duration
@@ -405,7 +396,6 @@ class AudioContentQueryRepositoryImpl(
             .from(audioContent)
             .innerJoin(audioContent.member, member)
             .innerJoin(audioContent.theme, audioContentTheme)
-            .leftJoin(blockMember).on(blockMemberCondition)
             .where(where)
             .offset(offset)
             .limit(limit)
@@ -606,6 +596,7 @@ class AudioContentQueryRepositoryImpl(
 
     override fun findAudioContentByCurationId(
         curationId: Long,
+        cloudfrontHost: String,
         isAdult: Boolean,
         contentType: ContentType
     ): List<GetAudioContentMainItem> {
@@ -629,12 +620,12 @@ class AudioContentQueryRepositoryImpl(
             .select(
                 QGetAudioContentMainItem(
                     audioContent.id,
-                    audioContent.coverImage.prepend("/").prepend(imageHost),
+                    audioContent.coverImage.prepend("/").prepend(cloudfrontHost),
                     audioContent.title,
                     member.id,
                     member.profileImage
                         .prepend("/")
-                        .prepend(imageHost),
+                        .prepend(cloudfrontHost),
                     member.nickname,
                     audioContent.price,
                     audioContent.duration

src/main/kotlin/kr/co/vividnext/sodalive/content/main/AudioContentMainService.kt

@@ -39,6 +39,7 @@ class AudioContentMainService(
         pageable: Pageable
     ): List<GetAudioContentMainItem> {
         return repository.findByTheme(
+            cloudfrontHost = imageHost,
             memberId = member.id!!,
             theme = theme,
             isAdult = member.auth != null && isAdultContentVisible,
@@ -46,6 +47,7 @@ class AudioContentMainService(
             offset = pageable.offset,
             limit = pageable.pageSize.toLong()
         )
+            .filter { !blockMemberRepository.isBlocked(blockedMemberId = member.id!!, memberId = it.creatorId) }
     }
 
     @Transactional(readOnly = true)
@@ -162,6 +164,7 @@ class AudioContentMainService(
                 description = it.description,
                 contents = repository.findAudioContentByCurationId(
                     curationId = it.id!!,
+                    cloudfrontHost = imageHost,
                     isAdult = isAdult,
                     contentType = contentType
                 )

src/main/kotlin/kr/co/vividnext/sodalive/content/main/curation/AudioContentCurationQueryRepository.kt

@@ -6,8 +6,6 @@ import kr.co.vividnext.sodalive.content.QAudioContent.audioContent
 import kr.co.vividnext.sodalive.content.SortType
 import kr.co.vividnext.sodalive.content.main.GetAudioContentMainItem
 import kr.co.vividnext.sodalive.content.main.QGetAudioContentMainItem
-import kr.co.vividnext.sodalive.content.main.curation.QAudioContentCuration.audioContentCuration
-import kr.co.vividnext.sodalive.content.main.tab.QAudioContentMainTab.audioContentMainTab
 import kr.co.vividnext.sodalive.content.theme.QAudioContentTheme.audioContentTheme
 import kr.co.vividnext.sodalive.member.QMember.member
 import org.springframework.stereotype.Repository
@@ -89,42 +87,4 @@ class AudioContentCurationQueryRepository(private val queryFactory: JPAQueryFact
             .orderBy(orderBy)
             .fetch()
     }
-
-    fun findByContentMainTabId(tabId: Long, isAdult: Boolean): List<AudioContentCuration> {
-        var where = audioContentCuration.isActive.isTrue
-            .and(audioContentMainTab.id.eq(tabId))
-
-        if (!isAdult) {
-            where = where.and(audioContentCuration.isAdult.isFalse)
-        }
-
-        return queryFactory
-            .selectFrom(audioContentCuration)
-            .innerJoin(audioContentCuration.tab, audioContentMainTab)
-            .where(where)
-            .orderBy(audioContentCuration.orders.asc())
-            .fetch()
-    }
-
-    fun findByContentMainTabIdAndTitle(
-        tabId: Long,
-        title: String,
-        isAdult: Boolean,
-        offset: Long = 0,
-        limit: Long = 12
-    ): List<AudioContentCuration> {
-        var where = audioContentCuration.isActive.isTrue
-            .and(audioContentMainTab.id.eq(tabId))
-
-        if (!isAdult) {
-            where = where.and(audioContentCuration.isAdult.isFalse)
-        }
-
-        return queryFactory
-            .selectFrom(audioContentCuration)
-            .innerJoin(audioContentCuration.tab, audioContentMainTab)
-            .where(where)
-            .orderBy(audioContentCuration.orders.asc())
-            .fetch()
-    }
 }

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

@@ -1,8 +0,0 @@
-package kr.co.vividnext.sodalive.content.main.tab
-
-import kr.co.vividnext.sodalive.content.main.GetAudioContentMainItem
-
-data class GetContentCurationResponse(
-    val title: String,
-    val items: List<GetAudioContentMainItem>
-)

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

@@ -1,11 +0,0 @@
-package kr.co.vividnext.sodalive.content.main.tab
-
-import com.querydsl.core.annotations.QueryProjection
-
-data class GetRecommendSeriesListResponse @QueryProjection constructor(
-    val seriesId: Long,
-    val title: String,
-    val imageUrl: String,
-    val creatorId: Long,
-    val creatorNickname: String
-)

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

@@ -1,70 +0,0 @@
-package kr.co.vividnext.sodalive.content.main.tab
-
-import com.querydsl.jpa.impl.JPAQueryFactory
-import kr.co.vividnext.sodalive.content.main.tab.QRecommendSeries.recommendSeries
-import kr.co.vividnext.sodalive.creator.admin.content.series.QSeries.series
-import kr.co.vividnext.sodalive.member.QMember.member
-import org.springframework.beans.factory.annotation.Value
-import org.springframework.stereotype.Repository
-
-@Repository
-class RecommendSeriesRepository(
-    private val queryFactory: JPAQueryFactory,
-
-    @Value("\${cloud.aws.cloud-front.host}")
-    private val imageHost: String
-) {
-    fun getNewSeriesList(isAdult: Boolean): List<GetRecommendSeriesListResponse> {
-        var where = recommendSeries.isActive.isTrue
-            .and(recommendSeries.isFree.isFalse)
-            .and(series.isActive.isTrue)
-
-        if (!isAdult) {
-            where = where.and(series.isAdult.isFalse)
-        }
-
-        return queryFactory
-            .select(
-                QGetRecommendSeriesListResponse(
-                    series.id,
-                    series.title,
-                    recommendSeries.imagePath.prepend("/").prepend(imageHost),
-                    member.id,
-                    member.nickname
-                )
-            )
-            .from(recommendSeries)
-            .innerJoin(recommendSeries.series, series)
-            .innerJoin(series.member, member)
-            .where(where)
-            .orderBy(recommendSeries.orders.asc())
-            .fetch()
-    }
-
-    fun getRecommendSeriesList(isAdult: Boolean): List<GetRecommendSeriesListResponse> {
-        var where = recommendSeries.isActive.isTrue
-            .and(recommendSeries.isFree.isTrue)
-            .and(series.isActive.isTrue)
-
-        if (!isAdult) {
-            where = where.and(series.isAdult.isFalse)
-        }
-
-        return queryFactory
-            .select(
-                QGetRecommendSeriesListResponse(
-                    series.id,
-                    series.title,
-                    recommendSeries.imagePath.prepend("/").prepend(imageHost),
-                    member.id,
-                    member.nickname
-                )
-            )
-            .from(recommendSeries)
-            .innerJoin(recommendSeries.series, series)
-            .innerJoin(series.member, member)
-            .where(where)
-            .orderBy(recommendSeries.orders.asc())
-            .fetch()
-    }
-}

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

@@ -1,22 +0,0 @@
-package kr.co.vividnext.sodalive.content.main.tab.alarm
-
-import kr.co.vividnext.sodalive.common.ApiResponse
-import kr.co.vividnext.sodalive.common.SodaException
-import kr.co.vividnext.sodalive.member.Member
-import org.springframework.security.core.annotation.AuthenticationPrincipal
-import org.springframework.web.bind.annotation.GetMapping
-import org.springframework.web.bind.annotation.RequestMapping
-import org.springframework.web.bind.annotation.RestController
-
-@RestController
-@RequestMapping("/v2/audio-content/main/alarm")
-class AudioContentMainTabAlarmController(private val service: AudioContentMainTabAlarmService) {
-    @GetMapping
-    fun fetchContentMainTabAlarm(
-        @AuthenticationPrincipal(expression = "#this == 'anonymousUser' ? null : member") member: Member?
-    ) = run {
-        if (member == null) throw SodaException("로그인 정보를 확인해주세요.")
-
-        ApiResponse.ok(service.fetchData(member))
-    }
-}

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

@@ -1,84 +0,0 @@
-package kr.co.vividnext.sodalive.content.main.tab.alarm
-
-import kr.co.vividnext.sodalive.content.AudioContentRepository
-import kr.co.vividnext.sodalive.content.ContentType
-import kr.co.vividnext.sodalive.content.main.banner.AudioContentBannerService
-import kr.co.vividnext.sodalive.content.main.curation.AudioContentCurationQueryRepository
-import kr.co.vividnext.sodalive.content.main.tab.GetContentCurationResponse
-import kr.co.vividnext.sodalive.event.EventService
-import kr.co.vividnext.sodalive.member.Member
-import kr.co.vividnext.sodalive.rank.RankingService
-import org.springframework.stereotype.Service
-import java.time.DayOfWeek
-import java.time.LocalDateTime
-import java.time.temporal.TemporalAdjusters
-
-@Service
-class AudioContentMainTabAlarmService(
-    private val bannerService: AudioContentBannerService,
-    private val contentRepository: AudioContentRepository,
-    private val rankingService: RankingService,
-    private val eventService: EventService,
-    private val curationRepository: AudioContentCurationQueryRepository
-) {
-    fun fetchData(member: Member): GetContentMainTabAlarmResponse {
-        val isAdult = member.auth != null
-        val memberId = member.id!!
-
-        val contentBannerList = bannerService.getBannerList(
-            tabId = 4,
-            memberId = memberId,
-            isAdult = isAdult
-        )
-
-        val alarmThemeList = listOf("모닝콜", "슬립콜", "알람")
-        val newAlarmContentList = contentRepository.findByTheme(
-            memberId = memberId,
-            theme = alarmThemeList[0],
-            isAdult = isAdult,
-            contentType = ContentType.ALL,
-            limit = 10
-        )
-
-        // 주간 랭킹 기간
-        val currentDateTime = LocalDateTime.now()
-        val startDate = currentDateTime
-            .withHour(15)
-            .withMinute(0)
-            .withSecond(0)
-            .minusWeeks(1)
-            .with(TemporalAdjusters.previousOrSame(DayOfWeek.MONDAY))
-        val endDate = startDate
-            .plusDays(6)
-
-        val rankAlarmContentList = rankingService.getContentRanking(
-            memberId = memberId,
-            isAdult = isAdult,
-            startDate = startDate,
-            endDate = endDate,
-            theme = alarmThemeList[0]
-        )
-
-        val eventBannerList = eventService.getEventList(isAdult = isAdult)
-        val curationList = curationRepository.findByContentMainTabId(tabId = 4, isAdult = isAdult)
-            .map {
-                GetContentCurationResponse(
-                    title = it.title,
-                    items = contentRepository.findAudioContentByCurationId(
-                        curationId = it.id!!,
-                        isAdult = isAdult,
-                        contentType = ContentType.ALL
-                    )
-                )
-            }
-
-        return GetContentMainTabAlarmResponse(
-            contentBannerList = contentBannerList,
-            alarmThemeList = alarmThemeList,
-            newAlarmContentList = newAlarmContentList,
-            rankAlarmContentList = rankAlarmContentList,
-            eventBannerList = eventBannerList,
-            curationList = curationList
-        )
-    }
-}

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

@@ -1,17 +0,0 @@
-package kr.co.vividnext.sodalive.content.main.tab.alarm
-
-import kr.co.vividnext.sodalive.content.main.GetAudioContentMainItem
-import kr.co.vividnext.sodalive.content.main.GetAudioContentRankingItem
-import kr.co.vividnext.sodalive.content.main.banner.GetAudioContentBannerResponse
-import kr.co.vividnext.sodalive.content.main.tab.GetContentCurationResponse
-import kr.co.vividnext.sodalive.event.GetEventResponse
-
-data class GetContentMainTabAlarmResponse(
-    val tab: Long = 4,
-    val contentBannerList: List<GetAudioContentBannerResponse>,
-    val alarmThemeList: List<String>,
-    val newAlarmContentList: List<GetAudioContentMainItem>,
-    val rankAlarmContentList: List<GetAudioContentRankingItem>,
-    val eventBannerList: GetEventResponse,
-    val curationList: List<GetContentCurationResponse>
-)

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

@@ -1,22 +0,0 @@
-package kr.co.vividnext.sodalive.content.main.tab.asmr
-
-import kr.co.vividnext.sodalive.common.ApiResponse
-import kr.co.vividnext.sodalive.common.SodaException
-import kr.co.vividnext.sodalive.member.Member
-import org.springframework.security.core.annotation.AuthenticationPrincipal
-import org.springframework.web.bind.annotation.GetMapping
-import org.springframework.web.bind.annotation.RequestMapping
-import org.springframework.web.bind.annotation.RestController
-
-@RestController
-@RequestMapping("/v2/audio-content/main/asmr")
-class AudioContentMainTabAsmrController(private val service: AudioContentMainTabAsmrService) {
-    @GetMapping
-    fun fetchContentMainTabAsmr(
-        @AuthenticationPrincipal(expression = "#this == 'anonymousUser' ? null : member") member: Member?
-    ) = run {
-        if (member == null) throw SodaException("로그인 정보를 확인해주세요.")
-
-        ApiResponse.ok(service.fetchData(member))
-    }
-}

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

@@ -1,84 +0,0 @@
-package kr.co.vividnext.sodalive.content.main.tab.asmr
-
-import kr.co.vividnext.sodalive.content.AudioContentRepository
-import kr.co.vividnext.sodalive.content.ContentType
-import kr.co.vividnext.sodalive.content.main.banner.AudioContentBannerService
-import kr.co.vividnext.sodalive.content.main.curation.AudioContentCurationQueryRepository
-import kr.co.vividnext.sodalive.content.main.tab.GetContentCurationResponse
-import kr.co.vividnext.sodalive.event.EventService
-import kr.co.vividnext.sodalive.member.Member
-import kr.co.vividnext.sodalive.rank.RankingService
-import org.springframework.stereotype.Service
-import java.time.DayOfWeek
-import java.time.LocalDateTime
-import java.time.temporal.TemporalAdjusters
-
-@Service
-class AudioContentMainTabAsmrService(
-    private val bannerService: AudioContentBannerService,
-    private val contentRepository: AudioContentRepository,
-    private val rankingService: RankingService,
-    private val eventService: EventService,
-    private val curationRepository: AudioContentCurationQueryRepository
-) {
-    fun fetchData(member: Member): GetContentMainTabAsmrResponse {
-        val isAdult = member.auth != null
-        val memberId = member.id!!
-        val theme = "ASMR"
-        val tabId = 5L
-
-        val contentBannerList = bannerService.getBannerList(
-            tabId = tabId,
-            memberId = memberId,
-            isAdult = isAdult
-        )
-
-        val newAsmrContentList = contentRepository.findByTheme(
-            memberId = memberId,
-            theme = theme,
-            isAdult = isAdult,
-            contentType = ContentType.ALL,
-            limit = 10
-        )
-
-        val currentDateTime = LocalDateTime.now()
-        val startDate = currentDateTime
-            .withHour(15)
-            .withMinute(0)
-            .withSecond(0)
-            .minusWeeks(1)
-            .with(TemporalAdjusters.previousOrSame(DayOfWeek.MONDAY))
-        val endDate = startDate
-            .plusDays(6)
-
-        val rankAsmrContentList = rankingService.getContentRanking(
-            memberId = memberId,
-            isAdult = isAdult,
-            startDate = startDate,
-            endDate = endDate,
-            theme = theme
-        )
-
-        val eventBannerList = eventService.getEventList(isAdult = isAdult)
-
-        val curationList = curationRepository.findByContentMainTabId(tabId = tabId, isAdult = isAdult)
-            .map {
-                GetContentCurationResponse(
-                    title = it.title,
-                    items = contentRepository.findAudioContentByCurationId(
-                        curationId = it.id!!,
-                        isAdult = isAdult,
-                        contentType = ContentType.ALL
-                    )
-                )
-            }
-
-        return GetContentMainTabAsmrResponse(
-            contentBannerList = contentBannerList,
-            newAsmrContentList = newAsmrContentList,
-            rankAsmrContentList = rankAsmrContentList,
-            eventBannerList = eventBannerList,
-            curationList = curationList
-        )
-    }
-}

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

@@ -1,16 +0,0 @@
-package kr.co.vividnext.sodalive.content.main.tab.asmr
-
-import kr.co.vividnext.sodalive.content.main.GetAudioContentMainItem
-import kr.co.vividnext.sodalive.content.main.GetAudioContentRankingItem
-import kr.co.vividnext.sodalive.content.main.banner.GetAudioContentBannerResponse
-import kr.co.vividnext.sodalive.content.main.tab.GetContentCurationResponse
-import kr.co.vividnext.sodalive.event.GetEventResponse
-
-data class GetContentMainTabAsmrResponse(
-    val tab: Long = 5,
-    val contentBannerList: List<GetAudioContentBannerResponse>,
-    val newAsmrContentList: List<GetAudioContentMainItem>,
-    val rankAsmrContentList: List<GetAudioContentRankingItem>,
-    val eventBannerList: GetEventResponse,
-    val curationList: List<GetContentCurationResponse>
-)

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

@@ -1,22 +0,0 @@
-package kr.co.vividnext.sodalive.content.main.tab.content
-
-import kr.co.vividnext.sodalive.common.ApiResponse
-import kr.co.vividnext.sodalive.common.SodaException
-import kr.co.vividnext.sodalive.member.Member
-import org.springframework.security.core.annotation.AuthenticationPrincipal
-import org.springframework.web.bind.annotation.GetMapping
-import org.springframework.web.bind.annotation.RequestMapping
-import org.springframework.web.bind.annotation.RestController
-
-@RestController
-@RequestMapping("/v2/audio-content/main/content")
-class AudioContentMainTabContentController(private val service: AudioContentMainTabContentService) {
-    @GetMapping
-    fun fetchContentMainTabContent(
-        @AuthenticationPrincipal(expression = "#this == 'anonymousUser' ? null : member") member: Member?
-    ) = run {
-        if (member == null) throw SodaException("로그인 정보를 확인해주세요.")
-
-        ApiResponse.ok(service.fetchData(member))
-    }
-}

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

@@ -1,105 +0,0 @@
-package kr.co.vividnext.sodalive.content.main.tab.content
-
-import kr.co.vividnext.sodalive.content.AudioContentRepository
-import kr.co.vividnext.sodalive.content.ContentType
-import kr.co.vividnext.sodalive.content.main.banner.AudioContentBannerService
-import kr.co.vividnext.sodalive.content.theme.AudioContentThemeQueryRepository
-import kr.co.vividnext.sodalive.event.EventService
-import kr.co.vividnext.sodalive.member.Member
-import kr.co.vividnext.sodalive.rank.RankingService
-import org.springframework.stereotype.Service
-import java.time.LocalDateTime
-
-@Service
-class AudioContentMainTabContentService(
-    private val bannerService: AudioContentBannerService,
-    private val audioContentRepository: AudioContentRepository,
-    private val audioContentThemeRepository: AudioContentThemeQueryRepository,
-    private val rankingService: RankingService,
-    private val eventService: EventService
-) {
-    fun fetchData(member: Member): GetContentMainTabContentResponse {
-        val memberId = member.id!!
-        val isAdult = member.auth != null
-
-        // 단편 배너
-        val contentBannerList = bannerService.getBannerList(
-            tabId = 3,
-            memberId = memberId,
-            isAdult = isAdult
-        )
-
-        // 새로운 단편 테마
-        val themeOfContentList = audioContentThemeRepository.getActiveThemeOfContent(isAdult = isAdult)
-
-        // 새로운 단편
-        val newContentList = if (themeOfContentList.isNotEmpty()) {
-            audioContentRepository.findByTheme(
-                memberId = member.id!!,
-                theme = themeOfContentList[0],
-                isAdult = member.auth != null,
-                contentType = ContentType.ALL,
-                offset = 0,
-                limit = 10
-            )
-        } else {
-            emptyList()
-        }
-
-        // 일간 랭킹
-        val currentDateTime = LocalDateTime.now()
-        val dailyRankingStartDate = currentDateTime
-            .withHour(15)
-            .withMinute(0)
-            .withSecond(0)
-            .minusDays(2)
-        val dailyRankingEndDate = dailyRankingStartDate
-            .plusDays(1)
-
-        val rankContentList = rankingService.getContentRanking(
-            memberId = memberId,
-            isAdult = isAdult,
-            startDate = dailyRankingStartDate,
-            endDate = dailyRankingEndDate
-        )
-
-        // 이벤트 배너
-        val eventBannerList = eventService.getEventList(isAdult = isAdult)
-
-        val contentRankCreatorList = rankingService.fetchCreatorByContentRevenueRankTop20(
-            memberId = member.id!!,
-            startDate = dailyRankingStartDate.minusDays(1),
-            endDate = dailyRankingEndDate
-        )
-
-        val salesRankContentList = if (contentRankCreatorList.isNotEmpty()) {
-            rankingService.fetchCreatorContentBySalesTop2(
-                creatorId = contentRankCreatorList[0].creatorId,
-                isAdult = member.auth != null
-            )
-        } else {
-            emptyList()
-        }
-
-        val salesCountRankContentList = if (contentRankCreatorList.isNotEmpty()) {
-            rankingService.fetchCreatorContentBySalesCountTop2(
-                creatorId = contentRankCreatorList[0].creatorId,
-                isAdult = member.auth != null
-            )
-        } else {
-            emptyList()
-        }
-
-        return GetContentMainTabContentResponse(
-            bannerList = contentBannerList,
-            contentThemeList = themeOfContentList,
-            newContentList = newContentList,
-            rankSortTypeList = listOf("매출", "댓글", "좋아요"),
-            rankContentList = rankContentList,
-            contentRankCreatorList = contentRankCreatorList,
-            salesRankContentList = salesRankContentList,
-            salesCountRankContentList = salesCountRankContentList,
-            eventBannerList = eventBannerList
-        )
-    }
-}

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

@@ -1,20 +0,0 @@
-package kr.co.vividnext.sodalive.content.main.tab.content
-
-import kr.co.vividnext.sodalive.content.main.ContentCreatorResponse
-import kr.co.vividnext.sodalive.content.main.GetAudioContentMainItem
-import kr.co.vividnext.sodalive.content.main.GetAudioContentRankingItem
-import kr.co.vividnext.sodalive.content.main.banner.GetAudioContentBannerResponse
-import kr.co.vividnext.sodalive.event.GetEventResponse
-
-data class GetContentMainTabContentResponse(
-    val tabId: Long = 3,
-    val bannerList: List<GetAudioContentBannerResponse>,
-    val contentThemeList: List<String>,
-    val newContentList: List<GetAudioContentMainItem>,
-    val rankSortTypeList: List<String>,
-    val rankContentList: List<GetAudioContentRankingItem>,
-    val contentRankCreatorList: List<ContentCreatorResponse>,
-    val salesRankContentList: List<GetAudioContentRankingItem>,
-    val salesCountRankContentList: List<GetAudioContentRankingItem>,
-    val eventBannerList: GetEventResponse
-)

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

@@ -1,22 +0,0 @@
-package kr.co.vividnext.sodalive.content.main.tab.free
-
-import kr.co.vividnext.sodalive.common.ApiResponse
-import kr.co.vividnext.sodalive.common.SodaException
-import kr.co.vividnext.sodalive.member.Member
-import org.springframework.security.core.annotation.AuthenticationPrincipal
-import org.springframework.web.bind.annotation.GetMapping
-import org.springframework.web.bind.annotation.RequestMapping
-import org.springframework.web.bind.annotation.RestController
-
-@RestController
-@RequestMapping("/v2/audio-content/main/series")
-class AudioContentMainTabFreeController(private val service: AudioContentMainTabFreeService) {
-    @GetMapping
-    fun fetchContentMainFree(
-        @AuthenticationPrincipal(expression = "#this == 'anonymousUser' ? null : member") member: Member?
-    ) = run {
-        if (member == null) throw SodaException("로그인 정보를 확인해주세요.")
-
-        ApiResponse.ok(service.fetchData(member))
-    }
-}

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

@@ -1,91 +0,0 @@
-package kr.co.vividnext.sodalive.content.main.tab.free
-
-import kr.co.vividnext.sodalive.content.AudioContentRepository
-import kr.co.vividnext.sodalive.content.ContentType
-import kr.co.vividnext.sodalive.content.main.banner.AudioContentBannerService
-import kr.co.vividnext.sodalive.content.main.curation.AudioContentCurationQueryRepository
-import kr.co.vividnext.sodalive.content.main.tab.GetContentCurationResponse
-import kr.co.vividnext.sodalive.content.main.tab.RecommendSeriesRepository
-import kr.co.vividnext.sodalive.content.theme.AudioContentThemeQueryRepository
-import kr.co.vividnext.sodalive.member.Member
-import org.springframework.stereotype.Service
-
-@Service
-class AudioContentMainTabFreeService(
-    private val bannerService: AudioContentBannerService,
-    private val recommendSeriesRepository: RecommendSeriesRepository,
-    private val curationRepository: AudioContentCurationQueryRepository,
-    private val contentRepository: AudioContentRepository,
-    private val audioContentRepository: AudioContentRepository,
-    private val audioContentThemeRepository: AudioContentThemeQueryRepository
-) {
-    fun fetchData(member: Member): GetContentMainTabFreeResponse {
-        val isAdult = member.auth != null
-        val memberId = member.id!!
-        val tabId = 7L
-
-        val contentBannerList = bannerService.getBannerList(
-            tabId = tabId,
-            memberId = memberId,
-            isAdult = isAdult
-        )
-
-        val introduceCreator = curationRepository.findByContentMainTabIdAndTitle(
-            tabId = tabId,
-            title = "크리에이터 소개",
-            isAdult = isAdult
-        )
-            .map {
-                GetContentCurationResponse(
-                    title = it.title,
-                    items = contentRepository.findAudioContentByCurationId(
-                        curationId = it.id!!,
-                        isAdult = isAdult,
-                        contentType = ContentType.ALL
-                    )
-                )
-            }
-
-        val recommendSeriesList = recommendSeriesRepository.getRecommendSeriesList(isAdult = isAdult)
-
-        val themeList = audioContentThemeRepository.getActiveThemeOfContent(isAdult = isAdult)
-        val newFreeContentList = if (themeList.isNotEmpty()) {
-            audioContentRepository.findByTheme(
-                memberId = member.id!!,
-                theme = themeList[0],
-                isAdult = member.auth != null,
-                contentType = ContentType.ALL,
-                offset = 0,
-                limit = 10,
-                isFree = true
-            )
-        } else {
-            emptyList()
-        }
-
-        val curationList = curationRepository.findByContentMainTabId(tabId = tabId, isAdult = isAdult)
-            .map {
-                GetContentCurationResponse(
-                    title = it.title,
-                    items = contentRepository.findAudioContentByCurationId(
-                        curationId = it.id!!,
-                        isAdult = isAdult,
-                        contentType = ContentType.ALL
-                    )
-                )
-            }
-
-        return GetContentMainTabFreeResponse(
-            contentBannerList = contentBannerList,
-            introduceCreator = if (introduceCreator.isNotEmpty()) {
-                introduceCreator[0]
-            } else {
-                null
-            },
-            recommendSeriesList = recommendSeriesList,
-            themeList = themeList,
-            newFreeContentList = newFreeContentList,
-            curationList = curationList
-        )
-    }
-}

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

@@ -1,16 +0,0 @@
-package kr.co.vividnext.sodalive.content.main.tab.free
-
-import kr.co.vividnext.sodalive.content.main.GetAudioContentMainItem
-import kr.co.vividnext.sodalive.content.main.banner.GetAudioContentBannerResponse
-import kr.co.vividnext.sodalive.content.main.tab.GetContentCurationResponse
-import kr.co.vividnext.sodalive.content.main.tab.GetRecommendSeriesListResponse
-
-data class GetContentMainTabFreeResponse(
-    val tabId: Long = 7,
-    val contentBannerList: List<GetAudioContentBannerResponse>,
-    val introduceCreator: GetContentCurationResponse?,
-    val recommendSeriesList: List<GetRecommendSeriesListResponse>,
-    val themeList: List<String>,
-    val newFreeContentList: List<GetAudioContentMainItem>,
-    val curationList: List<GetContentCurationResponse>
-)

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

@@ -1,22 +0,0 @@
-package kr.co.vividnext.sodalive.content.main.tab.replay
-
-import kr.co.vividnext.sodalive.common.ApiResponse
-import kr.co.vividnext.sodalive.common.SodaException
-import kr.co.vividnext.sodalive.member.Member
-import org.springframework.security.core.annotation.AuthenticationPrincipal
-import org.springframework.web.bind.annotation.GetMapping
-import org.springframework.web.bind.annotation.RequestMapping
-import org.springframework.web.bind.annotation.RestController
-
-@RestController
-@RequestMapping("/v2/audio-content/main/replay")
-class AudioContentMainTabLiveReplayController(private val service: AudioContentMainTabLiveReplayService) {
-    @GetMapping
-    fun fetchContentMainTabLiveReplay(
-        @AuthenticationPrincipal(expression = "#this == 'anonymousUser' ? null : member") member: Member?
-    ) = run {
-        if (member == null) throw SodaException("로그인 정보를 확인해주세요.")
-
-        ApiResponse.ok(service.fetchData(member))
-    }
-}

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

@@ -1,84 +0,0 @@
-package kr.co.vividnext.sodalive.content.main.tab.replay
-
-import kr.co.vividnext.sodalive.content.AudioContentRepository
-import kr.co.vividnext.sodalive.content.ContentType
-import kr.co.vividnext.sodalive.content.main.banner.AudioContentBannerService
-import kr.co.vividnext.sodalive.content.main.curation.AudioContentCurationQueryRepository
-import kr.co.vividnext.sodalive.content.main.tab.GetContentCurationResponse
-import kr.co.vividnext.sodalive.event.EventService
-import kr.co.vividnext.sodalive.member.Member
-import kr.co.vividnext.sodalive.rank.RankingService
-import org.springframework.stereotype.Service
-import java.time.DayOfWeek
-import java.time.LocalDateTime
-import java.time.temporal.TemporalAdjusters
-
-@Service
-class AudioContentMainTabLiveReplayService(
-    private val bannerService: AudioContentBannerService,
-    private val contentRepository: AudioContentRepository,
-    private val rankingService: RankingService,
-    private val eventService: EventService,
-    private val curationRepository: AudioContentCurationQueryRepository
-) {
-    fun fetchData(member: Member): GetContentMainTabLiveReplayResponse {
-        val isAdult = member.auth != null
-        val memberId = member.id!!
-        val theme = "다시듣기"
-        val tabId = 6L
-
-        val contentBannerList = bannerService.getBannerList(
-            tabId = tabId,
-            memberId = memberId,
-            isAdult = isAdult
-        )
-
-        val newLiveReplayContentList = contentRepository.findByTheme(
-            memberId = memberId,
-            theme = theme,
-            isAdult = isAdult,
-            contentType = ContentType.ALL,
-            limit = 10
-        )
-
-        val currentDateTime = LocalDateTime.now()
-        val startDate = currentDateTime
-            .withHour(15)
-            .withMinute(0)
-            .withSecond(0)
-            .minusWeeks(1)
-            .with(TemporalAdjusters.previousOrSame(DayOfWeek.MONDAY))
-        val endDate = startDate
-            .plusDays(6)
-
-        val rankLiveReplayContentList = rankingService.getContentRanking(
-            memberId = memberId,
-            isAdult = isAdult,
-            startDate = startDate,
-            endDate = endDate,
-            theme = theme
-        )
-
-        val eventBannerList = eventService.getEventList(isAdult = isAdult)
-
-        val curationList = curationRepository.findByContentMainTabId(tabId = tabId, isAdult = isAdult)
-            .map {
-                GetContentCurationResponse(
-                    title = it.title,
-                    items = contentRepository.findAudioContentByCurationId(
-                        curationId = it.id!!,
-                        isAdult = isAdult,
-                        contentType = ContentType.ALL
-                    )
-                )
-            }
-
-        return GetContentMainTabLiveReplayResponse(
-            contentBannerList = contentBannerList,
-            newLiveReplayContentList = newLiveReplayContentList,
-            rankLiveReplayContentList = rankLiveReplayContentList,
-            eventBannerList = eventBannerList,
-            curationList = curationList
-        )
-    }
-}

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

@@ -1,16 +0,0 @@
-package kr.co.vividnext.sodalive.content.main.tab.replay
-
-import kr.co.vividnext.sodalive.content.main.GetAudioContentMainItem
-import kr.co.vividnext.sodalive.content.main.GetAudioContentRankingItem
-import kr.co.vividnext.sodalive.content.main.banner.GetAudioContentBannerResponse
-import kr.co.vividnext.sodalive.content.main.tab.GetContentCurationResponse
-import kr.co.vividnext.sodalive.event.GetEventResponse
-
-data class GetContentMainTabLiveReplayResponse(
-    val tabId: Long = 6,
-    val contentBannerList: List<GetAudioContentBannerResponse>,
-    val newLiveReplayContentList: List<GetAudioContentMainItem>,
-    val rankLiveReplayContentList: List<GetAudioContentRankingItem>,
-    val eventBannerList: GetEventResponse,
-    val curationList: List<GetContentCurationResponse>
-)

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

@@ -1,22 +0,0 @@
-package kr.co.vividnext.sodalive.content.main.tab.series
-
-import kr.co.vividnext.sodalive.common.ApiResponse
-import kr.co.vividnext.sodalive.common.SodaException
-import kr.co.vividnext.sodalive.member.Member
-import org.springframework.security.core.annotation.AuthenticationPrincipal
-import org.springframework.web.bind.annotation.GetMapping
-import org.springframework.web.bind.annotation.RequestMapping
-import org.springframework.web.bind.annotation.RestController
-
-@RestController
-@RequestMapping("/v2/audio-content/main/series")
-class AudioContentMainTabSeriesController(private val service: AudioContentMainTabSeriesService) {
-    @GetMapping
-    fun fetchContentMainSeries(
-        @AuthenticationPrincipal(expression = "#this == 'anonymousUser' ? null : member") member: Member?
-    ) = run {
-        if (member == null) throw SodaException("로그인 정보를 확인해주세요.")
-
-        ApiResponse.ok(service.fetchData(member))
-    }
-}

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

@@ -1,149 +0,0 @@
-package kr.co.vividnext.sodalive.content.main.tab.series
-
-import kr.co.vividnext.sodalive.content.main.banner.AudioContentBannerService
-import kr.co.vividnext.sodalive.content.main.curation.AudioContentCurationQueryRepository
-import kr.co.vividnext.sodalive.content.main.tab.RecommendSeriesRepository
-import kr.co.vividnext.sodalive.content.series.ContentSeriesService
-import kr.co.vividnext.sodalive.event.EventService
-import kr.co.vividnext.sodalive.member.Member
-import kr.co.vividnext.sodalive.rank.RankingService
-import org.springframework.stereotype.Service
-import java.time.DayOfWeek
-import java.time.LocalDateTime
-import java.time.temporal.TemporalAdjusters
-
-@Service
-class AudioContentMainTabSeriesService(
-    private val bannerService: AudioContentBannerService,
-    private val seriesService: ContentSeriesService,
-    private val rankingService: RankingService,
-    private val recommendSeriesRepository: RecommendSeriesRepository,
-    private val eventService: EventService,
-    private val curationRepository: AudioContentCurationQueryRepository
-) {
-    fun fetchData(member: Member): GetContentMainTabSeriesResponse {
-        val isAdult = member.auth != null
-
-        // 메인 배너 (시리즈)
-        val contentBannerList = bannerService.getBannerList(
-            tabId = 2,
-            memberId = member.id!!,
-            isAdult = isAdult
-        )
-
-        val originalAudioDrama = seriesService.getOriginalAudioDramaList(
-            isAdult = isAdult,
-            offset = 0,
-            limit = 20
-        )
-
-        // 일간 랭킹
-        val currentDateTime = LocalDateTime.now()
-        val dailyRankingStartDate = currentDateTime
-            .withHour(15)
-            .withMinute(0)
-            .withSecond(0)
-            .minusDays(2)
-        val dailyRankingEndDate = dailyRankingStartDate
-            .plusDays(1)
-
-        val rankSeriesList = rankingService.getSeriesRanking(
-            memberId = member.id!!,
-            isAdult = isAdult,
-            startDate = dailyRankingStartDate,
-            endDate = dailyRankingEndDate
-        )
-
-        // 시리즈 장르
-        val genreList = seriesService.getGenreList(isAdult = isAdult)
-
-        // 장르별 추천 시리즈
-        val recommendSeriesList = if (genreList.isNotEmpty()) {
-            rankingService.getSeriesAllRankingByGenre(
-                memberId = member.id!!,
-                isAdult = isAdult,
-                genreId = genreList[0].id
-            )
-        } else {
-            emptyList()
-        }
-
-        // 새로운 시리즈
-        val newSeriesList = recommendSeriesRepository.getNewSeriesList(isAdult = isAdult)
-
-        // 완결 시리즈 월간 랭킹
-        val monthlyRankingStartDate = currentDateTime
-            .withDayOfMonth(1)
-            .withHour(15)
-            .withMinute(0)
-            .withSecond(0)
-            .minusDays(1)
-        val monthlyRankingEndDate = monthlyRankingStartDate
-            .plusMonths(1)
-
-        val rankCompleteSeriesList = rankingService.getCompleteSeriesRanking(
-            memberId = member.id!!,
-            isAdult = isAdult,
-            startDate = monthlyRankingStartDate,
-            endDate = monthlyRankingEndDate
-        )
-
-        val startDate = currentDateTime
-            .withHour(15)
-            .withMinute(0)
-            .withSecond(0)
-            .minusWeeks(1)
-            .with(TemporalAdjusters.previousOrSame(DayOfWeek.MONDAY))
-        val endDate = startDate
-            .plusDays(6)
-
-        val seriesRankCreatorList = rankingService.fetchCreatorBySeriesRevenueRankTop20(
-            memberId = member.id!!,
-            startDate = startDate.minusDays(1),
-            endDate = endDate
-        )
-
-        val salesRankContentList = if (seriesRankCreatorList.isNotEmpty()) {
-            rankingService.fetchCreatorSeriesBySales(
-                creatorId = seriesRankCreatorList[0].creatorId,
-                isAdult = isAdult
-            )
-        } else {
-            emptyList()
-        }
-
-        // 이벤트 배너
-        val eventBannerList = eventService.getEventList(isAdult = isAdult)
-
-        // 큐레이션
-        val curationList = curationRepository.findByContentMainTabId(tabId = 2, isAdult = isAdult)
-            .map {
-                GetSeriesCurationResponse(
-                    title = it.title,
-                    items = seriesService.fetchSeriesByCurationId(
-                        curationId = it.id!!,
-                        memberId = member.id!!,
-                        isAdult = isAdult
-                    )
-                )
-            }
-
-        return GetContentMainTabSeriesResponse(
-            contentBannerList = contentBannerList,
-            originalAudioDrama = if (originalAudioDrama.size >= 3) {
-                originalAudioDrama
-            } else {
-                emptyList()
-            },
-            rankSeriesList = rankSeriesList,
-            genreList = genreList,
-            recommendSeriesList = recommendSeriesList,
-            newSeriesList = newSeriesList,
-            rankCompleteSeriesList = rankCompleteSeriesList,
-            seriesRankCreatorList = seriesRankCreatorList,
-            salesRankContentList = salesRankContentList,
-            eventBannerList = eventBannerList,
-            curationList = curationList
-        )
-    }
-}

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

@@ -1,23 +0,0 @@
-package kr.co.vividnext.sodalive.content.main.tab.series
-
-import kr.co.vividnext.sodalive.content.main.ContentCreatorResponse
-import kr.co.vividnext.sodalive.content.main.banner.GetAudioContentBannerResponse
-import kr.co.vividnext.sodalive.content.main.tab.GetRecommendSeriesListResponse
-import kr.co.vividnext.sodalive.content.series.GetSeriesGenreListResponse
-import kr.co.vividnext.sodalive.content.series.GetSeriesListResponse
-import kr.co.vividnext.sodalive.event.GetEventResponse
-
-data class GetContentMainTabSeriesResponse(
-    val tabId: Long = 2,
-    val contentBannerList: List<GetAudioContentBannerResponse>,
-    val originalAudioDrama: List<GetSeriesListResponse.SeriesListItem>,
-    val rankSeriesList: List<GetSeriesListResponse.SeriesListItem>,
-    val genreList: List<GetSeriesGenreListResponse>,
-    val recommendSeriesList: List<GetSeriesListResponse.SeriesListItem>,
-    val newSeriesList: List<GetRecommendSeriesListResponse>,
-    val rankCompleteSeriesList: List<GetSeriesListResponse.SeriesListItem>,
-    val seriesRankCreatorList: List<ContentCreatorResponse>,
-    val salesRankContentList: List<GetSeriesListResponse.SeriesListItem>,
-    val eventBannerList: GetEventResponse,
-    val curationList: List<GetSeriesCurationResponse>
-)

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

@@ -1,8 +0,0 @@
-package kr.co.vividnext.sodalive.content.main.tab.series
-
-import kr.co.vividnext.sodalive.content.series.GetSeriesListResponse
-
-data class GetSeriesCurationResponse(
-    val title: String,
-    val items: List<GetSeriesListResponse.SeriesListItem>
-)

src/main/kotlin/kr/co/vividnext/sodalive/content/series/ContentSeriesRepository.kt

@@ -2,21 +2,15 @@ package kr.co.vividnext.sodalive.content.series
 
 import com.querydsl.core.types.dsl.Expressions
 import com.querydsl.jpa.impl.JPAQueryFactory
-import kr.co.vividnext.sodalive.admin.content.series.genre.QSeriesGenre.seriesGenre
 import kr.co.vividnext.sodalive.content.ContentType
 import kr.co.vividnext.sodalive.content.QAudioContent.audioContent
 import kr.co.vividnext.sodalive.content.hashtag.QHashTag.hashTag
-import kr.co.vividnext.sodalive.content.main.curation.QAudioContentCuration.audioContentCuration
-import kr.co.vividnext.sodalive.content.main.curation.QAudioContentCurationItem.audioContentCurationItem
 import kr.co.vividnext.sodalive.content.series.content.GetSeriesContentMinMaxPriceResponse
 import kr.co.vividnext.sodalive.content.series.content.QGetSeriesContentMinMaxPriceResponse
 import kr.co.vividnext.sodalive.creator.admin.content.series.QSeries.series
 import kr.co.vividnext.sodalive.creator.admin.content.series.QSeriesContent.seriesContent
 import kr.co.vividnext.sodalive.creator.admin.content.series.Series
 import kr.co.vividnext.sodalive.creator.admin.content.series.keyword.QSeriesKeyword.seriesKeyword
-import kr.co.vividnext.sodalive.member.MemberRole
-import kr.co.vividnext.sodalive.member.QMember.member
-import kr.co.vividnext.sodalive.member.block.QBlockMember.blockMember
 import org.springframework.data.jpa.repository.JpaRepository
 
 interface ContentSeriesRepository : JpaRepository<Series, Long>, ContentSeriesQueryRepository
@@ -35,9 +29,6 @@ interface ContentSeriesQueryRepository {
     fun getKeywordList(seriesId: Long): List<String>
     fun getSeriesContentMinMaxPrice(seriesId: Long): GetSeriesContentMinMaxPriceResponse
     fun getRecommendSeriesList(isAuth: Boolean, contentType: ContentType, limit: Long): List<Series>
-    fun getOriginalAudioDramaList(isAdult: Boolean, offset: Long = 0, limit: Long = 20): List<Series>
-    fun getGenreList(isAdult: Boolean): List<GetSeriesGenreListResponse>
-    fun findByCurationId(curationId: Long, memberId: Long, isAdult: Boolean): List<Series>
 }
 
 class ContentSeriesQueryRepositoryImpl(
@@ -142,61 +133,4 @@ class ContentSeriesQueryRepositoryImpl(
             .limit(limit)
             .fetch()
     }
-
-    override fun getOriginalAudioDramaList(isAdult: Boolean, offset: Long, limit: Long): List<Series> {
-        var where = series.isOriginal.isTrue
-            .and(series.isActive.isTrue)
-
-        if (!isAdult) {
-            where = where.and(series.isAdult.isFalse)
-        }
-
-        return queryFactory
-            .selectFrom(series)
-            .where(where)
-            .orderBy(Expressions.numberTemplate(Double::class.java, "function('rand')").asc())
-            .offset(offset)
-            .limit(limit)
-            .fetch()
-    }
-
-    override fun getGenreList(isAdult: Boolean): List<GetSeriesGenreListResponse> {
-        var where = seriesGenre.isActive.isTrue
-
-        if (!isAdult) {
-            where = where.and(seriesGenre.isAdult.isFalse)
-        }
-
-        return queryFactory
-            .select(QGetSeriesGenreListResponse(seriesGenre.id, seriesGenre.genre))
-            .from(seriesGenre)
-            .where(where)
-            .orderBy(seriesGenre.orders.asc())
-            .fetch()
-    }
-
-    override fun findByCurationId(curationId: Long, memberId: Long, isAdult: Boolean): List<Series> {
-        val blockMemberCondition = blockMember.member.id.eq(member.id)
-            .and(blockMember.isActive.isTrue)
-            .and(blockMember.blockedMember.id.eq(memberId))
-
-        var where = series.isActive.isTrue
-            .and(member.isActive.isTrue)
-            .and(member.role.eq(MemberRole.CREATOR))
-            .and(blockMember.id.isNull)
-
-        if (!isAdult) {
-            where = where.and(series.isAdult.isFalse)
-        }
-
-        return queryFactory
-            .select(series)
-            .from(audioContentCurationItem)
-            .innerJoin(audioContentCurationItem.curation, audioContentCuration)
-            .innerJoin(audioContentCurationItem.series, series)
-            .innerJoin(series.member, member)
-            .leftJoin(blockMember).on(blockMemberCondition)
-            .where(where)
-            .fetch()
-    }
 }

src/main/kotlin/kr/co/vividnext/sodalive/content/series/ContentSeriesService.kt

@@ -30,19 +30,6 @@ class ContentSeriesService(
     @Value("\${cloud.aws.cloud-front.host}")
     private val coverImageHost: String
 ) {
-    fun getOriginalAudioDramaList(
-        isAdult: Boolean,
-        offset: Long = 0,
-        limit: Long = 20
-    ): List<GetSeriesListResponse.SeriesListItem> {
-        val originalAudioDramaList = repository.getOriginalAudioDramaList(isAdult, offset, limit)
-        return seriesToSeriesListItem(originalAudioDramaList, isAdult)
-    }
-
-    fun getGenreList(isAdult: Boolean): List<GetSeriesGenreListResponse> {
-        return repository.getGenreList(isAdult = isAdult)
-    }
-
     fun getSeriesList(
         creatorId: Long,
         member: Member,
@@ -183,15 +170,6 @@ class ContentSeriesService(
         return seriesToSeriesListItem(seriesList = seriesList, isAdult = member.auth != null)
     }
 
-    fun fetchSeriesByCurationId(
-        curationId: Long,
-        memberId: Long,
-        isAdult: Boolean
-    ): List<GetSeriesListResponse.SeriesListItem> {
-        val seriesList = repository.findByCurationId(curationId = curationId, memberId = memberId, isAdult = isAdult)
-        return seriesToSeriesListItem(seriesList, isAdult)
-    }
-
     private fun seriesToSeriesListItem(
         seriesList: List<Series>,
         isAdult: Boolean

src/main/kotlin/kr/co/vividnext/sodalive/content/series/GetSeriesGenreListResponse.kt

@@ -1,8 +0,0 @@
-package kr.co.vividnext.sodalive.content.series
-
-import com.querydsl.core.annotations.QueryProjection
-
-data class GetSeriesGenreListResponse @QueryProjection constructor(
-    val id: Long,
-    val genre: String
-)

src/main/kotlin/kr/co/vividnext/sodalive/content/theme/AudioContentThemeService.kt

@@ -6,13 +6,19 @@ import kr.co.vividnext.sodalive.content.ContentType
 import kr.co.vividnext.sodalive.content.SortType
 import kr.co.vividnext.sodalive.content.theme.content.GetContentByThemeResponse
 import kr.co.vividnext.sodalive.member.Member
+import kr.co.vividnext.sodalive.member.block.BlockMemberRepository
+import org.springframework.beans.factory.annotation.Value
 import org.springframework.stereotype.Service
 import org.springframework.transaction.annotation.Transactional
 
 @Service
 class AudioContentThemeService(
     private val queryRepository: AudioContentThemeQueryRepository,
-    private val contentRepository: AudioContentRepository
+    private val blockMemberRepository: BlockMemberRepository,
+    private val contentRepository: AudioContentRepository,
+
+    @Value("\${cloud.aws.cloud-front.host}")
+    private val imageHost: String
 ) {
     @Transactional(readOnly = true)
     fun getThemes(): List<GetAudioContentThemeResponse> {
@@ -40,6 +46,7 @@ class AudioContentThemeService(
         )
 
         val items = contentRepository.findByTheme(
+            cloudfrontHost = imageHost,
             memberId = member.id!!,
             theme = theme.theme,
             sortType = sortType,
@@ -48,6 +55,9 @@ class AudioContentThemeService(
             offset = offset,
             limit = limit
         )
+            .asSequence()
+            .filter { !blockMemberRepository.isBlocked(blockedMemberId = member.id!!, memberId = it.creatorId) }
+            .toList()
 
         return GetContentByThemeResponse(
             theme = theme.theme,

src/main/kotlin/kr/co/vividnext/sodalive/rank/RankingRepository.kt

@@ -1,8 +1,6 @@
 package kr.co.vividnext.sodalive.rank
 
-import com.querydsl.core.types.dsl.Expressions
 import com.querydsl.jpa.impl.JPAQueryFactory
-import kr.co.vividnext.sodalive.admin.content.series.genre.QSeriesGenre.seriesGenre
 import kr.co.vividnext.sodalive.content.QAudioContent.audioContent
 import kr.co.vividnext.sodalive.content.comment.QAudioContentComment.audioContentComment
 import kr.co.vividnext.sodalive.content.like.QAudioContentLike.audioContentLike
@@ -15,7 +13,6 @@ import kr.co.vividnext.sodalive.content.theme.QAudioContentTheme.audioContentThe
 import kr.co.vividnext.sodalive.creator.admin.content.series.QSeries.series
 import kr.co.vividnext.sodalive.creator.admin.content.series.QSeriesContent.seriesContent
 import kr.co.vividnext.sodalive.creator.admin.content.series.Series
-import kr.co.vividnext.sodalive.creator.admin.content.series.SeriesState
 import kr.co.vividnext.sodalive.explorer.QCreatorRanking.creatorRanking
 import kr.co.vividnext.sodalive.member.Member
 import kr.co.vividnext.sodalive.member.MemberRole
@@ -48,8 +45,7 @@ class RankingRepository(
         endDate: LocalDateTime,
         offset: Long,
         limit: Long,
-        sortType: String,
+        sortType: String
-        theme: String = ""
     ): List<GetAudioContentRankingItem> {
         val blockMemberCondition = blockMember.member.id.eq(member.id)
             .and(blockMember.isActive.isTrue)
@@ -68,10 +64,6 @@ class RankingRepository(
             where = where.and(audioContent.isAdult.isFalse)
         }
 
-        if (theme.isNotBlank()) {
-            where = where.and(audioContentTheme.theme.eq(theme))
-        }
-
         var select = queryFactory
             .select(
                 QGetAudioContentRankingItem(
@@ -195,107 +187,16 @@ class RankingRepository(
             .innerJoin(seriesContent.series, series)
             .innerJoin(seriesContent.content, audioContent)
             .innerJoin(series.member, member)
-            .leftJoin(order).on(audioContent.id.eq(order.audioContent.id))
+            .innerJoin(order).on(audioContent.id.eq(order.audioContent.id))
             .leftJoin(blockMember).on(blockMemberCondition)
             .where(where)
             .groupBy(series.id)
-            .orderBy(
+            .orderBy(order.can.sum().desc(), series.createdAt.asc())
-                order.can.sum().desc(),
-                Expressions.numberTemplate(Double::class.java, "function('rand')").asc()
-            )
             .offset(0)
             .limit(10)
             .fetch()
     }
 
-    fun getCompleteSeriesRanking(
-        memberId: Long,
-        isAdult: Boolean,
-        startDate: LocalDateTime,
-        endDate: LocalDateTime,
-        offset: Long,
-        limit: Long
-    ): List<Series> {
-        val blockMemberCondition = blockMember.member.id.eq(member.id)
-            .and(blockMember.isActive.isTrue)
-            .and(blockMember.blockedMember.id.eq(memberId))
-
-        var where = series.isActive.isTrue
-            .and(series.state.eq(SeriesState.COMPLETE))
-            .and(audioContent.isActive.isTrue)
-            .and(member.isActive.isTrue)
-            .and(member.isNotNull)
-            .and(member.role.eq(MemberRole.CREATOR))
-            .and(audioContent.duration.isNotNull)
-            .and(audioContent.limited.isNull)
-            .and(blockMember.id.isNull)
-            .and(order.isActive.isTrue)
-            .and(order.createdAt.goe(startDate))
-            .and(order.createdAt.lt(endDate))
-
-        if (!isAdult) {
-            where = where.and(series.isAdult.isFalse)
-        }
-
-        return queryFactory
-            .select(series)
-            .from(seriesContent)
-            .innerJoin(seriesContent.series, series)
-            .innerJoin(seriesContent.content, audioContent)
-            .innerJoin(series.member, member)
-            .leftJoin(order).on(audioContent.id.eq(order.audioContent.id))
-            .leftJoin(blockMember).on(blockMemberCondition)
-            .where(where)
-            .groupBy(series.id)
-            .orderBy(
-                order.can.sum().desc(),
-                Expressions.numberTemplate(Double::class.java, "function('rand')").asc()
-            )
-            .offset(offset)
-            .limit(limit)
-            .fetch()
-    }
-
-    fun getSeriesAllRankingByGenre(memberId: Long, isAdult: Boolean, genreId: Long): List<Series> {
-        val blockMemberCondition = blockMember.member.id.eq(member.id)
-            .and(blockMember.isActive.isTrue)
-            .and(blockMember.blockedMember.id.eq(memberId))
-
-        var where = series.isActive.isTrue
-            .and(seriesGenre.id.eq(genreId))
-            .and(audioContent.isActive.isTrue)
-            .and(member.isActive.isTrue)
-            .and(member.isNotNull)
-            .and(member.role.eq(MemberRole.CREATOR))
-            .and(audioContent.duration.isNotNull)
-            .and(audioContent.limited.isNull)
-            .and(blockMember.id.isNull)
-            .and(order.isActive.isTrue)
-
-        if (!isAdult) {
-            where = where.and(series.isAdult.isFalse)
-        }
-
-        return queryFactory
-            .select(series)
-            .from(seriesContent)
-            .innerJoin(seriesContent.series, series)
-            .innerJoin(series.genre, seriesGenre)
-            .innerJoin(seriesContent.content, audioContent)
-            .innerJoin(series.member, member)
-            .leftJoin(order).on(audioContent.id.eq(order.audioContent.id))
-            .leftJoin(blockMember).on(blockMemberCondition)
-            .where(where)
-            .groupBy(series.id)
-            .orderBy(
-                order.can.sum().desc(),
-                Expressions.numberTemplate(Double::class.java, "function('rand')").asc()
-            )
-            .offset(0)
-            .limit(20)
-            .fetch()
-    }
-
     fun fetchCreatorByContentRevenueRankTop20(
         memberId: Long,
         startDate: LocalDateTime,
@@ -331,11 +232,11 @@ class RankingRepository(
             .leftJoin(blockMember).on(blockMemberCondition)
             .where(where)
             .groupBy(member.id)
-            .having(audioContent.id.count().goe(4))
+            .having(
-            .orderBy(
+                audioContent.id.count().goe(4)
-                order.can.sum().desc(),
+                    .and(order.can.sum().gt(0))
-                Expressions.numberTemplate(Double::class.java, "function('rand')").asc()
             )
+            .orderBy(order.can.sum().desc())
             .offset(0)
             .limit(20)
             .fetch()
@@ -414,84 +315,4 @@ class RankingRepository(
             .limit(2)
             .fetch()
     }
-
-    fun fetchCreatorBySeriesRevenueRankTop20(
-        memberId: Long,
-        startDate: LocalDateTime,
-        endDate: LocalDateTime
-    ): List<ContentCreatorResponse> {
-        val blockMemberCondition = blockMember.member.id.eq(member.id)
-            .and(blockMember.isActive.isTrue)
-            .and(blockMember.blockedMember.id.eq(memberId))
-
-        val ordersCondition = order.audioContent.id.eq(audioContent.id)
-            .and(order.isActive.isTrue)
-            .and(order.createdAt.goe(startDate))
-            .and(order.createdAt.lt(startDate))
-
-        val where = member.isActive.isTrue
-            .and(member.role.eq(MemberRole.CREATOR))
-            .and(series.isActive.isTrue)
-            .and(audioContent.isActive.isTrue)
-            .and(audioContent.duration.isNotNull)
-            .and(audioContent.limited.isNull)
-            .and(blockMember.id.isNull)
-
-        return queryFactory
-            .select(
-                QContentCreatorResponse(
-                    member.id,
-                    member.nickname,
-                    member.profileImage.prepend("/").prepend(imageHost)
-                )
-            )
-            .from(seriesContent)
-            .innerJoin(seriesContent.series, series)
-            .innerJoin(seriesContent.content, audioContent)
-            .innerJoin(series.member, member)
-            .leftJoin(order).on(ordersCondition)
-            .leftJoin(blockMember).on(blockMemberCondition)
-            .where(where)
-            .groupBy(member.id)
-            .having(series.id.countDistinct().goe(3))
-            .orderBy(
-                order.can.sum().desc(),
-                Expressions.numberTemplate(Double::class.java, "function('rand')").asc()
-            )
-            .offset(0)
-            .limit(20)
-            .fetch()
-    }
-
-    fun fetchCreatorSeriesBySales(creatorId: Long, isAdult: Boolean): List<Series> {
-        var where = member.isActive.isTrue
-            .and(member.role.eq(MemberRole.CREATOR))
-            .and(series.isActive.isTrue)
-            .and(audioContent.isActive.isTrue)
-            .and(audioContent.duration.isNotNull)
-            .and(audioContent.limited.isNull)
-            .and(order.isActive.isTrue)
-            .and(member.id.eq(creatorId))
-
-        if (!isAdult) {
-            where = where.and(series.isAdult.isFalse)
-        }
-
-        return queryFactory
-            .select(series)
-            .from(seriesContent)
-            .innerJoin(seriesContent.series, series)
-            .innerJoin(seriesContent.content, audioContent)
-            .innerJoin(series.member, member)
-            .leftJoin(order).on(audioContent.id.eq(order.audioContent.id))
-            .where(where)
-            .groupBy(series.id)
-            .orderBy(
-                order.can.sum().desc(),
-                Expressions.numberTemplate(Double::class.java, "function('rand')").asc()
-            )
-            .offset(0)
-            .limit(10)
-            .fetch()
-    }
 }

src/main/kotlin/kr/co/vividnext/sodalive/rank/RankingService.kt

@@ -44,8 +44,7 @@ class RankingService(
         endDate: LocalDateTime,
         offset: Long = 0,
         limit: Long = 12,
-        sortType: String = "매출",
+        sortType: String = "매출"
-        theme: String = ""
     ): List<GetAudioContentRankingItem> {
         return repository.getAudioContentRanking(
             memberId = memberId,
@@ -54,8 +53,7 @@ class RankingService(
             endDate = endDate,
             offset = offset,
             limit = limit,
-            sortType = sortType,
+            sortType = sortType
-            theme = theme
         )
     }
 
@@ -69,38 +67,6 @@ class RankingService(
         return seriesToSeriesListItem(seriesList = seriesList, isAdult = isAdult)
     }
 
-    fun getSeriesAllRankingByGenre(
-        memberId: Long,
-        isAdult: Boolean,
-        genreId: Long
-    ): List<GetSeriesListResponse.SeriesListItem> {
-        val seriesList = repository.getSeriesAllRankingByGenre(
-            memberId = memberId,
-            isAdult = isAdult,
-            genreId = genreId
-        )
-        return seriesToSeriesListItem(seriesList = seriesList, isAdult = isAdult)
-    }
-
-    fun getCompleteSeriesRanking(
-        memberId: Long,
-        isAdult: Boolean,
-        startDate: LocalDateTime,
-        endDate: LocalDateTime,
-        offset: Long = 0,
-        limit: Long = 10
-    ): List<GetSeriesListResponse.SeriesListItem> {
-        val seriesList = repository.getCompleteSeriesRanking(
-            memberId = memberId,
-            isAdult = isAdult,
-            startDate = startDate,
-            endDate = endDate,
-            offset = offset,
-            limit = limit
-        )
-        return seriesToSeriesListItem(seriesList = seriesList, isAdult = isAdult)
-    }
-
     private fun seriesToSeriesListItem(
         seriesList: List<Series>,
         isAdult: Boolean
@@ -182,17 +148,4 @@ class RankingService(
     fun fetchCreatorContentBySalesCountTop2(creatorId: Long, isAdult: Boolean): List<GetAudioContentRankingItem> {
         return repository.fetchCreatorContentBySalesCountTop2(creatorId, isAdult)
     }
-
-    fun fetchCreatorBySeriesRevenueRankTop20(
-        memberId: Long,
-        startDate: LocalDateTime,
-        endDate: LocalDateTime
-    ): List<ContentCreatorResponse> {
-        return repository.fetchCreatorBySeriesRevenueRankTop20(memberId, startDate, endDate)
-    }
-
-    fun fetchCreatorSeriesBySales(creatorId: Long, isAdult: Boolean): List<GetSeriesListResponse.SeriesListItem> {
-        val seriesList = repository.fetchCreatorSeriesBySales(creatorId = creatorId, isAdult = isAdult)
-        return seriesToSeriesListItem(seriesList, isAdult)
-    }
 }