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

@@ -64,7 +64,6 @@ interface AudioContentQueryRepository {
         theme: String = "",
         sortType: SortType = SortType.NEWEST,
         isAdult: Boolean = false,
-        contentType: ContentType = ContentType.ALL,
         offset: Long = 0,
         limit: Long = 20
     ): List<GetAudioContentMainItem>
@@ -80,17 +79,11 @@ interface AudioContentQueryRepository {
         memberId: Long,
         theme: String = "",
         isAdult: Boolean = false,
-        contentType: ContentType = ContentType.ALL,
         offset: Long = 0,
         limit: Long = 20
     ): List<GetAudioContentMainItem>
 
-    fun totalCountNewContentFor2Weeks(
+    fun totalCountNewContentFor2Weeks(theme: String, memberId: Long, isAdult: Boolean): Int
-        theme: String,
-        memberId: Long,
-        isAdult: Boolean,
-        contentType: ContentType = ContentType.ALL
-    ): Int
 
     fun getNewContentUploadCreatorList(
         cloudfrontHost: String,
@@ -102,8 +95,7 @@ interface AudioContentQueryRepository {
     fun findAudioContentByCurationId(
         curationId: Long,
         cloudfrontHost: String,
-        isAdult: Boolean,
+        isAdult: Boolean
-        contentType: ContentType = ContentType.ALL
     ): List<GetAudioContentMainItem>
 
     fun getAudioContentRanking(
@@ -341,7 +333,6 @@ class AudioContentQueryRepositoryImpl(private val queryFactory: JPAQueryFactory)
         theme: String,
         sortType: SortType,
         isAdult: Boolean,
-        contentType: ContentType,
         offset: Long,
         limit: Long
     ): List<GetAudioContentMainItem> {
@@ -370,13 +361,6 @@ class AudioContentQueryRepositoryImpl(private val queryFactory: JPAQueryFactory)
 
         if (!isAdult) {
             where = where.and(audioContent.isAdult.isFalse)
-        } else {
-            if (contentType != ContentType.ALL) {
-                where = where.and(
-                    audioContent.member.auth.gender.eq(if (contentType == ContentType.MALE) 0 else 1)
-                        .or(audioContent.isAdult.isFalse)
-                )
-            }
         }
 
         if (theme.isNotBlank()) {
@@ -433,12 +417,7 @@ class AudioContentQueryRepositoryImpl(private val queryFactory: JPAQueryFactory)
             .size
     }
 
-    override fun totalCountNewContentFor2Weeks(
+    override fun totalCountNewContentFor2Weeks(theme: String, memberId: Long, isAdult: Boolean): Int {
-        theme: String,
-        memberId: Long,
-        isAdult: Boolean,
-        contentType: ContentType
-    ): Int {
         var where = audioContent.isActive.isTrue
             .and(audioContent.duration.isNotNull)
             .and(audioContent.releaseDate.goe(LocalDateTime.now().minusWeeks(2)))
@@ -450,13 +429,6 @@ class AudioContentQueryRepositoryImpl(private val queryFactory: JPAQueryFactory)
 
         if (!isAdult) {
             where = where.and(audioContent.isAdult.isFalse)
-        } else {
-            if (contentType != ContentType.ALL) {
-                where = where.and(
-                    audioContent.member.auth.gender.eq(if (contentType == ContentType.MALE) 0 else 1)
-                        .or(audioContent.isAdult.isFalse)
-                )
-            }
         }
 
         if (theme.isNotBlank()) {
@@ -478,7 +450,6 @@ class AudioContentQueryRepositoryImpl(private val queryFactory: JPAQueryFactory)
         memberId: Long,
         theme: String,
         isAdult: Boolean,
-        contentType: ContentType,
         offset: Long,
         limit: Long
     ): List<GetAudioContentMainItem> {
@@ -493,13 +464,6 @@ class AudioContentQueryRepositoryImpl(private val queryFactory: JPAQueryFactory)
 
         if (!isAdult) {
             where = where.and(audioContent.isAdult.isFalse)
-        } else {
-            if (contentType != ContentType.ALL) {
-                where = where.and(
-                    audioContent.member.auth.gender.eq(if (contentType == ContentType.MALE) 0 else 1)
-                        .or(audioContent.isAdult.isFalse)
-                )
-            }
         }
 
         if (theme.isNotBlank()) {
@@ -550,6 +514,7 @@ class AudioContentQueryRepositoryImpl(private val queryFactory: JPAQueryFactory)
             .orderBy(Expressions.numberTemplate(Double::class.java, "function('rand')").asc())
             .limit(20)
             .fetch()
+            .asSequence()
             .map {
                 GetNewContentUploadCreator(
                     it.id!!,
@@ -561,6 +526,7 @@ class AudioContentQueryRepositoryImpl(private val queryFactory: JPAQueryFactory)
                     }
                 )
             }
+            .toList()
     }
 
     override fun getAudioContentMainBannerList(isAdult: Boolean): List<AudioContentBanner> {
@@ -596,8 +562,7 @@ class AudioContentQueryRepositoryImpl(private val queryFactory: JPAQueryFactory)
     override fun findAudioContentByCurationId(
         curationId: Long,
         cloudfrontHost: String,
-        isAdult: Boolean,
+        isAdult: Boolean
-        contentType: ContentType
     ): List<GetAudioContentMainItem> {
         var where = audioContent.isActive.isTrue
             .and(audioContent.member.isNotNull)
@@ -607,13 +572,6 @@ class AudioContentQueryRepositoryImpl(private val queryFactory: JPAQueryFactory)
 
         if (!isAdult) {
             where = where.and(audioContent.isAdult.isFalse)
-        } else {
-            if (contentType != ContentType.ALL) {
-                where = where.and(
-                    audioContent.member.auth.gender.eq(if (contentType == ContentType.MALE) 0 else 1)
-                        .or(audioContent.isAdult.isFalse)
-                )
-            }
         }
 
         return queryFactory

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

@@ -1,12 +0,0 @@
-package kr.co.vividnext.sodalive.content
-
-enum class ContentType {
-    // 전체
-    ALL,
-
-    // 남성향
-    MALE,
-
-    // 여성향
-    FEMALE
-}

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

@@ -2,7 +2,6 @@ package kr.co.vividnext.sodalive.content.main
 
 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.order.OrderService
 import kr.co.vividnext.sodalive.member.Member
 import org.springframework.data.domain.Pageable
@@ -63,22 +62,12 @@ class AudioContentMainController(
     @GetMapping("/new")
     fun getNewContentByTheme(
         @RequestParam("theme") theme: String,
-        @RequestParam("isAdultContentVisible", required = false) isAdultContentVisible: Boolean? = null,
-        @RequestParam("contentType", required = false) contentType: ContentType? = null,
         @AuthenticationPrincipal(expression = "#this == 'anonymousUser' ? null : member") member: Member?,
         pageable: Pageable
     ) = run {
         if (member == null) throw SodaException("로그인 정보를 확인해주세요.")
 
-        ApiResponse.ok(
+        ApiResponse.ok(service.getNewContentByTheme(theme, member, pageable))
-            service.getNewContentByTheme(
-                theme,
-                isAdultContentVisible = isAdultContentVisible ?: true,
-                contentType = contentType ?: ContentType.ALL,
-                member,
-                pageable
-            )
-        )
     }
 
     @GetMapping("/theme")
@@ -93,28 +82,16 @@ class AudioContentMainController(
     @GetMapping("/new/all")
     fun getNewContentAllByTheme(
         @RequestParam("theme") theme: String,
-        @RequestParam("isAdultContentVisible", required = false) isAdultContentVisible: Boolean? = null,
-        @RequestParam("contentType", required = false) contentType: ContentType? = null,
         @AuthenticationPrincipal(expression = "#this == 'anonymousUser' ? null : member") member: Member?,
         pageable: Pageable
     ) = run {
         if (member == null) throw SodaException("로그인 정보를 확인해주세요.")
 
-        ApiResponse.ok(
+        ApiResponse.ok(service.getNewContentFor2WeeksByTheme(theme, member, pageable))
-            service.getNewContentFor2WeeksByTheme(
-                theme = theme,
-                isAdultContentVisible = isAdultContentVisible ?: true,
-                contentType = contentType ?: ContentType.ALL,
-                member = member,
-                pageable = pageable
-            )
-        )
     }
 
     @GetMapping("/curation-list")
     fun getCurationList(
-        @RequestParam("isAdultContentVisible", required = false) isAdultContentVisible: Boolean? = null,
-        @RequestParam("contentType", required = false) contentType: ContentType? = null,
         @AuthenticationPrincipal(expression = "#this == 'anonymousUser' ? null : member") member: Member?,
         pageable: Pageable
     ) = run {
@@ -123,8 +100,7 @@ class AudioContentMainController(
         ApiResponse.ok(
             service.getAudioContentCurationListWithPaging(
                 memberId = member.id!!,
-                isAdult = member.auth != null && (isAdultContentVisible ?: true),
+                isAdult = member.auth != null,
-                contentType = contentType ?: ContentType.ALL,
                 offset = pageable.offset,
                 limit = pageable.pageSize.toLong()
             )

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

@@ -1,7 +1,6 @@
 package kr.co.vividnext.sodalive.content.main
 
 import kr.co.vividnext.sodalive.content.AudioContentRepository
-import kr.co.vividnext.sodalive.content.ContentType
 import kr.co.vividnext.sodalive.content.main.banner.AudioContentBannerType
 import kr.co.vividnext.sodalive.content.main.banner.GetAudioContentBannerResponse
 import kr.co.vividnext.sodalive.content.main.curation.GetAudioContentCurationResponse
@@ -31,49 +30,35 @@ class AudioContentMainService(
     }
 
     @Transactional(readOnly = true)
-    fun getNewContentByTheme(
+    fun getNewContentByTheme(theme: String, member: Member, pageable: Pageable): List<GetAudioContentMainItem> {
-        theme: String,
-        isAdultContentVisible: Boolean,
-        contentType: ContentType,
-        member: Member,
-        pageable: Pageable
-    ): List<GetAudioContentMainItem> {
         return repository.findByTheme(
             cloudfrontHost = imageHost,
             memberId = member.id!!,
             theme = theme,
-            isAdult = member.auth != null && isAdultContentVisible,
+            isAdult = member.auth != null,
-            contentType = contentType,
             offset = pageable.offset,
             limit = pageable.pageSize.toLong()
         )
+            .asSequence()
             .filter { !blockMemberRepository.isBlocked(blockedMemberId = member.id!!, memberId = it.creatorId) }
+            .toList()
     }
 
     @Transactional(readOnly = true)
-    fun getNewContentFor2WeeksByTheme(
+    fun getNewContentFor2WeeksByTheme(theme: String, member: Member, pageable: Pageable): GetNewContentAllResponse {
-        theme: String,
+        val totalCount =
-        isAdultContentVisible: Boolean,
+            repository.totalCountNewContentFor2Weeks(theme, memberId = member.id!!, isAdult = member.auth != null)
-        contentType: ContentType,
-        member: Member,
-        pageable: Pageable
-    ): GetNewContentAllResponse {
-        val totalCount = repository.totalCountNewContentFor2Weeks(
-            theme,
-            memberId = member.id!!,
-            isAdult = member.auth != null && isAdultContentVisible,
-            contentType = contentType
-        )
         val items = repository.findByThemeFor2Weeks(
             cloudfrontHost = imageHost,
             memberId = member.id!!,
             theme = theme,
-            isAdult = member.auth != null && isAdultContentVisible,
+            isAdult = member.auth != null,
-            contentType = contentType,
             offset = pageable.offset,
             limit = pageable.pageSize.toLong()
         )
+            .asSequence()
             .filter { !blockMemberRepository.isBlocked(blockedMemberId = member.id!!, memberId = it.creatorId) }
+            .toList()
 
         return GetNewContentAllResponse(totalCount, items)
     }
@@ -145,13 +130,9 @@ class AudioContentMainService(
         cacheNames = ["default"],
         key = "'getAudioContentCurationListWithPaging:' + #memberId + ':' + #isAdult + ':' + #offset + ':' + #limit"
     )
-    fun getAudioContentCurationListWithPaging(
+    fun getAudioContentCurationListWithPaging(memberId: Long, isAdult: Boolean, offset: Long, limit: Long) =
-        memberId: Long,
+        repository.getAudioContentCurationList(isAdult = isAdult, offset = offset, limit = limit)
-        isAdult: Boolean,
+            .asSequence()
-        contentType: ContentType,
-        offset: Long,
-        limit: Long
-    ) = repository.getAudioContentCurationList(isAdult = isAdult, offset = offset, limit = limit)
             .map {
                 GetAudioContentCurationResponse(
                     curationId = it.id!!,
@@ -160,13 +141,15 @@ class AudioContentMainService(
                     contents = repository.findAudioContentByCurationId(
                         curationId = it.id!!,
                         cloudfrontHost = imageHost,
-                    isAdult = isAdult,
+                        isAdult = isAdult
-                    contentType = contentType
                     )
+                        .asSequence()
                         .filter { content ->
                             !blockMemberRepository.isBlocked(blockedMemberId = memberId, memberId = content.creatorId)
                         }
+                        .toList()
                 )
             }
             .filter { it.contents.isNotEmpty() }
+            .toList()
 }

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

@@ -33,22 +33,12 @@ class LiveRoomController(
         @RequestParam timezone: String,
         @RequestParam dateString: String? = null,
         @RequestParam status: LiveRoomStatus,
-        @RequestParam("isAdultContentVisible", required = false) isAdultContentVisible: Boolean? = null,
         @AuthenticationPrincipal(expression = "#this == 'anonymousUser' ? null : member") member: Member?,
         pageable: Pageable
     ) = run {
         if (member == null) throw SodaException("로그인 정보를 확인해주세요.")
 
-        ApiResponse.ok(
+        ApiResponse.ok(service.getRoomList(dateString, status, pageable, member, timezone))
-            service.getRoomList(
-                dateString,
-                status,
-                isAdultContentVisible ?: true,
-                pageable,
-                member,
-                timezone
-            )
-        )
     }
 
     @PostMapping

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

@@ -113,7 +113,6 @@ class LiveRoomService(
     fun getRoomList(
         dateString: String?,
         status: LiveRoomStatus,
-        isAdultContentVisible: Boolean,
         pageable: Pageable,
         member: Member,
         timezone: String
@@ -124,7 +123,7 @@ class LiveRoomService(
                 timezone,
                 memberId = member.id!!,
                 isCreator = member.role == MemberRole.CREATOR,
-                isAdult = member.auth != null && isAdultContentVisible
+                isAdult = member.auth != null
             )
         } else if (dateString != null) {
             getLiveRoomListReservationWithDate(
@@ -133,14 +132,14 @@ class LiveRoomService(
                 timezone,
                 memberId = member.id!!,
                 isCreator = member.role == MemberRole.CREATOR,
-                isAdult = member.auth != null && isAdultContentVisible
+                isAdult = member.auth != null
             )
         } else {
             getLiveRoomListReservationWithoutDate(
                 timezone,
                 isCreator = member.role == MemberRole.CREATOR,
                 memberId = member.id!!,
-                isAdult = member.auth != null && isAdultContentVisible
+                isAdult = member.auth != null
             )
         }
 

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

@@ -6,17 +6,15 @@ import kr.co.vividnext.sodalive.member.Member
 import org.springframework.security.access.prepost.PreAuthorize
 import org.springframework.security.core.annotation.AuthenticationPrincipal
 import org.springframework.web.bind.annotation.GetMapping
-import org.springframework.web.bind.annotation.PostMapping
-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.RestController
 
 @RestController
-@PreAuthorize("hasRole('CREATOR')")
 @RequestMapping("/live/room/menu")
 class LiveRoomMenuController(private val service: LiveRoomMenuService) {
     @GetMapping("/all")
+    @PreAuthorize("hasRole('CREATOR')")
     fun getAllLiveMenu(
         @RequestParam creatorId: Long,
         @AuthenticationPrincipal(expression = "#this == 'anonymousUser' ? null : member") member: Member?
@@ -25,23 +23,4 @@ class LiveRoomMenuController(private val service: LiveRoomMenuService) {
 
         ApiResponse.ok(service.getAllLiveMenu(creatorId = creatorId, memberId = member.id!!))
     }
-
-    @PostMapping
-    fun createOrUpdateLiveMenu(
-        @RequestBody request: UpdateLiveMenuRequest,
-        @AuthenticationPrincipal(expression = "#this == 'anonymousUser' ? null : member") member: Member?
-    ) = run {
-        if (member == null) throw SodaException("로그인 정보를 확인해주세요.")
-
-        ApiResponse.ok(
-            if (request.id > 0) {
-                service.updateLiveMenu(memberId = member.id!!, request = request)
-            } else {
-                service.createLiveMenu(
-                    memberId = member.id!!,
-                    request = CreateLiveMenuRequest(menu = request.menu, isActive = false)
-                )
-            }
-        )
-    }
 }