콘텐츠 메인 - 추천시리즈, 새로운 콘텐츠, 큐레이션

- 남성향이면 여성 크리에이터, 여성향이면 남성 크리에이터 작품이 조회되도록 수정

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

@@ -2,6 +2,7 @@ package kr.co.vividnext.sodalive.content.series
 
 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.creator.admin.content.series.SeriesSortType
 import kr.co.vividnext.sodalive.member.Member
 import org.springframework.data.domain.Pageable
@@ -69,10 +70,18 @@ class ContentSeriesController(private val service: ContentSeriesService) {
 
     @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(service.getRecommendSeriesList(member = member))
+        ApiResponse.ok(
+            service.getRecommendSeriesList(
+                isAdultContentVisible = isAdultContentVisible ?: true,
+                contentType = contentType ?: ContentType.ALL,
+                member = member
+            )
+        )
     }
 }

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

@@ -2,6 +2,7 @@ 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.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.series.content.GetSeriesContentMinMaxPriceResponse
@@ -27,7 +28,7 @@ interface ContentSeriesQueryRepository {
     fun getSeriesDetail(seriesId: Long, isAuth: Boolean): Series?
     fun getKeywordList(seriesId: Long): List<String>
     fun getSeriesContentMinMaxPrice(seriesId: Long): GetSeriesContentMinMaxPriceResponse
-    fun getRecommendSeriesList(memberId: Long, isAuth: Boolean, limit: Long): List<Series>
+    fun getRecommendSeriesList(isAuth: Boolean, contentType: ContentType, limit: Long): List<Series>
 }
 
 class ContentSeriesQueryRepositoryImpl(
@@ -111,11 +112,17 @@ class ContentSeriesQueryRepositoryImpl(
             .fetchFirst()
     }
 
-    override fun getRecommendSeriesList(memberId: Long, isAuth: Boolean, limit: Long): List<Series> {
+    override fun getRecommendSeriesList(isAuth: Boolean, contentType: ContentType, limit: Long): List<Series> {
         var where = series.isActive.isTrue
 
         if (!isAuth) {
-            where = where.and(series.isAdult.isFalse)
+            where = where.and(audioContent.isAdult.isFalse)
+        } else {
+            if (contentType != ContentType.ALL) {
+                where = where.and(
+                    series.member.auth.gender.eq(if (contentType == ContentType.MALE) 0 else 1)
+                )
+            }
         }
 
         return queryFactory

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

@@ -1,6 +1,7 @@
 package kr.co.vividnext.sodalive.content.series
 
 import kr.co.vividnext.sodalive.common.SodaException
+import kr.co.vividnext.sodalive.content.ContentType
 import kr.co.vividnext.sodalive.content.order.OrderRepository
 import kr.co.vividnext.sodalive.content.order.OrderType
 import kr.co.vividnext.sodalive.content.series.content.ContentSeriesContentRepository
@@ -155,10 +156,14 @@ class ContentSeriesService(
         return GetSeriesContentListResponse(totalCount, contentList)
     }
 
-    fun getRecommendSeriesList(member: Member): List<GetSeriesListResponse.SeriesListItem> {
+    fun getRecommendSeriesList(
+        isAdultContentVisible: Boolean,
+        contentType: ContentType,
+        member: Member
+    ): List<GetSeriesListResponse.SeriesListItem> {
         val seriesList = repository.getRecommendSeriesList(
-            memberId = member.id!!,
-            isAuth = member.auth != null,
+            isAuth = member.auth != null && isAdultContentVisible,
+            contentType = contentType,
             limit = 10
         ).filter { !blockMemberRepository.isBlocked(blockedMemberId = member.id!!, memberId = it.member!!.id!!) }