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

@@ -50,7 +50,6 @@ class ContentSeriesController(private val service: ContentSeriesService) {
     @GetMapping("/{id}/content")
     fun getSeriesContentList(
         @PathVariable id: Long,
-        @RequestParam("sortType", defaultValue = "NEWEST") sortType: SeriesSortType,
         @AuthenticationPrincipal(expression = "#this == 'anonymousUser' ? null : member") member: Member?,
         pageable: Pageable
     ) = run {
@@ -60,7 +59,6 @@ class ContentSeriesController(private val service: ContentSeriesService) {
             service.getSeriesContentList(
                 seriesId = id,
                 member = member,
-                sortType = sortType,
                 offset = pageable.offset,
                 limit = pageable.pageSize.toLong()
             )

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

@@ -75,13 +75,7 @@ class ContentSeriesService(
         val rentalMinPrice = (minMaxPrice.minPrice * 0.6).toInt()
         val rentalMaxPrice = (minMaxPrice.maxPrice * 0.6).toInt()
 
-        val seriesContentList = getSeriesContentList(
+        val seriesContentList = getSeriesContentList(seriesId = seriesId, member = member, offset = 0, limit = 5)
-            seriesId = seriesId,
-            member = member,
-            sortType = SeriesSortType.NEWEST,
-            offset = 0,
-            limit = 5
-        )
 
         val dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy.MM.dd")
         return GetSeriesDetailResponse(
@@ -116,13 +110,7 @@ class ContentSeriesService(
         )
     }
 
-    fun getSeriesContentList(
+    fun getSeriesContentList(seriesId: Long, member: Member, offset: Long, limit: Long): GetSeriesContentListResponse {
-        seriesId: Long,
-        member: Member,
-        sortType: SeriesSortType,
-        offset: Long,
-        limit: Long
-    ): GetSeriesContentListResponse {
         val isAdult = member.auth != null
 
         val totalCount = seriesContentRepository.getContentCount(seriesId, isAdult = isAdult)
@@ -130,7 +118,6 @@ class ContentSeriesService(
             seriesId = seriesId,
             isAdult = isAdult,
             imageHost = coverImageHost,
-            sortType = sortType,
             offset = offset,
             limit = limit
         )

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

@@ -6,7 +6,6 @@ import kr.co.vividnext.sodalive.content.QAudioContent.audioContent
 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.SeriesContent
-import kr.co.vividnext.sodalive.creator.admin.content.series.SeriesSortType
 import org.springframework.data.jpa.repository.JpaRepository
 import java.time.LocalDateTime
 
@@ -18,7 +17,6 @@ interface ContentSeriesContentQueryRepository {
         seriesId: Long,
         isAdult: Boolean,
         imageHost: String,
-        sortType: SeriesSortType,
         offset: Long,
         limit: Long
     ): List<GetSeriesContentListItem>
@@ -51,7 +49,6 @@ class ContentSeriesContentQueryRepositoryImpl(
         seriesId: Long,
         isAdult: Boolean,
         imageHost: String,
-        sortType: SeriesSortType,
         offset: Long,
         limit: Long
     ): List<GetSeriesContentListItem> {
@@ -59,12 +56,6 @@ class ContentSeriesContentQueryRepositoryImpl(
             .and(audioContent.isActive.isTrue)
             .and(audioContent.duration.isNotNull)
 
-        var orderBy = seriesContent.createdAt.desc()
-
-        if (sortType == SeriesSortType.OLDEST) {
-            orderBy = seriesContent.createdAt.asc()
-        }
-
         if (!isAdult) {
             where = where.and(audioContent.isAdult.isFalse)
         }
@@ -98,7 +89,7 @@ class ContentSeriesContentQueryRepositoryImpl(
             .innerJoin(seriesContent.series, series)
             .innerJoin(seriesContent.content, audioContent)
             .where(where)
-            .orderBy(orderBy)
+            .orderBy(series.orders.asc(), series.createdAt.asc())
             .offset(offset)
             .limit(limit)
             .fetch()

src/main/kotlin/kr/co/vividnext/sodalive/creator/admin/content/series/Series.kt

@@ -26,7 +26,7 @@ enum class SeriesState {
 }
 
 enum class SeriesSortType {
-    NEWEST, OLDEST
+    NEWEST, POPULAR
 }
 
 @Entity

src/main/kotlin/kr/co/vividnext/sodalive/live/room/EditLiveRoomInfoRequest.kt

@@ -8,6 +8,5 @@ data class EditLiveRoomInfoRequest(
     val timezone: String?,
     val menuPanId: Long = 0,
     val menuPan: String = "",
-    val isActiveMenuPan: Boolean? = null,
+    val isActiveMenuPan: Boolean? = null
-    val isAdult: Boolean? = null
 )

src/main/kotlin/kr/co/vividnext/sodalive/live/room/LiveRoomService.kt

@@ -749,10 +749,6 @@ class LiveRoomService(
                     .toLocalDateTime()
             }
 
-            if (request.isAdult != null) {
-                room.isAdult = request.isAdult
-            }
-
             if (request.isActiveMenuPan != null) {
                 if (request.isActiveMenuPan) {
                     if (request.menuPanId > 0) {