feat: 메인 홈

- API 추가
2025-07-10 15:31:41 +09:00
parent a8da17162a
commit 22fc8b22b8
19 changed files with 799 additions and 30 deletions
--- a/src/main/kotlin/kr/co/vividnext/sodalive/content/series/ContentSeriesController.kt
+++ b/src/main/kotlin/kr/co/vividnext/sodalive/content/series/ContentSeriesController.kt
@@ -19,7 +19,6 @@ class ContentSeriesController(private val service: ContentSeriesService) {
    @GetMapping
    fun getSeriesList(
        @RequestParam creatorId: Long,
-        @RequestParam("sortType", required = false) sortType: SeriesSortType? = SeriesSortType.NEWEST,
        @RequestParam("isAdultContentVisible", required = false) isAdultContentVisible: Boolean? = null,
        @RequestParam("contentType", required = false) contentType: ContentType? = null,
        @AuthenticationPrincipal(expression = "#this == 'anonymousUser' ? null : member") member: Member?,
@@ -30,7 +29,6 @@ class ContentSeriesController(private val service: ContentSeriesService) {
        ApiResponse.ok(
            service.getSeriesList(
                creatorId = creatorId,
-                sortType = sortType ?: SeriesSortType.NEWEST,
                isAdultContentVisible = isAdultContentVisible ?: true,
                contentType = contentType ?: ContentType.ALL,
                member = member,
--- a/src/main/kotlin/kr/co/vividnext/sodalive/content/series/ContentSeriesRepository.kt
+++ b/src/main/kotlin/kr/co/vividnext/sodalive/content/series/ContentSeriesRepository.kt
@@ -13,6 +13,7 @@ import kr.co.vividnext.sodalive.content.series.content.QGetSeriesContentMinMaxPr
 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.keyword.QSeriesKeyword.seriesKeyword
 import kr.co.vividnext.sodalive.member.MemberRole
 import kr.co.vividnext.sodalive.member.QMember.member
@@ -37,16 +38,22 @@ interface ContentSeriesQueryRepository {
    fun getSeriesContentMinMaxPrice(seriesId: Long): GetSeriesContentMinMaxPriceResponse
    fun getRecommendSeriesList(isAuth: Boolean, contentType: ContentType, limit: Long): List<Series>
    fun getOriginalAudioDramaList(
-        memberId: Long,
        isAdult: Boolean,
        contentType: ContentType,
        offset: Long = 0,
        limit: Long = 20
    ): List<Series>

-    fun getOriginalAudioDramaTotalCount(memberId: Long, isAdult: Boolean, contentType: ContentType): Int
+    fun getOriginalAudioDramaTotalCount(isAdult: Boolean, contentType: ContentType): Int
    fun getGenreList(isAdult: Boolean, memberId: Long, contentType: ContentType): List<GetSeriesGenreListResponse>
    fun findByCurationId(curationId: Long, memberId: Long, isAdult: Boolean, contentType: ContentType): List<Series>
+    fun getDayOfWeekSeriesList(
+        dayOfWeek: SeriesPublishedDaysOfWeek,
+        contentType: ContentType,
+        isAdult: Boolean,
+        offset: Long,
+        limit: Long
+    ): List<Series>
 }

 class ContentSeriesQueryRepositoryImpl(
@@ -207,19 +214,13 @@ class ContentSeriesQueryRepositoryImpl(
    }

    override fun getOriginalAudioDramaList(
-        memberId: Long,
        isAdult: Boolean,
        contentType: ContentType,
        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.isOriginal.isTrue
            .and(series.isActive.isTrue)
-            .and(blockMember.id.isNull)

        if (!isAdult) {
            where = where.and(series.isAdult.isFalse)
@@ -242,7 +243,6 @@ class ContentSeriesQueryRepositoryImpl(
        return queryFactory
            .selectFrom(series)
            .innerJoin(series.member, member)
-            .leftJoin(blockMember).on(blockMemberCondition)
            .where(where)
            .orderBy(series.id.desc())
            .offset(offset)
@@ -250,14 +250,9 @@ class ContentSeriesQueryRepositoryImpl(
            .fetch()
    }

-    override fun getOriginalAudioDramaTotalCount(memberId: Long, isAdult: Boolean, contentType: ContentType): Int {
-        val blockMemberCondition = blockMember.member.id.eq(member.id)
-            .and(blockMember.isActive.isTrue)
-            .and(blockMember.blockedMember.id.eq(memberId))
-
+    override fun getOriginalAudioDramaTotalCount(isAdult: Boolean, contentType: ContentType): Int {
        var where = series.isOriginal.isTrue
            .and(series.isActive.isTrue)
-            .and(blockMember.id.isNull)

        if (!isAdult) {
            where = where.and(series.isAdult.isFalse)
@@ -281,7 +276,6 @@ class ContentSeriesQueryRepositoryImpl(
            .select(series.id)
            .from(series)
            .innerJoin(series.member, member)
-            .leftJoin(blockMember).on(blockMemberCondition)
            .where(where)
            .fetch()
            .size
@@ -385,4 +379,44 @@ class ContentSeriesQueryRepositoryImpl(
            .orderBy(audioContentCurationItem.orders.asc())
            .fetch()
    }
+
+    override fun getDayOfWeekSeriesList(
+        dayOfWeek: SeriesPublishedDaysOfWeek,
+        contentType: ContentType,
+        isAdult: Boolean,
+        offset: Long,
+        limit: Long
+    ): List<Series> {
+        var where = series.isActive.isTrue
+            .and(series.publishedDaysOfWeek.contains(dayOfWeek))
+
+        if (!isAdult) {
+            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
+            .selectFrom(series)
+            .innerJoin(series.member, member)
+            .innerJoin(series.contentList, seriesContent)
+            .innerJoin(seriesContent.content, audioContent)
+            .where(where)
+            .orderBy(seriesContent.content.createdAt.desc())
+            .offset(offset)
+            .limit(limit)
+            .fetch()
+    }
 }
--- a/src/main/kotlin/kr/co/vividnext/sodalive/content/series/ContentSeriesService.kt
+++ b/src/main/kotlin/kr/co/vividnext/sodalive/content/series/ContentSeriesService.kt
@@ -30,18 +30,17 @@ class ContentSeriesService(
    @Value("\${cloud.aws.cloud-front.host}")
    private val coverImageHost: String
 ) {
-    fun getOriginalAudioDramaTotalCount(memberId: Long, isAdult: Boolean, contentType: ContentType): Int {
-        return repository.getOriginalAudioDramaTotalCount(memberId, isAdult, contentType)
+    fun getOriginalAudioDramaTotalCount(isAdult: Boolean, contentType: ContentType): Int {
+        return repository.getOriginalAudioDramaTotalCount(isAdult, contentType)
    }

    fun getOriginalAudioDramaList(
-        memberId: Long,
        isAdult: Boolean,
        contentType: ContentType,
        offset: Long = 0,
        limit: Long = 20
    ): List<GetSeriesListResponse.SeriesListItem> {
-        val originalAudioDramaList = repository.getOriginalAudioDramaList(memberId, isAdult, contentType, offset, limit)
+        val originalAudioDramaList = repository.getOriginalAudioDramaList(isAdult, contentType, offset, limit)
        return seriesToSeriesListItem(originalAudioDramaList, isAdult, contentType)
    }

@@ -54,7 +53,6 @@ class ContentSeriesService(
        isAdultContentVisible: Boolean,
        contentType: ContentType,
        member: Member,
-        sortType: SeriesSortType = SeriesSortType.NEWEST,
        offset: Long = 0,
        limit: Long = 10
    ): GetSeriesListResponse {
@@ -224,6 +222,36 @@ class ContentSeriesService(
        return seriesToSeriesListItem(seriesList, isAdult, contentType)
    }

+    fun getDayOfWeekSeriesList(
+        memberId: Long?,
+        isAdult: Boolean,
+        contentType: ContentType,
+        dayOfWeek: SeriesPublishedDaysOfWeek,
+        offset: Long = 0,
+        limit: Long = 10
+    ): List<GetSeriesListResponse.SeriesListItem> {
+        var seriesList = repository.getDayOfWeekSeriesList(
+            dayOfWeek = dayOfWeek,
+            contentType = contentType,
+            isAdult = isAdult,
+            offset = offset,
+            limit = limit
+        )
+
+        seriesList = if (memberId != null) {
+            seriesList.filter {
+                !blockMemberRepository.isBlocked(
+                    blockedMemberId = memberId,
+                    memberId = it.member!!.id!!
+                )
+            }
+        } else {
+            seriesList
+        }
+
+        return seriesToSeriesListItem(seriesList, isAdult, contentType)
+    }
+
    private fun seriesToSeriesListItem(
        seriesList: List<Series>,
        isAdult: Boolean,