Merge pull request 'test' (#368) from test into main

Reviewed-on: #368

src/main/kotlin/kr/co/vividnext/sodalive/admin/content/series/banner/AdminContentSeriesBannerController.kt

@@ -0,0 +1,145 @@
+package kr.co.vividnext.sodalive.admin.content.series.banner
+
+import com.amazonaws.services.s3.model.ObjectMetadata
+import com.fasterxml.jackson.databind.ObjectMapper
+import kr.co.vividnext.sodalive.admin.content.banner.UpdateBannerOrdersRequest
+import kr.co.vividnext.sodalive.admin.content.series.banner.dto.SeriesBannerListPageResponse
+import kr.co.vividnext.sodalive.admin.content.series.banner.dto.SeriesBannerRegisterRequest
+import kr.co.vividnext.sodalive.admin.content.series.banner.dto.SeriesBannerResponse
+import kr.co.vividnext.sodalive.admin.content.series.banner.dto.SeriesBannerUpdateRequest
+import kr.co.vividnext.sodalive.aws.s3.S3Uploader
+import kr.co.vividnext.sodalive.common.ApiResponse
+import kr.co.vividnext.sodalive.common.SodaException
+import kr.co.vividnext.sodalive.content.series.main.banner.ContentSeriesBannerService
+import kr.co.vividnext.sodalive.utils.generateFileName
+import org.springframework.beans.factory.annotation.Value
+import org.springframework.data.domain.PageRequest
+import org.springframework.security.access.prepost.PreAuthorize
+import org.springframework.web.bind.annotation.DeleteMapping
+import org.springframework.web.bind.annotation.GetMapping
+import org.springframework.web.bind.annotation.PathVariable
+import org.springframework.web.bind.annotation.PostMapping
+import org.springframework.web.bind.annotation.PutMapping
+import org.springframework.web.bind.annotation.RequestBody
+import org.springframework.web.bind.annotation.RequestMapping
+import org.springframework.web.bind.annotation.RequestParam
+import org.springframework.web.bind.annotation.RequestPart
+import org.springframework.web.bind.annotation.RestController
+import org.springframework.web.multipart.MultipartFile
+
+@RestController
+@RequestMapping("/admin/audio-content/series/banner")
+@PreAuthorize("hasRole('ADMIN')")
+class AdminContentSeriesBannerController(
+    private val bannerService: ContentSeriesBannerService,
+    private val s3Uploader: S3Uploader,
+
+    @Value("\${cloud.aws.s3.bucket}")
+    private val s3Bucket: String,
+
+    @Value("\${cloud.aws.cloud-front.host}")
+    private val imageHost: String
+) {
+    /**
+     * 활성화된 배너 목록 조회 API
+     */
+    @GetMapping("/list")
+    fun getBannerList(
+        @RequestParam(defaultValue = "0") page: Int,
+        @RequestParam(defaultValue = "20") size: Int
+    ) = run {
+        val pageable = PageRequest.of(page, size)
+        val banners = bannerService.getActiveBanners(pageable)
+        val response = SeriesBannerListPageResponse(
+            totalCount = banners.totalElements,
+            content = banners.content.map { SeriesBannerResponse.from(it, imageHost) }
+        )
+        ApiResponse.ok(response)
+    }
+
+    /**
+     * 배너 상세 조회 API
+     */
+    @GetMapping("/{bannerId}")
+    fun getBannerDetail(@PathVariable bannerId: Long) = run {
+        val banner = bannerService.getBannerById(bannerId)
+        val response = SeriesBannerResponse.from(banner, imageHost)
+        ApiResponse.ok(response)
+    }
+
+    /**
+     * 배너 등록 API
+     */
+    @PostMapping("/register")
+    fun registerBanner(
+        @RequestPart("image") image: MultipartFile,
+        @RequestPart("request") requestString: String
+    ) = run {
+        val objectMapper = ObjectMapper()
+        val request = objectMapper.readValue(requestString, SeriesBannerRegisterRequest::class.java)
+
+        val banner = bannerService.registerBanner(seriesId = request.seriesId, imagePath = "")
+        val imagePath = saveImage(banner.id!!, image)
+        val updatedBanner = bannerService.updateBanner(banner.id!!, imagePath)
+        val response = SeriesBannerResponse.from(updatedBanner, imageHost)
+        ApiResponse.ok(response)
+    }
+
+    /**
+     * 배너 수정 API
+     */
+    @PutMapping("/update")
+    fun updateBanner(
+        @RequestPart("image") image: MultipartFile,
+        @RequestPart("request") requestString: String
+    ) = run {
+        val objectMapper = ObjectMapper()
+        val request = objectMapper.readValue(requestString, SeriesBannerUpdateRequest::class.java)
+        // 배너 존재 확인
+        bannerService.getBannerById(request.bannerId)
+        val imagePath = saveImage(request.bannerId, image)
+        val updated = bannerService.updateBanner(
+            bannerId = request.bannerId,
+            imagePath = imagePath,
+            seriesId = request.seriesId
+        )
+        val response = SeriesBannerResponse.from(updated, imageHost)
+        ApiResponse.ok(response)
+    }
+
+    /**
+     * 배너 삭제 API (소프트 삭제)
+     */
+    @DeleteMapping("/{bannerId}")
+    fun deleteBanner(@PathVariable bannerId: Long) = run {
+        bannerService.deleteBanner(bannerId)
+        ApiResponse.ok("배너가 성공적으로 삭제되었습니다.")
+    }
+
+    /**
+     * 배너 정렬 순서 일괄 변경 API
+     */
+    @PutMapping("/orders")
+    fun updateBannerOrders(
+        @RequestBody request: UpdateBannerOrdersRequest
+    ) = run {
+        bannerService.updateBannerOrders(request.ids)
+        ApiResponse.ok(null, "배너 정렬 순서가 성공적으로 변경되었습니다.")
+    }
+
+    private fun saveImage(bannerId: Long, image: MultipartFile): String {
+        try {
+            val metadata = ObjectMetadata()
+            metadata.contentLength = image.size
+            val fileName = generateFileName("series-banner")
+            return s3Uploader.upload(
+                inputStream = image.inputStream,
+                bucket = s3Bucket,
+                filePath = "series_banner/$bannerId/$fileName",
+                metadata = metadata
+            )
+        } catch (e: Exception) {
+            throw SodaException("이미지 저장에 실패했습니다: ${e.message}")
+        }
+    }
+}

src/main/kotlin/kr/co/vividnext/sodalive/admin/content/series/banner/dto/SeriesBannerDtos.kt

@@ -0,0 +1,40 @@
+package kr.co.vividnext.sodalive.admin.content.series.banner.dto
+
+import com.fasterxml.jackson.annotation.JsonProperty
+import kr.co.vividnext.sodalive.content.series.main.banner.SeriesBanner
+
+// 시리즈 배너 등록 요청 DTO
+data class SeriesBannerRegisterRequest(
+    @JsonProperty("seriesId") val seriesId: Long
+)
+
+// 시리즈 배너 수정 요청 DTO
+data class SeriesBannerUpdateRequest(
+    @JsonProperty("bannerId") val bannerId: Long,
+    @JsonProperty("seriesId") val seriesId: Long? = null
+)
+
+// 시리즈 배너 응답 DTO
+data class SeriesBannerResponse(
+    val id: Long,
+    val imagePath: String,
+    val seriesId: Long,
+    val seriesTitle: String
+) {
+    companion object {
+        fun from(banner: SeriesBanner, imageHost: String): SeriesBannerResponse {
+            return SeriesBannerResponse(
+                id = banner.id!!,
+                imagePath = "$imageHost/${banner.imagePath}",
+                seriesId = banner.series.id!!,
+                seriesTitle = banner.series.title
+            )
+        }
+    }
+}
+
+// 시리즈 배너 목록 페이지 응답 DTO
+data class SeriesBannerListPageResponse(
+    val totalCount: Long,
+    val content: List<SeriesBannerResponse>
+)

src/main/kotlin/kr/co/vividnext/sodalive/api/home/HomeService.kt

@@ -51,7 +51,7 @@ class HomeService(
     private val imageHost: String
 ) {
     companion object {
-        private const val RECOMMEND_TARGET_SIZE = 20
+        private const val RECOMMEND_TARGET_SIZE = 30
         private const val RECOMMEND_MAX_ATTEMPTS = 3
     }
 
@@ -124,7 +124,8 @@ class HomeService(
 
         val originalAudioDramaList = seriesService.getOriginalAudioDramaList(
             isAdult = isAdult,
-            contentType = contentType
+            contentType = contentType,
+            orderByRandom = true
         )
 
         val auditionList = auditionService.getInProgressAuditionList(isAdult = isAdult)

src/main/kotlin/kr/co/vividnext/sodalive/chat/character/controller/ChatCharacterController.kt

@@ -75,11 +75,11 @@ class ChatCharacterController(
         ).content
 
         // 추천 캐릭터 조회
-        // 최근 대화한 캐릭터를 제외한 랜덤 20개 조회
+        // 최근 대화한 캐릭터를 제외한 랜덤 30개 조회
         // Controller에서는 호출만
         // 세부로직은 추후에 변경될 수 있으므로 Service에 별도로 생성
         val excludeIds = recentCharacters.map { it.characterId }
-        val recommendCharacters = service.getRecommendCharacters(excludeIds, 20)
+        val recommendCharacters = service.getRecommendCharacters(excludeIds, 30)
 
         // 큐레이션 섹션 (활성화된 큐레이션 + 캐릭터)
         val curationSections = curationQueryService.getActiveCurationsWithCharacters()
@@ -92,7 +92,8 @@ class ChatCharacterController(
                             characterId = it.id!!,
                             name = it.name,
                             description = it.description,
-                            imageUrl = "$imageHost/${it.imagePath ?: "profile/default-profile.png"}"
+                            imageUrl = "$imageHost/${it.imagePath ?: "profile/default-profile.png"}",
+                            new = false
                         )
                     }
                 )

src/main/kotlin/kr/co/vividnext/sodalive/chat/character/dto/CharacterHomeResponse.kt

@@ -21,7 +21,8 @@ data class Character(
     @JsonProperty("characterId") val characterId: Long,
     @JsonProperty("name") val name: String,
     @JsonProperty("description") val description: String,
-    @JsonProperty("imageUrl") val imageUrl: String
+    @JsonProperty("imageUrl") val imageUrl: String,
+    @JsonProperty("isNew") val new: Boolean
 )
 
 data class RecentCharacter(

src/main/kotlin/kr/co/vividnext/sodalive/chat/character/image/CharacterImageRepository.kt

@@ -8,7 +8,9 @@ import org.springframework.data.domain.Page
 import org.springframework.data.domain.Pageable
 import org.springframework.data.jpa.repository.JpaRepository
 import org.springframework.data.jpa.repository.Query
+import org.springframework.data.repository.query.Param
 import org.springframework.stereotype.Repository
+import java.time.LocalDateTime
 
 @Repository
 interface CharacterImageRepository : JpaRepository<CharacterImage, Long>, CharacterImageQueryRepository {
@@ -26,6 +28,21 @@ interface CharacterImageRepository : JpaRepository<CharacterImage, Long>, Charac
             "WHERE ci.chatCharacter.id = :characterId AND ci.isActive = true"
     )
     fun findMaxSortOrderByCharacterId(characterId: Long): Int
+
+    @Query(
+        """
+    select distinct c.id
+    from CharacterImage ci
+    join ci.chatCharacter c
+    where ci.isActive = true
+      and ci.createdAt >= :since
+      and c.id in :characterIds
+    """
+    )
+    fun findCharacterIdsWithRecentImages(
+        @Param("characterIds") characterIds: List<Long>,
+        @Param("since") since: LocalDateTime
+    ): List<Long>
 }
 
 interface CharacterImageQueryRepository {

src/main/kotlin/kr/co/vividnext/sodalive/chat/character/service/ChatCharacterService.kt

@@ -13,6 +13,7 @@ import kr.co.vividnext.sodalive.chat.character.ChatCharacterTag
 import kr.co.vividnext.sodalive.chat.character.ChatCharacterValue
 import kr.co.vividnext.sodalive.chat.character.dto.Character
 import kr.co.vividnext.sodalive.chat.character.dto.RecentCharactersResponse
+import kr.co.vividnext.sodalive.chat.character.image.CharacterImageRepository
 import kr.co.vividnext.sodalive.chat.character.repository.ChatCharacterGoalRepository
 import kr.co.vividnext.sodalive.chat.character.repository.ChatCharacterHobbyRepository
 import kr.co.vividnext.sodalive.chat.character.repository.ChatCharacterRepository
@@ -34,6 +35,7 @@ class ChatCharacterService(
     private val hobbyRepository: ChatCharacterHobbyRepository,
     private val goalRepository: ChatCharacterGoalRepository,
     private val popularCharacterQuery: PopularCharacterQuery,
+    private val imageRepository: CharacterImageRepository,
 
     @Value("\${cloud.aws.cloud-front.host}")
     private val imageHost: String
@@ -46,12 +48,25 @@ class ChatCharacterService(
         } else {
             chatCharacterRepository.findRandomActive(PageRequest.of(0, safeLimit))
         }
+
+        val recentSet = if (chars.isNotEmpty()) {
+            imageRepository
+                .findCharacterIdsWithRecentImages(
+                    chars.map { it.id!! },
+                    LocalDateTime.now().minusDays(3)
+                )
+                .toSet()
+        } else {
+            emptySet()
+        }
+
         return chars.map {
             Character(
                 characterId = it.id!!,
                 name = it.name,
                 description = it.description,
-                imageUrl = "$imageHost/${it.imagePath ?: "profile/default-profile.png"}"
+                imageUrl = "$imageHost/${it.imagePath ?: "profile/default-profile.png"}",
+                new = recentSet.contains(it.id)
             )
         }
     }
@@ -69,12 +84,25 @@ class ChatCharacterService(
         val window = RankingWindowCalculator.now("popular-character")
         val topIds = popularCharacterQuery.findPopularCharacterIds(window.windowStart, window.nextBoundary, limit)
         val list = loadCharactersInOrder(topIds)
+
+        val recentSet = if (list.isNotEmpty()) {
+            imageRepository
+                .findCharacterIdsWithRecentImages(
+                    list.map { it.id!! },
+                    LocalDateTime.now().minusDays(3)
+                )
+                .toSet()
+        } else {
+            emptySet()
+        }
+
         return list.map {
             Character(
                 characterId = it.id!!,
                 name = it.name,
                 description = it.description,
-                imageUrl = "$imageHost/${it.imagePath ?: "profile/default-profile.png"}"
+                imageUrl = "$imageHost/${it.imagePath ?: "profile/default-profile.png"}",
+                new = recentSet.contains(it.id)
             )
         }
     }
@@ -109,15 +137,28 @@ class ChatCharacterService(
                     content = emptyList()
                 )
             }
-            val fallback = chatCharacterRepository.findByIsActiveTrue(
+            val chars = chatCharacterRepository.findByIsActiveTrue(
                 PageRequest.of(0, 20, Sort.by("createdAt").descending())
-            )
+            ).content
-            val content = fallback.content.map {
+
+            val recentSet = if (chars.isNotEmpty()) {
+                imageRepository
+                    .findCharacterIdsWithRecentImages(
+                        chars.map { it.id!! },
+                        LocalDateTime.now().minusDays(3)
+                    )
+                    .toSet()
+            } else {
+                emptySet()
+            }
+
+            val content = chars.map {
                 Character(
                     characterId = it.id!!,
                     name = it.name,
                     description = it.description,
-                    imageUrl = "$imageHost/${it.imagePath ?: "profile/default-profile.png"}"
+                    imageUrl = "$imageHost/${it.imagePath ?: "profile/default-profile.png"}",
+                    new = recentSet.contains(it.id)
                 )
             }
             return RecentCharactersResponse(
@@ -126,16 +167,29 @@ class ChatCharacterService(
             )
         }
 
-        val pageResult = chatCharacterRepository.findRecentSince(
+        val chars = chatCharacterRepository.findRecentSince(
             since,
             PageRequest.of(safePage, safeSize)
-        )
+        ).content
-        val content = pageResult.content.map {
+
+        val recentSet = if (chars.isNotEmpty()) {
+            imageRepository
+                .findCharacterIdsWithRecentImages(
+                    chars.map { it.id!! },
+                    LocalDateTime.now().minusDays(3)
+                )
+                .toSet()
+        } else {
+            emptySet()
+        }
+
+        val content = chars.map {
             Character(
                 characterId = it.id!!,
                 name = it.name,
                 description = it.description,
-                imageUrl = "$imageHost/${it.imagePath ?: "profile/default-profile.png"}"
+                imageUrl = "$imageHost/${it.imagePath ?: "profile/default-profile.png"}",
+                new = recentSet.contains(it.id)
             )
         }
 

src/main/kotlin/kr/co/vividnext/sodalive/chat/original/controller/OriginalWorkController.kt

@@ -1,6 +1,8 @@
 package kr.co.vividnext.sodalive.chat.original.controller
 
+import kr.co.vividnext.sodalive.chat.character.ChatCharacter
 import kr.co.vividnext.sodalive.chat.character.dto.Character
+import kr.co.vividnext.sodalive.chat.character.image.CharacterImageRepository
 import kr.co.vividnext.sodalive.chat.original.dto.OriginalWorkDetailResponse
 import kr.co.vividnext.sodalive.chat.original.dto.OriginalWorkListItemResponse
 import kr.co.vividnext.sodalive.chat.original.dto.OriginalWorkListResponse
@@ -15,6 +17,7 @@ import org.springframework.web.bind.annotation.PathVariable
 import org.springframework.web.bind.annotation.RequestMapping
 import org.springframework.web.bind.annotation.RequestParam
 import org.springframework.web.bind.annotation.RestController
+import java.time.LocalDateTime
 
 /**
  * 앱용 원작(오리지널 작품) 공개 API
@@ -25,6 +28,8 @@ import org.springframework.web.bind.annotation.RestController
 @RequestMapping("/api/chat/original")
 class OriginalWorkController(
     private val queryService: OriginalWorkQueryService,
+    private val characterImageRepository: CharacterImageRepository,
+
     @Value("\${cloud.aws.cloud-front.host}")
     private val imageHost: String
 ) {
@@ -65,17 +70,34 @@ class OriginalWorkController(
         if (member.auth == null) throw SodaException("본인인증을 하셔야 합니다.")
 
         val ow = queryService.getOriginalWork(id)
-        val pageRes = queryService.getActiveCharactersPage(id, page = 0, size = 20)
+        val chars = queryService.getActiveCharactersPage(id, page = 0, size = 20).content
-        val characters = pageRes.content.map {
+
-            val path = it.imagePath ?: "profile/default-profile.png"
+        val recentSet = if (chars.isNotEmpty()) {
-            Character(
+            characterImageRepository
-                characterId = it.id!!,
+                .findCharacterIdsWithRecentImages(
-                name = it.name,
+                    chars.map { it.id!! },
-                description = it.description,
+                    LocalDateTime.now().minusDays(3)
-                imageUrl = "$imageHost/$path"
+                )
-            )
+                .toSet()
+        } else {
+            emptySet()
         }
-        val response = OriginalWorkDetailResponse.from(ow, imageHost, characters)
+
-        ApiResponse.ok(response)
+        ApiResponse.ok(
+            OriginalWorkDetailResponse.from(
+                ow,
+                imageHost,
+                chars.map<ChatCharacter, Character> {
+                    val path = it.imagePath ?: "profile/default-profile.png"
+                    Character(
+                        characterId = it.id!!,
+                        name = it.name,
+                        description = it.description,
+                        imageUrl = "$imageHost/$path",
+                        new = recentSet.contains(it.id)
+                    )
+                }
+            )
+        )
     }
 }

src/main/kotlin/kr/co/vividnext/sodalive/chat/original/service/OriginalWorkQueryService.kt

@@ -59,7 +59,7 @@ class OriginalWorkQueryService(
         val safePage = if (page < 0) 0 else page
         val safeSize = when {
             size <= 0 -> 20
-            size > 50 -> 50
+            size > 20 -> 20
             else -> size
         }
         val pageable = PageRequest.of(safePage, safeSize, Sort.by("createdAt").descending())

src/main/kotlin/kr/co/vividnext/sodalive/configs/SecurityConfig.kt

@@ -83,6 +83,7 @@ class SecurityConfig(
             .antMatchers("/api/home").permitAll()
             .antMatchers("/api/home/latest-content").permitAll()
             .antMatchers("/api/home/day-of-week-series").permitAll()
+            .antMatchers("/api/home/content-ranking").permitAll()
             .antMatchers(HttpMethod.GET, "/api/live").permitAll()
             .antMatchers(HttpMethod.GET, "/faq").permitAll()
             .antMatchers(HttpMethod.GET, "/faq/category").permitAll()

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

@@ -23,7 +23,7 @@ enum class PurchaseOption {
 }
 
 enum class SortType {
-    NEWEST, PRICE_HIGH, PRICE_LOW
+    NEWEST, PRICE_HIGH, PRICE_LOW, POPULARITY
 }
 
 @Entity

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

@@ -243,6 +243,8 @@ class AudioContentController(private val service: AudioContentService) {
         @RequestParam("contentType", required = false) contentType: ContentType? = null,
         @RequestParam("isFree", required = false) isFree: Boolean? = null,
         @RequestParam("isPointAvailableOnly", required = false) isPointAvailableOnly: Boolean? = null,
+        @RequestParam("sort-type", required = false) sortType: SortType? = SortType.NEWEST,
+        @RequestParam("theme", required = false) theme: String? = null,
         @AuthenticationPrincipal(expression = "#this == 'anonymousUser' ? null : member") member: Member?,
         pageable: Pageable
     ) = run {
@@ -250,10 +252,11 @@ class AudioContentController(private val service: AudioContentService) {
 
         ApiResponse.ok(
             service.getLatestContentByTheme(
-                theme = emptyList(),
+                theme = if (theme == null) listOf() else listOf(theme),
                 contentType = contentType ?: ContentType.ALL,
                 offset = pageable.offset,
                 limit = pageable.pageSize.toLong(),
+                sortType = sortType ?: SortType.NEWEST,
                 isFree = isFree ?: false,
                 isAdult = (isAdultContentVisible ?: true) && member.auth != null,
                 isPointAvailableOnly = isPointAvailableOnly ?: false

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

@@ -109,7 +109,6 @@ interface AudioContentQueryRepository {
     ): Int
 
     fun findByThemeFor2Weeks(
-        isFree: Boolean = false,
         cloudfrontHost: String,
         memberId: Long,
         theme: List<String> = emptyList(),
@@ -120,7 +119,6 @@ interface AudioContentQueryRepository {
     ): List<GetAudioContentMainItem>
 
     fun totalCountNewContentFor2Weeks(
-        isFree: Boolean = false,
         theme: List<String> = emptyList(),
         memberId: Long,
         isAdult: Boolean,
@@ -182,6 +180,7 @@ interface AudioContentQueryRepository {
         contentType: ContentType,
         offset: Long,
         limit: Long,
+        sortType: SortType,
         isFree: Boolean,
         isAdult: Boolean,
         orderByRandom: Boolean = false,
@@ -243,6 +242,7 @@ class AudioContentQueryRepositoryImpl(
             SortType.NEWEST -> audioContent.releaseDate.desc()
             SortType.PRICE_HIGH -> audioContent.price.desc()
             SortType.PRICE_LOW -> audioContent.price.asc()
+            SortType.POPULARITY -> audioContent.playCount.desc()
         }
 
         var where = audioContent.member.id.eq(creatorId)
@@ -464,6 +464,12 @@ class AudioContentQueryRepositoryImpl(
                 audioContent.releaseDate.asc(),
                 audioContent.id.asc()
             )
+
+            SortType.POPULARITY -> listOf(
+                audioContent.playCount.desc(),
+                audioContent.releaseDate.asc(),
+                audioContent.id.asc()
+            )
         }
 
         var where = audioContent.isActive.isTrue
@@ -695,7 +701,6 @@ class AudioContentQueryRepositoryImpl(
     }
 
     override fun totalCountNewContentFor2Weeks(
-        isFree: Boolean,
         theme: List<String>,
         memberId: Long,
         isAdult: Boolean,
@@ -732,10 +737,6 @@ class AudioContentQueryRepositoryImpl(
             where = where.and(audioContentTheme.theme.`in`(theme))
         }
 
-        if (isFree) {
-            where = where.and(audioContent.price.loe(0))
-        }
-
         return queryFactory
             .select(audioContent.id)
             .from(audioContent)
@@ -747,7 +748,6 @@ class AudioContentQueryRepositoryImpl(
     }
 
     override fun findByThemeFor2Weeks(
-        isFree: Boolean,
         cloudfrontHost: String,
         memberId: Long,
         theme: List<String>,
@@ -787,10 +787,6 @@ class AudioContentQueryRepositoryImpl(
             where = where.and(audioContentTheme.theme.`in`(theme))
         }
 
-        if (isFree) {
-            where = where.and(audioContent.price.loe(0))
-        }
-
         return queryFactory
             .select(
                 QGetAudioContentMainItem(
@@ -1309,6 +1305,7 @@ class AudioContentQueryRepositoryImpl(
         contentType: ContentType,
         offset: Long,
         limit: Long,
+        sortType: SortType,
         isFree: Boolean,
         isAdult: Boolean,
         orderByRandom: Boolean,
@@ -1354,7 +1351,22 @@ class AudioContentQueryRepositoryImpl(
         val orderBy = if (orderByRandom) {
             Expressions.numberTemplate(Double::class.java, "function('rand')").asc()
         } else {
-            audioContent.releaseDate.desc()
+            when (sortType) {
+                SortType.NEWEST -> audioContent.releaseDate.desc()
+                SortType.PRICE_HIGH -> if (isFree) {
+                    audioContent.releaseDate.desc()
+                } else {
+                    audioContent.price.desc()
+                }
+
+                SortType.PRICE_LOW -> if (isFree) {
+                    audioContent.releaseDate.asc()
+                } else {
+                    audioContent.price.desc()
+                }
+
+                SortType.POPULARITY -> audioContent.playCount.desc()
+            }
         }
 
         return queryFactory
@@ -1441,11 +1453,10 @@ class AudioContentQueryRepositoryImpl(
         isAdult: Boolean
     ): AudioContent? {
         var where = audioContent.member.id.eq(creatorId)
-            .and(
+            .and(audioContent.isActive.isTrue)
-                audioContent.isActive.isTrue
+            .and(audioContent.duration.isNotNull)
-                    .and(audioContent.duration.isNotNull)
+            .and(audioContent.releaseDate.isNotNull)
-                    .or(audioContent.releaseDate.isNotNull.and(audioContent.duration.isNotNull))
+            .and(audioContent.releaseDate.loe(LocalDateTime.now()))
-            )
 
         if (!isAdult) {
             where = where.and(audioContent.isAdult.isFalse)

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

@@ -988,6 +988,7 @@ class AudioContentService(
         contentType: ContentType,
         offset: Long = 0,
         limit: Long = 20,
+        sortType: SortType = SortType.NEWEST,
         isFree: Boolean = false,
         isAdult: Boolean = false,
         orderByRandom: Boolean = false,
@@ -998,6 +999,7 @@ class AudioContentService(
             contentType = contentType,
             offset = offset,
             limit = limit,
+            sortType = sortType,
             isFree = isFree,
             isAdult = isAdult,
             orderByRandom = orderByRandom,

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

@@ -99,7 +99,6 @@ class AudioContentMainController(
 
     @GetMapping("/new/all")
     fun getNewContentAllByTheme(
-        @RequestParam("isFree", required = false) isFree: Boolean? = null,
         @RequestParam("theme") theme: String,
         @RequestParam("isAdultContentVisible", required = false) isAdultContentVisible: Boolean? = null,
         @RequestParam("contentType", required = false) contentType: ContentType? = null,
@@ -110,7 +109,6 @@ class AudioContentMainController(
 
         ApiResponse.ok(
             service.getNewContentFor2WeeksByTheme(
-                isFree = isFree ?: false,
                 theme = theme,
                 isAdultContentVisible = isAdultContentVisible ?: true,
                 contentType = contentType ?: ContentType.ALL,

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

@@ -28,16 +28,6 @@ class AudioContentMainService(
     @Cacheable(cacheNames = ["default"], key = "'themeList:' + ':' + #isAdult")
     fun getThemeList(isAdult: Boolean, contentType: ContentType): List<String> {
         return audioContentThemeRepository.getActiveThemeOfContent(isAdult = isAdult, contentType = contentType)
-            .filter {
-                it != "모닝콜" &&
-                    it != "알람" &&
-                    it != "슬립콜" &&
-                    it != "다시듣기" &&
-                    it != "ASMR" &&
-                    it != "릴레이" &&
-                    it != "챌린지" &&
-                    it != "자기소개"
-            }
     }
 
     @Transactional(readOnly = true)
@@ -64,7 +54,6 @@ class AudioContentMainService(
 
     @Transactional(readOnly = true)
     fun getNewContentFor2WeeksByTheme(
-        isFree: Boolean,
         theme: String,
         isAdultContentVisible: Boolean,
         contentType: ContentType,
@@ -75,31 +64,19 @@ class AudioContentMainService(
         val themeList = if (theme.isBlank()) {
             audioContentThemeRepository.getActiveThemeOfContent(
                 isAdult = isAdult,
-                isFree = isFree,
                 contentType = contentType
-            ).filter {
+            )
-                it != "모닝콜" &&
-                    it != "알람" &&
-                    it != "슬립콜" &&
-                    it != "다시듣기" &&
-                    it != "ASMR" &&
-                    it != "릴레이" &&
-                    it != "챌린지" &&
-                    it != "자기소개"
-            }
         } else {
             listOf(theme)
         }
 
         val totalCount = repository.totalCountNewContentFor2Weeks(
-            isFree,
             themeList,
             memberId = member.id!!,
             isAdult = isAdult,
             contentType = contentType
         )
         val items = repository.findByThemeFor2Weeks(
-            isFree,
             cloudfrontHost = imageHost,
             memberId = member.id!!,
             theme = themeList,

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

@@ -58,6 +58,7 @@ class AudioContentCurationQueryRepository(private val queryFactory: JPAQueryFact
             SortType.NEWEST -> audioContent.createdAt.desc()
             SortType.PRICE_HIGH -> audioContent.price.desc()
             SortType.PRICE_LOW -> audioContent.price.asc()
+            SortType.POPULARITY -> audioContent.playCount.desc()
         }
 
         var where = audioContent.isActive.isTrue

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

@@ -20,6 +20,7 @@ class ContentSeriesController(private val service: ContentSeriesService) {
     fun getSeriesList(
         @RequestParam(required = false) creatorId: Long?,
         @RequestParam(name = "isOriginal", required = false) isOriginal: Boolean? = null,
+        @RequestParam(name = "isCompleted", required = false) isCompleted: Boolean? = null,
         @RequestParam("isAdultContentVisible", required = false) isAdultContentVisible: Boolean? = null,
         @RequestParam("contentType", required = false) contentType: ContentType? = null,
         @AuthenticationPrincipal(expression = "#this == 'anonymousUser' ? null : member") member: Member?,
@@ -31,6 +32,7 @@ class ContentSeriesController(private val service: ContentSeriesService) {
             service.getSeriesList(
                 creatorId = creatorId,
                 isOriginal = isOriginal ?: false,
+                isCompleted = isCompleted ?: false,
                 isAdultContentVisible = isAdultContentVisible ?: true,
                 contentType = contentType ?: ContentType.ALL,
                 member = member,

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

@@ -14,6 +14,7 @@ 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.SeriesPublishedDaysOfWeek
+import kr.co.vividnext.sodalive.creator.admin.content.series.SeriesState
 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
@@ -23,13 +24,37 @@ import org.springframework.data.jpa.repository.JpaRepository
 interface ContentSeriesRepository : JpaRepository<Series, Long>, ContentSeriesQueryRepository
 
 interface ContentSeriesQueryRepository {
-    fun getSeriesTotalCount(creatorId: Long?, isAuth: Boolean, contentType: ContentType, isOriginal: Boolean): Int
+    fun getSeriesTotalCount(
+        creatorId: Long?,
+        isAuth: Boolean,
+        contentType: ContentType,
+        isOriginal: Boolean,
+        isCompleted: Boolean
+    ): Int
+
     fun getSeriesList(
         imageHost: String,
         creatorId: Long?,
         isAuth: Boolean,
         contentType: ContentType,
         isOriginal: Boolean,
+        isCompleted: Boolean,
+        orderByRandom: Boolean,
+        offset: Long,
+        limit: Long
+    ): List<Series>
+
+    fun getSeriesByGenreTotalCount(
+        genreId: Long,
+        isAuth: Boolean,
+        contentType: ContentType
+    ): Int
+
+    fun getSeriesByGenreList(
+        imageHost: String,
+        genreId: Long,
+        isAuth: Boolean,
+        contentType: ContentType,
         offset: Long,
         limit: Long
     ): List<Series>
@@ -41,6 +66,7 @@ interface ContentSeriesQueryRepository {
     fun getOriginalAudioDramaList(
         isAdult: Boolean,
         contentType: ContentType,
+        orderByRandom: Boolean = false,
         offset: Long = 0,
         limit: Long = 20
     ): List<Series>
@@ -60,7 +86,13 @@ interface ContentSeriesQueryRepository {
 class ContentSeriesQueryRepositoryImpl(
     private val queryFactory: JPAQueryFactory
 ) : ContentSeriesQueryRepository {
-    override fun getSeriesTotalCount(creatorId: Long?, isAuth: Boolean, contentType: ContentType, isOriginal: Boolean): Int {
+    override fun getSeriesTotalCount(
+        creatorId: Long?,
+        isAuth: Boolean,
+        contentType: ContentType,
+        isOriginal: Boolean,
+        isCompleted: Boolean
+    ): Int {
         var where = series.isActive.isTrue
 
         if (creatorId != null) {
@@ -71,6 +103,10 @@ class ContentSeriesQueryRepositoryImpl(
             where = where.and(series.isOriginal.isTrue)
         }
 
+        if (isCompleted) {
+            where = where.and(series.state.eq(SeriesState.COMPLETE))
+        }
+
         if (!isAuth) {
             where = where.and(series.isAdult.isFalse)
         } else {
@@ -104,6 +140,8 @@ class ContentSeriesQueryRepositoryImpl(
         isAuth: Boolean,
         contentType: ContentType,
         isOriginal: Boolean,
+        isCompleted: Boolean,
+        orderByRandom: Boolean,
         offset: Long,
         limit: Long
     ): List<Series> {
@@ -116,6 +154,10 @@ class ContentSeriesQueryRepositoryImpl(
             where = where.and(series.isOriginal.isTrue)
         }
 
+        if (isCompleted) {
+            where = where.and(series.state.eq(SeriesState.COMPLETE))
+        }
+
         if (!isAuth) {
             where = where.and(series.isAdult.isFalse)
         } else {
@@ -134,11 +176,105 @@ class ContentSeriesQueryRepositoryImpl(
             }
         }
 
+        val orderBy = if (orderByRandom) {
+            listOf(Expressions.numberTemplate(Double::class.java, "function('rand')").asc())
+        } else if (creatorId != null) {
+            listOf(series.orders.asc(), series.createdAt.asc())
+        } else {
+            listOf(audioContent.releaseDate.max().desc(), series.createdAt.asc())
+        }
+
         return queryFactory
             .selectFrom(series)
             .innerJoin(series.member, member)
+            .innerJoin(seriesContent).on(series.id.eq(seriesContent.series.id))
+            .innerJoin(seriesContent.content, audioContent)
             .where(where)
-            .orderBy(series.orders.asc(), series.createdAt.asc())
+            .groupBy(series.id)
+            .orderBy(*orderBy.toTypedArray())
+            .offset(offset)
+            .limit(limit)
+            .fetch()
+    }
+
+    override fun getSeriesByGenreTotalCount(
+        genreId: Long,
+        isAuth: Boolean,
+        contentType: ContentType
+    ): Int {
+        var where = series.isActive.isTrue
+            .and(series.genre.id.eq(genreId))
+
+        if (!isAuth) {
+            where = where.and(series.isAdult.isFalse)
+        } else {
+            if (contentType != ContentType.ALL) {
+                where = where.and(
+                    series.member.isNull.or(
+                        series.member.auth.gender.eq(
+                            if (contentType == ContentType.MALE) {
+                                0
+                            } else {
+                                1
+                            }
+                        )
+                    )
+                )
+            }
+        }
+
+        return queryFactory
+            .select(series.id)
+            .from(seriesContent)
+            .innerJoin(seriesContent.series, series)
+            .innerJoin(seriesContent.content, audioContent)
+            .innerJoin(series.member, member)
+            .innerJoin(series.genre, seriesGenre)
+            .where(where)
+            .groupBy(series.id)
+            .fetch()
+            .size
+    }
+
+    override fun getSeriesByGenreList(
+        imageHost: String,
+        genreId: Long,
+        isAuth: Boolean,
+        contentType: ContentType,
+        offset: Long,
+        limit: Long
+    ): List<Series> {
+        var where = series.isActive.isTrue
+            .and(series.genre.id.eq(genreId))
+
+        if (!isAuth) {
+            where = where.and(series.isAdult.isFalse)
+        } else {
+            if (contentType != ContentType.ALL) {
+                where = where.and(
+                    series.member.isNull.or(
+                        series.member.auth.gender.eq(
+                            if (contentType == ContentType.MALE) {
+                                0
+                            } else {
+                                1
+                            }
+                        )
+                    )
+                )
+            }
+        }
+
+        return queryFactory
+            .select(series)
+            .from(seriesContent)
+            .innerJoin(seriesContent.series, series)
+            .innerJoin(seriesContent.content, audioContent)
+            .innerJoin(series.member, member)
+            .innerJoin(series.genre, seriesGenre)
+            .where(where)
+            .groupBy(series.id)
+            .orderBy(audioContent.releaseDate.max().desc(), series.createdAt.asc())
             .offset(offset)
             .limit(limit)
             .fetch()
@@ -231,6 +367,7 @@ class ContentSeriesQueryRepositoryImpl(
     override fun getOriginalAudioDramaList(
         isAdult: Boolean,
         contentType: ContentType,
+        orderByRandom: Boolean,
         offset: Long,
         limit: Long
     ): List<Series> {
@@ -259,7 +396,13 @@ class ContentSeriesQueryRepositoryImpl(
             .selectFrom(series)
             .innerJoin(series.member, member)
             .where(where)
-            .orderBy(series.id.desc())
+            .orderBy(
+                if (orderByRandom) {
+                    Expressions.numberTemplate(Double::class.java, "function('rand')").asc()
+                } else {
+                    series.id.desc()
+                }
+            )
             .offset(offset)
             .limit(limit)
             .fetch()

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

@@ -37,10 +37,11 @@ class ContentSeriesService(
     fun getOriginalAudioDramaList(
         isAdult: Boolean,
         contentType: ContentType,
+        orderByRandom: Boolean = false,
         offset: Long = 0,
         limit: Long = 20
     ): List<GetSeriesListResponse.SeriesListItem> {
-        val originalAudioDramaList = repository.getOriginalAudioDramaList(isAdult, contentType, offset, limit)
+        val originalAudioDramaList = repository.getOriginalAudioDramaList(isAdult, contentType, orderByRandom, offset, limit)
         return seriesToSeriesListItem(originalAudioDramaList, isAdult, contentType)
     }
 
@@ -51,11 +52,13 @@ class ContentSeriesService(
     fun getSeriesList(
         creatorId: Long?,
         isOriginal: Boolean = false,
+        isCompleted: Boolean = false,
+        orderByRandom: Boolean = false,
         isAdultContentVisible: Boolean,
         contentType: ContentType,
         member: Member,
         offset: Long = 0,
-        limit: Long = 10
+        limit: Long = 20
     ): GetSeriesListResponse {
         val isAuth = member.auth != null && isAdultContentVisible
 
@@ -63,7 +66,8 @@ class ContentSeriesService(
             creatorId = creatorId,
             isAuth = isAuth,
             contentType = contentType,
-            isOriginal = isOriginal
+            isOriginal = isOriginal,
+            isCompleted = isCompleted
         )
 
         val rawItems = repository.getSeriesList(
@@ -72,6 +76,37 @@ class ContentSeriesService(
             isAuth = isAuth,
             contentType = contentType,
             isOriginal = isOriginal,
+            isCompleted = isCompleted,
+            orderByRandom = orderByRandom,
+            offset = offset,
+            limit = limit
+        ).filter { !blockMemberRepository.isBlocked(blockedMemberId = member.id!!, memberId = it.member!!.id!!) }
+
+        val items = seriesToSeriesListItem(seriesList = rawItems, isAdult = isAuth, contentType = contentType)
+        return GetSeriesListResponse(totalCount, items)
+    }
+
+    fun getSeriesListByGenre(
+        genreId: Long,
+        isAdultContentVisible: Boolean,
+        contentType: ContentType,
+        member: Member,
+        offset: Long = 0,
+        limit: Long = 20
+    ): GetSeriesListResponse {
+        val isAuth = member.auth != null && isAdultContentVisible
+
+        val totalCount = repository.getSeriesByGenreTotalCount(
+            genreId = genreId,
+            isAuth = isAuth,
+            contentType = contentType
+        )
+
+        val rawItems = repository.getSeriesByGenreList(
+            imageHost = coverImageHost,
+            genreId = genreId,
+            isAuth = isAuth,
+            contentType = contentType,
             offset = offset,
             limit = limit
         ).filter { !blockMemberRepository.isBlocked(blockedMemberId = member.id!!, memberId = it.member!!.id!!) }
@@ -205,7 +240,7 @@ class ContentSeriesService(
         val seriesList = repository.getRecommendSeriesList(
             isAuth = isAuth,
             contentType = contentType,
-            limit = 10
+            limit = 20
         ).filter { !blockMemberRepository.isBlocked(blockedMemberId = member.id!!, memberId = it.member!!.id!!) }
 
         return seriesToSeriesListItem(seriesList = seriesList, isAdult = isAuth, contentType = contentType)

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

@@ -0,0 +1,10 @@
+package kr.co.vividnext.sodalive.content.series.main
+
+import kr.co.vividnext.sodalive.admin.content.series.banner.dto.SeriesBannerResponse
+import kr.co.vividnext.sodalive.content.series.GetSeriesListResponse
+
+data class SeriesHomeResponse(
+    val banners: List<SeriesBannerResponse>,
+    val completedSeriesList: List<GetSeriesListResponse.SeriesListItem>,
+    val recommendSeriesList: List<GetSeriesListResponse.SeriesListItem>
+)

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

@@ -0,0 +1,151 @@
+package kr.co.vividnext.sodalive.content.series.main
+
+import kr.co.vividnext.sodalive.admin.content.series.banner.dto.SeriesBannerResponse
+import kr.co.vividnext.sodalive.common.ApiResponse
+import kr.co.vividnext.sodalive.common.SodaException
+import kr.co.vividnext.sodalive.content.ContentType
+import kr.co.vividnext.sodalive.content.series.ContentSeriesService
+import kr.co.vividnext.sodalive.content.series.main.banner.ContentSeriesBannerService
+import kr.co.vividnext.sodalive.creator.admin.content.series.SeriesPublishedDaysOfWeek
+import kr.co.vividnext.sodalive.member.Member
+import org.springframework.beans.factory.annotation.Value
+import org.springframework.data.domain.PageRequest
+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.RequestParam
+import org.springframework.web.bind.annotation.RestController
+
+@RestController
+@RequestMapping("/audio-content/series/main")
+class SeriesMainController(
+    private val contentSeriesService: ContentSeriesService,
+    private val bannerService: ContentSeriesBannerService,
+
+    @Value("\${cloud.aws.cloud-front.host}")
+    private val imageHost: String
+) {
+    @GetMapping
+    fun fetchData(
+        @RequestParam("isAdultContentVisible", required = false) isAdultContentVisible: Boolean? = null,
+        @RequestParam("contentType", required = false) contentType: ContentType? = null,
+        @AuthenticationPrincipal(expression = "#this == 'anonymousUser' ? null : member") member: Member?
+    ) = run {
+        if (member == null) throw SodaException("로그인 정보를 확인해주세요.")
+
+        val banners = bannerService.getActiveBanners(PageRequest.of(0, 10))
+            .content
+            .map {
+                SeriesBannerResponse.from(it, imageHost)
+            }
+
+        val completedSeriesList = contentSeriesService.getSeriesList(
+            creatorId = null,
+            isCompleted = true,
+            orderByRandom = true,
+            isAdultContentVisible = isAdultContentVisible ?: true,
+            contentType = contentType ?: ContentType.ALL,
+            member = member
+        ).items
+
+        val recommendSeriesList = contentSeriesService.getRecommendSeriesList(
+            isAdultContentVisible = isAdultContentVisible ?: true,
+            contentType = contentType ?: ContentType.ALL,
+            member = member
+        )
+
+        ApiResponse.ok(
+            SeriesHomeResponse(
+                banners = banners,
+                completedSeriesList = completedSeriesList,
+                recommendSeriesList = recommendSeriesList
+
+            )
+        )
+    }
+
+    @GetMapping("/recommend")
+    fun getRecommendSeriesList(
+        @RequestParam("isAdultContentVisible", required = false) isAdultContentVisible: Boolean? = null,
+        @RequestParam("contentType", required = false) contentType: ContentType? = null,
+        @AuthenticationPrincipal(expression = "#this == 'anonymousUser' ? null : member") member: Member?
+    ) = run {
+        if (member == null) throw SodaException("로그인 정보를 확인해주세요.")
+
+        ApiResponse.ok(
+            contentSeriesService.getRecommendSeriesList(
+                isAdultContentVisible = isAdultContentVisible ?: true,
+                contentType = contentType ?: ContentType.ALL,
+                member = member
+            )
+        )
+    }
+
+    @GetMapping("/day-of-week")
+    fun getDayOfWeekSeriesList(
+        @RequestParam("dayOfWeek") dayOfWeek: SeriesPublishedDaysOfWeek,
+        @RequestParam("isAdultContentVisible", required = false) isAdultContentVisible: Boolean? = null,
+        @RequestParam("contentType", required = false) contentType: ContentType? = null,
+        @RequestParam(defaultValue = "0") page: Int,
+        @RequestParam(defaultValue = "20") size: Int,
+        @AuthenticationPrincipal(expression = "#this == 'anonymousUser' ? null : member") member: Member?
+    ) = run {
+        if (member == null) throw SodaException("로그인 정보를 확인해주세요.")
+        val pageable = PageRequest.of(page, size)
+
+        ApiResponse.ok(
+            contentSeriesService.getDayOfWeekSeriesList(
+                memberId = member.id,
+                isAdult = member.auth != null && (isAdultContentVisible ?: true),
+                contentType = contentType ?: ContentType.ALL,
+                dayOfWeek = dayOfWeek,
+                offset = pageable.offset,
+                limit = pageable.pageSize.toLong()
+            )
+        )
+    }
+
+    @GetMapping("/genre-list")
+    fun getGenreList(
+        @RequestParam("isAdultContentVisible", required = false) isAdultContentVisible: Boolean? = null,
+        @RequestParam("contentType", required = false) contentType: ContentType? = null,
+        @AuthenticationPrincipal(expression = "#this == 'anonymousUser' ? null : member") member: Member?
+    ) = run {
+        if (member == null) throw SodaException("로그인 정보를 확인해주세요.")
+
+        val memberId = member.id!!
+        val isAdult = member.auth != null && (isAdultContentVisible ?: true)
+
+        ApiResponse.ok(
+            contentSeriesService.getGenreList(
+                memberId = memberId,
+                isAdult = isAdult,
+                contentType = contentType ?: ContentType.ALL
+            )
+        )
+    }
+
+    @GetMapping("/list-by-genre")
+    fun getSeriesListByGenre(
+        @RequestParam("genreId") genreId: Long,
+        @RequestParam("isAdultContentVisible", required = false) isAdultContentVisible: Boolean? = null,
+        @RequestParam("contentType", required = false) contentType: ContentType? = null,
+        @RequestParam(defaultValue = "0") page: Int,
+        @RequestParam(defaultValue = "20") size: Int,
+        @AuthenticationPrincipal(expression = "#this == 'anonymousUser' ? null : member") member: Member?
+    ) = run {
+        if (member == null) throw SodaException("로그인 정보를 확인해주세요.")
+        val pageable = PageRequest.of(page, size)
+
+        ApiResponse.ok(
+            contentSeriesService.getSeriesListByGenre(
+                genreId = genreId,
+                isAdultContentVisible = isAdultContentVisible ?: true,
+                contentType = contentType ?: ContentType.ALL,
+                member = member,
+                offset = pageable.offset,
+                limit = pageable.pageSize.toLong()
+            )
+        )
+    }
+}

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

@@ -0,0 +1,80 @@
+package kr.co.vividnext.sodalive.content.series.main.banner
+
+import kr.co.vividnext.sodalive.admin.content.series.AdminContentSeriesRepository
+import kr.co.vividnext.sodalive.common.SodaException
+import org.springframework.data.domain.Page
+import org.springframework.data.domain.Pageable
+import org.springframework.stereotype.Service
+import org.springframework.transaction.annotation.Transactional
+
+@Service
+class ContentSeriesBannerService(
+    private val bannerRepository: SeriesBannerRepository,
+    private val seriesRepository: AdminContentSeriesRepository
+) {
+    fun getActiveBanners(pageable: Pageable): Page<SeriesBanner> {
+        return bannerRepository.findByIsActiveTrueOrderBySortOrderAsc(pageable)
+    }
+
+    fun getBannerById(bannerId: Long): SeriesBanner {
+        return bannerRepository.findById(bannerId)
+            .orElseThrow { SodaException("배너를 찾을 수 없습니다: $bannerId") }
+    }
+
+    @Transactional
+    fun registerBanner(seriesId: Long, imagePath: String): SeriesBanner {
+        val series = seriesRepository.findByIdAndActiveTrue(seriesId)
+            ?: throw SodaException("시리즈를 찾을 수 없습니다: $seriesId")
+
+        val finalSortOrder = (bannerRepository.findMaxSortOrder() ?: 0) + 1
+
+        val banner = SeriesBanner(
+            imagePath = imagePath,
+            series = series,
+            sortOrder = finalSortOrder
+        )
+        return bannerRepository.save(banner)
+    }
+
+    @Transactional
+    fun updateBanner(
+        bannerId: Long,
+        imagePath: String? = null,
+        seriesId: Long? = null
+    ): SeriesBanner {
+        val banner = bannerRepository.findById(bannerId)
+            .orElseThrow { SodaException("배너를 찾을 수 없습니다: $bannerId") }
+        if (!banner.isActive) throw SodaException("비활성화된 배너는 수정할 수 없습니다: $bannerId")
+
+        if (imagePath != null) banner.imagePath = imagePath
+
+        if (seriesId != null) {
+            val series = seriesRepository.findByIdAndActiveTrue(seriesId)
+                ?: throw SodaException("시리즈를 찾을 수 없습니다: $seriesId")
+            banner.series = series
+        }
+
+        return bannerRepository.save(banner)
+    }
+
+    @Transactional
+    fun deleteBanner(bannerId: Long) {
+        val banner = bannerRepository.findById(bannerId)
+            .orElseThrow { SodaException("배너를 찾을 수 없습니다: $bannerId") }
+        banner.isActive = false
+        bannerRepository.save(banner)
+    }
+
+    @Transactional
+    fun updateBannerOrders(ids: List<Long>): List<SeriesBanner> {
+        val updated = mutableListOf<SeriesBanner>()
+        for (index in ids.indices) {
+            val banner = bannerRepository.findById(ids[index])
+                .orElseThrow { SodaException("배너를 찾을 수 없습니다: ${ids[index]}") }
+            if (!banner.isActive) throw SodaException("비활성화된 배너는 수정할 수 없습니다: ${ids[index]}")
+            banner.sortOrder = index + 1
+            updated.add(bannerRepository.save(banner))
+        }
+        return updated
+    }
+}

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

@@ -0,0 +1,30 @@
+package kr.co.vividnext.sodalive.content.series.main.banner
+
+import kr.co.vividnext.sodalive.common.BaseEntity
+import kr.co.vividnext.sodalive.creator.admin.content.series.Series
+import javax.persistence.Entity
+import javax.persistence.FetchType
+import javax.persistence.JoinColumn
+import javax.persistence.ManyToOne
+
+/**
+ * 시리즈 배너 엔티티
+ * 이미지와 시리즈 ID를 가지며, 소프트 삭제(isActive = false)를 지원합니다.
+ * 정렬 순서(sortOrder)를 통해 배너의 표시 순서를 결정합니다.
+ */
+@Entity
+class SeriesBanner(
+    // 배너 이미지 경로
+    var imagePath: String? = null,
+
+    // 연관된 캐릭터
+    @ManyToOne(fetch = FetchType.LAZY)
+    @JoinColumn(name = "series_id")
+    var series: Series,
+
+    // 정렬 순서 (낮을수록 먼저 표시)
+    var sortOrder: Int = 0,
+
+    // 활성화 여부 (소프트 삭제용)
+    var isActive: Boolean = true
+) : BaseEntity()

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

@@ -0,0 +1,15 @@
+package kr.co.vividnext.sodalive.content.series.main.banner
+
+import org.springframework.data.domain.Page
+import org.springframework.data.domain.Pageable
+import org.springframework.data.jpa.repository.JpaRepository
+import org.springframework.data.jpa.repository.Query
+import org.springframework.stereotype.Repository
+
+@Repository
+interface SeriesBannerRepository : JpaRepository<SeriesBanner, Long> {
+    fun findByIsActiveTrueOrderBySortOrderAsc(pageable: Pageable): Page<SeriesBanner>
+
+    @Query("SELECT MAX(b.sortOrder) FROM SeriesBanner b WHERE b.isActive = true")
+    fun findMaxSortOrder(): Int?
+}

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

@@ -27,6 +27,26 @@ class AudioContentThemeController(private val service: AudioContentThemeService)
         ApiResponse.ok(service.getThemes())
     }
 
+    @GetMapping("/active")
+    fun getActiveThemes(
+        @RequestParam("isFree", required = false) isFree: Boolean? = null,
+        @RequestParam("isPointAvailableOnly", required = false) isPointAvailableOnly: Boolean? = null,
+        @RequestParam("isAdultContentVisible", required = false) isAdultContentVisible: Boolean? = null,
+        @RequestParam("contentType", required = false) contentType: ContentType? = null,
+        @AuthenticationPrincipal(expression = "#this == 'anonymousUser' ? null : member") member: Member?
+    ) = run {
+        if (member == null) throw SodaException("로그인 정보를 확인해주세요.")
+
+        ApiResponse.ok(
+            service.getActiveThemeOfContent(
+                isAdult = member.auth != null && (isAdultContentVisible ?: true),
+                isFree = isFree ?: false,
+                isPointAvailableOnly = isPointAvailableOnly ?: false,
+                contentType = contentType ?: ContentType.ALL
+            )
+        )
+    }
+
     @GetMapping("/{id}/content")
     fun getContentByTheme(
         @PathVariable id: Long,

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

@@ -1,5 +1,6 @@
 package kr.co.vividnext.sodalive.content.theme
 
+import com.querydsl.core.types.dsl.CaseBuilder
 import com.querydsl.jpa.impl.JPAQueryFactory
 import kr.co.vividnext.sodalive.content.ContentType
 import kr.co.vividnext.sodalive.content.QAudioContent.audioContent
@@ -32,6 +33,7 @@ class AudioContentThemeQueryRepository(
     fun getActiveThemeOfContent(
         isAdult: Boolean = false,
         isFree: Boolean = false,
+        isPointAvailableOnly: Boolean = false,
         contentType: ContentType
     ): List<String> {
         var where = audioContent.isActive.isTrue
@@ -59,15 +61,31 @@ class AudioContentThemeQueryRepository(
             where = where.and(audioContent.price.loe(0))
         }
 
-        return queryFactory
+        if (isPointAvailableOnly) {
+            where = where.and(audioContent.isPointAvailable.isTrue)
+        }
+
+        val query = queryFactory
             .select(audioContentTheme.theme)
             .from(audioContent)
             .innerJoin(audioContent.member, member)
             .innerJoin(audioContent.theme, audioContentTheme)
             .where(where)
             .groupBy(audioContentTheme.id)
-            .orderBy(audioContentTheme.orders.asc())
+
-            .fetch()
+        if (isFree) {
+            query.orderBy(
+                CaseBuilder()
+                    .`when`(audioContentTheme.theme.eq("자기소개")).then(0)
+                    .otherwise(1)
+                    .asc(),
+                audioContentTheme.orders.asc()
+            )
+        } else {
+            query.orderBy(audioContentTheme.orders.asc())
+        }
+
+        return query.fetch()
     }
 
     fun findThemeByIdAndActive(id: Long): AudioContentTheme? {

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

@@ -23,11 +23,13 @@ class AudioContentThemeService(
     fun getActiveThemeOfContent(
         isAdult: Boolean = false,
         isFree: Boolean = false,
+        isPointAvailableOnly: Boolean = false,
         contentType: ContentType
     ): List<String> {
         return queryRepository.getActiveThemeOfContent(
             isAdult = isAdult,
             isFree = isFree,
+            isPointAvailableOnly = isPointAvailableOnly,
             contentType = contentType
         )
     }