refactor(creator-channel): 오디오 콘텐츠 응답을 공통화한다

2026-06-19 15:18:48 +09:00
parent 9a1bfed6a4
commit f743d090c3
20 changed files with 74 additions and 170 deletions
--- a/src/main/kotlin/kr/co/vividnext/sodalive/v2/api/creator/channel/common/dto/CreatorChannelAudioContentResponse.kt
+++ b/src/main/kotlin/kr/co/vividnext/sodalive/v2/api/creator/channel/common/dto/CreatorChannelAudioContentResponse.kt
@@ -0,0 +1,44 @@
+package kr.co.vividnext.sodalive.v2.api.creator.channel.common.dto
+
+import com.fasterxml.jackson.annotation.JsonProperty
+import kr.co.vividnext.sodalive.v2.creator.channel.common.domain.CreatorChannelAudioContent
+
+data class CreatorChannelAudioContentResponse(
+    val audioContentId: Long,
+    val title: String,
+    val duration: String?,
+    val imageUrl: String?,
+    val price: Int,
+    @JsonProperty("isAdult")
+    val isAdult: Boolean,
+    @JsonProperty("isPointAvailable")
+    val isPointAvailable: Boolean,
+    @JsonProperty("isFirstContent")
+    val isFirstContent: Boolean,
+    val seriesName: String?,
+    @JsonProperty("isOriginalSeries")
+    val isOriginalSeries: Boolean?,
+    @JsonProperty("isOwned")
+    val isOwned: Boolean,
+    @JsonProperty("isRented")
+    val isRented: Boolean
+) {
+    companion object {
+        fun from(audioContent: CreatorChannelAudioContent): CreatorChannelAudioContentResponse {
+            return CreatorChannelAudioContentResponse(
+                audioContentId = audioContent.audioContentId,
+                title = audioContent.title,
+                duration = audioContent.duration,
+                imageUrl = audioContent.imageUrl,
+                price = audioContent.price,
+                isAdult = audioContent.isAdult,
+                isPointAvailable = audioContent.isPointAvailable,
+                isFirstContent = audioContent.isFirstContent,
+                seriesName = audioContent.seriesName,
+                isOriginalSeries = audioContent.isOriginalSeries,
+                isOwned = audioContent.isOwned,
+                isRented = audioContent.isRented
+            )
+        }
+    }
+}
--- a/src/main/kotlin/kr/co/vividnext/sodalive/v2/api/creator/channel/home/dto/CreatorChannelHomeResponse.kt
+++ b/src/main/kotlin/kr/co/vividnext/sodalive/v2/api/creator/channel/home/dto/CreatorChannelHomeResponse.kt
@@ -1,9 +1,9 @@
 package kr.co.vividnext.sodalive.v2.api.creator.channel.home.dto

 import com.fasterxml.jackson.annotation.JsonProperty
+import kr.co.vividnext.sodalive.v2.api.creator.channel.common.dto.CreatorChannelAudioContentResponse
 import kr.co.vividnext.sodalive.v2.common.domain.CreatorActivityType
 import kr.co.vividnext.sodalive.v2.creator.channel.home.domain.CreatorChannelActivity
-import kr.co.vividnext.sodalive.v2.creator.channel.home.domain.CreatorChannelAudioContent
 import kr.co.vividnext.sodalive.v2.creator.channel.home.domain.CreatorChannelCommunityPost
 import kr.co.vividnext.sodalive.v2.creator.channel.home.domain.CreatorChannelCreator
 import kr.co.vividnext.sodalive.v2.creator.channel.home.domain.CreatorChannelDonation
@@ -108,46 +108,6 @@ data class CreatorChannelLiveResponse(
    }
 }

-data class CreatorChannelAudioContentResponse(
-    val audioContentId: Long,
-    val title: String,
-    val duration: String?,
-    val imageUrl: String?,
-    val price: Int,
-    @JsonProperty("isAdult")
-    val isAdult: Boolean,
-    @JsonProperty("isPointAvailable")
-    val isPointAvailable: Boolean,
-    @JsonProperty("isFirstContent")
-    val isFirstContent: Boolean,
-    val seriesName: String?,
-    @JsonProperty("isOriginalSeries")
-    val isOriginalSeries: Boolean?,
-    @JsonProperty("isOwned")
-    val isOwned: Boolean,
-    @JsonProperty("isRented")
-    val isRented: Boolean
-) {
-    companion object {
-        fun from(audioContent: CreatorChannelAudioContent): CreatorChannelAudioContentResponse {
-            return CreatorChannelAudioContentResponse(
-                audioContentId = audioContent.audioContentId,
-                title = audioContent.title,
-                duration = audioContent.duration,
-                imageUrl = audioContent.imageUrl,
-                price = audioContent.price,
-                isAdult = audioContent.isAdult,
-                isPointAvailable = audioContent.isPointAvailable,
-                isFirstContent = audioContent.isFirstContent,
-                seriesName = audioContent.seriesName,
-                isOriginalSeries = audioContent.isOriginalSeries,
-                isOwned = audioContent.isOwned,
-                isRented = audioContent.isRented
-            )
-        }
-    }
-}
-
 data class CreatorChannelDonationResponse(
    val nickname: String,
    val profileImageUrl: String,
--- a/src/main/kotlin/kr/co/vividnext/sodalive/v2/api/creator/channel/live/dto/CreatorChannelLiveTabResponse.kt
+++ b/src/main/kotlin/kr/co/vividnext/sodalive/v2/api/creator/channel/live/dto/CreatorChannelLiveTabResponse.kt
@@ -1,8 +1,8 @@
 package kr.co.vividnext.sodalive.v2.api.creator.channel.live.dto

 import com.fasterxml.jackson.annotation.JsonProperty
+import kr.co.vividnext.sodalive.v2.api.creator.channel.common.dto.CreatorChannelAudioContentResponse
 import kr.co.vividnext.sodalive.v2.common.domain.ContentSort
-import kr.co.vividnext.sodalive.v2.creator.channel.live.domain.CreatorChannelAudioContent
 import kr.co.vividnext.sodalive.v2.creator.channel.live.domain.CreatorChannelLive
 import kr.co.vividnext.sodalive.v2.creator.channel.live.domain.CreatorChannelLiveTab
 import java.time.LocalDateTime
@@ -33,46 +33,6 @@ data class CreatorChannelLiveTabResponse(
    }
 }

-data class CreatorChannelAudioContentResponse(
-    val audioContentId: Long,
-    val title: String,
-    val duration: String?,
-    val imageUrl: String?,
-    val price: Int,
-    @JsonProperty("isAdult")
-    val isAdult: Boolean,
-    @JsonProperty("isPointAvailable")
-    val isPointAvailable: Boolean,
-    @JsonProperty("isFirstContent")
-    val isFirstContent: Boolean,
-    val seriesName: String?,
-    @JsonProperty("isOriginalSeries")
-    val isOriginalSeries: Boolean?,
-    @JsonProperty("isOwned")
-    val isOwned: Boolean,
-    @JsonProperty("isRented")
-    val isRented: Boolean
-) {
-    companion object {
-        fun from(content: CreatorChannelAudioContent): CreatorChannelAudioContentResponse {
-            return CreatorChannelAudioContentResponse(
-                audioContentId = content.audioContentId,
-                title = content.title,
-                duration = content.duration,
-                imageUrl = content.imageUrl,
-                price = content.price,
-                isAdult = content.isAdult,
-                isPointAvailable = content.isPointAvailable,
-                isFirstContent = content.isFirstContent,
-                seriesName = content.seriesName,
-                isOriginalSeries = content.isOriginalSeries,
-                isOwned = content.isOwned,
-                isRented = content.isRented
-            )
-        }
-    }
-}
-
 data class CreatorChannelLiveResponse(
    val liveId: Long,
    val title: String,
--- a/src/main/kotlin/kr/co/vividnext/sodalive/v2/creator/channel/common/domain/CreatorChannelAudioContent.kt
+++ b/src/main/kotlin/kr/co/vividnext/sodalive/v2/creator/channel/common/domain/CreatorChannelAudioContent.kt
@@ -0,0 +1,16 @@
+package kr.co.vividnext.sodalive.v2.creator.channel.common.domain
+
+data class CreatorChannelAudioContent(
+    val audioContentId: Long,
+    val title: String,
+    val duration: String?,
+    val imageUrl: String?,
+    val price: Int,
+    val isAdult: Boolean,
+    val isPointAvailable: Boolean,
+    val isFirstContent: Boolean,
+    val seriesName: String?,
+    val isOriginalSeries: Boolean?,
+    val isOwned: Boolean,
+    val isRented: Boolean
+)
--- a/src/main/kotlin/kr/co/vividnext/sodalive/v2/creator/channel/home/adapter/out/persistence/DefaultCreatorChannelHomeQueryRepository.kt
+++ b/src/main/kotlin/kr/co/vividnext/sodalive/v2/creator/channel/home/adapter/out/persistence/DefaultCreatorChannelHomeQueryRepository.kt
@@ -572,7 +572,6 @@ class DefaultCreatorChannelHomeQueryRepository(
            isAdult = get(audioContent.isAdult)!!,
            isPointAvailable = get(audioContent.isPointAvailable)!!,
            isFirstContent = firstContentId == audioContentId,
-            publishedAt = get(audioContent.releaseDate)!!,
            seriesName = seriesSummary?.title,
            isOriginalSeries = seriesSummary?.isOriginal,
            isOwned = orderState?.isOwned ?: false,
--- a/src/main/kotlin/kr/co/vividnext/sodalive/v2/creator/channel/home/application/CreatorChannelHomeQueryService.kt
+++ b/src/main/kotlin/kr/co/vividnext/sodalive/v2/creator/channel/home/application/CreatorChannelHomeQueryService.kt
@@ -8,8 +8,8 @@ import kr.co.vividnext.sodalive.member.Member
 import kr.co.vividnext.sodalive.member.MemberRole
 import kr.co.vividnext.sodalive.member.contentpreference.MemberContentPreferenceService
 import kr.co.vividnext.sodalive.member.contentpreference.isAdultVisibleByPolicy
+import kr.co.vividnext.sodalive.v2.creator.channel.common.domain.CreatorChannelAudioContent
 import kr.co.vividnext.sodalive.v2.creator.channel.home.domain.CreatorChannelActivity
-import kr.co.vividnext.sodalive.v2.creator.channel.home.domain.CreatorChannelAudioContent
 import kr.co.vividnext.sodalive.v2.creator.channel.home.domain.CreatorChannelCommunityPost
 import kr.co.vividnext.sodalive.v2.creator.channel.home.domain.CreatorChannelCreator
 import kr.co.vividnext.sodalive.v2.creator.channel.home.domain.CreatorChannelDonation
@@ -178,7 +178,6 @@ class CreatorChannelHomeQueryService(
        isAdult = isAdult,
        isPointAvailable = isPointAvailable,
        isFirstContent = isFirstContent,
-        publishedAt = publishedAt,
        seriesName = seriesName,
        isOriginalSeries = isOriginalSeries,
        isOwned = isOwned,
--- a/src/main/kotlin/kr/co/vividnext/sodalive/v2/creator/channel/home/domain/CreatorChannelHome.kt
+++ b/src/main/kotlin/kr/co/vividnext/sodalive/v2/creator/channel/home/domain/CreatorChannelHome.kt
@@ -1,6 +1,7 @@
 package kr.co.vividnext.sodalive.v2.creator.channel.home.domain

 import kr.co.vividnext.sodalive.v2.common.domain.CreatorActivityType
+import kr.co.vividnext.sodalive.v2.creator.channel.common.domain.CreatorChannelAudioContent
 import java.time.LocalDateTime

 data class CreatorChannelHome(
@@ -40,22 +41,6 @@ data class CreatorChannelLive(
    val isAdult: Boolean
 )

-data class CreatorChannelAudioContent(
-    val audioContentId: Long,
-    val title: String,
-    val duration: String?,
-    val imageUrl: String?,
-    val price: Int,
-    val isAdult: Boolean,
-    val isPointAvailable: Boolean,
-    val isFirstContent: Boolean,
-    val publishedAt: LocalDateTime,
-    val seriesName: String?,
-    val isOriginalSeries: Boolean?,
-    val isOwned: Boolean,
-    val isRented: Boolean
-)
-
 data class CreatorChannelDonation(
    val nickname: String,
    val profileImageUrl: String,
--- a/src/main/kotlin/kr/co/vividnext/sodalive/v2/creator/channel/home/domain/CreatorChannelHomeQueryPolicy.kt
+++ b/src/main/kotlin/kr/co/vividnext/sodalive/v2/creator/channel/home/domain/CreatorChannelHomeQueryPolicy.kt
@@ -1,6 +1,7 @@
 package kr.co.vividnext.sodalive.v2.creator.channel.home.domain

 import kr.co.vividnext.sodalive.v2.common.domain.CreatorActivityType
+import kr.co.vividnext.sodalive.v2.creator.channel.common.domain.CreatorChannelAudioContent
 import org.springframework.stereotype.Component
 import java.time.LocalDateTime

@@ -25,16 +26,6 @@ class CreatorChannelHomeQueryPolicy {
        return audioContents.filter { it.audioContentId != latestAudioContentId }
    }

-    fun markFirstAudioContent(audioContents: List<CreatorChannelAudioContent>): List<CreatorChannelAudioContent> {
-        val firstAudioContentId = audioContents
-            .minWithOrNull(compareBy<CreatorChannelAudioContent> { it.publishedAt }.thenBy { it.audioContentId })
-            ?.audioContentId
-
-        return audioContents.map { audioContent ->
-            audioContent.copy(isFirstContent = audioContent.audioContentId == firstAudioContentId)
-        }
-    }
-
    private fun CreatorActivityType.scheduleOrder(): Int {
        return if (this == CreatorActivityType.LIVE) 0 else 1
    }
--- a/src/main/kotlin/kr/co/vividnext/sodalive/v2/creator/channel/home/port/out/CreatorChannelHomeQueryPort.kt
+++ b/src/main/kotlin/kr/co/vividnext/sodalive/v2/creator/channel/home/port/out/CreatorChannelHomeQueryPort.kt
@@ -109,7 +109,6 @@ data class CreatorChannelAudioContentRecord(
    val isAdult: Boolean,
    val isPointAvailable: Boolean,
    val isFirstContent: Boolean,
-    val publishedAt: LocalDateTime,
    val seriesName: String?,
    val isOriginalSeries: Boolean?,
    val isOwned: Boolean,
--- a/src/main/kotlin/kr/co/vividnext/sodalive/v2/creator/channel/live/adapter/out/persistence/DefaultCreatorChannelLiveQueryRepository.kt
+++ b/src/main/kotlin/kr/co/vividnext/sodalive/v2/creator/channel/live/adapter/out/persistence/DefaultCreatorChannelLiveQueryRepository.kt
@@ -261,7 +261,6 @@ class DefaultCreatorChannelLiveQueryRepository(
            isAdult = get(audioContent.isAdult)!!,
            isPointAvailable = get(audioContent.isPointAvailable)!!,
            isFirstContent = firstContentId == audioContentId,
-            publishedAt = get(audioContent.releaseDate)!!,
            seriesName = seriesSummary?.title,
            isOriginalSeries = seriesSummary?.isOriginal,
            isOwned = orderState?.isOwned ?: false,
--- a/src/main/kotlin/kr/co/vividnext/sodalive/v2/creator/channel/live/application/CreatorChannelLiveQueryService.kt
+++ b/src/main/kotlin/kr/co/vividnext/sodalive/v2/creator/channel/live/application/CreatorChannelLiveQueryService.kt
@@ -9,7 +9,7 @@ import kr.co.vividnext.sodalive.member.MemberRole
 import kr.co.vividnext.sodalive.member.contentpreference.MemberContentPreferenceService
 import kr.co.vividnext.sodalive.member.contentpreference.isAdultVisibleByPolicy
 import kr.co.vividnext.sodalive.v2.common.domain.ContentSort
-import kr.co.vividnext.sodalive.v2.creator.channel.live.domain.CreatorChannelAudioContent
+import kr.co.vividnext.sodalive.v2.creator.channel.common.domain.CreatorChannelAudioContent
 import kr.co.vividnext.sodalive.v2.creator.channel.live.domain.CreatorChannelLive
 import kr.co.vividnext.sodalive.v2.creator.channel.live.domain.CreatorChannelLiveReplayQueryPolicy
 import kr.co.vividnext.sodalive.v2.creator.channel.live.domain.CreatorChannelLiveTab
@@ -122,7 +122,6 @@ class CreatorChannelLiveQueryService(
        isAdult = isAdult,
        isPointAvailable = isPointAvailable,
        isFirstContent = isFirstContent,
-        publishedAt = publishedAt,
        seriesName = seriesName,
        isOriginalSeries = isOriginalSeries,
        isOwned = isOwned,
--- a/src/main/kotlin/kr/co/vividnext/sodalive/v2/creator/channel/live/domain/CreatorChannelLiveTab.kt
+++ b/src/main/kotlin/kr/co/vividnext/sodalive/v2/creator/channel/live/domain/CreatorChannelLiveTab.kt
@@ -1,6 +1,7 @@
 package kr.co.vividnext.sodalive.v2.creator.channel.live.domain

 import kr.co.vividnext.sodalive.v2.common.domain.ContentSort
+import kr.co.vividnext.sodalive.v2.creator.channel.common.domain.CreatorChannelAudioContent
 import java.time.LocalDateTime

 data class CreatorChannelLiveTab(
@@ -20,19 +21,3 @@ data class CreatorChannelLive(
    val price: Int,
    val isAdult: Boolean
 )
-
-data class CreatorChannelAudioContent(
-    val audioContentId: Long,
-    val title: String,
-    val duration: String?,
-    val imageUrl: String?,
-    val price: Int,
-    val isAdult: Boolean,
-    val isPointAvailable: Boolean,
-    val isFirstContent: Boolean,
-    val publishedAt: LocalDateTime,
-    val seriesName: String?,
-    val isOriginalSeries: Boolean?,
-    val isOwned: Boolean,
-    val isRented: Boolean
-)
--- a/src/main/kotlin/kr/co/vividnext/sodalive/v2/creator/channel/live/port/out/CreatorChannelLiveQueryPort.kt
+++ b/src/main/kotlin/kr/co/vividnext/sodalive/v2/creator/channel/live/port/out/CreatorChannelLiveQueryPort.kt
@@ -60,7 +60,6 @@ data class CreatorChannelAudioContentRecord(
    val isAdult: Boolean,
    val isPointAvailable: Boolean,
    val isFirstContent: Boolean,
-    val publishedAt: LocalDateTime,
    val seriesName: String?,
    val isOriginalSeries: Boolean?,
    val isOwned: Boolean,