feat(content): 서브 배너 상태와 익명 인증 처리를 연결한다
This commit is contained in:
@@ -76,5 +76,5 @@ class ContentMainViewModel(
|
|||||||
_toastLiveData.postValue(ToastMessage(resId = R.string.common_error_unknown))
|
_toastLiveData.postValue(ToastMessage(resId = R.string.common_error_unknown))
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun authToken(): String = "Bearer ${SharedPreferenceManager.token}"
|
private fun authToken(): String? = SharedPreferenceManager.token.takeIf { it.isNotBlank() }?.let { "Bearer $it" }
|
||||||
}
|
}
|
||||||
|
|||||||
+4
-1
@@ -6,6 +6,8 @@ import kr.co.vividnext.sodalive.v2.main.content.data.AudioRecommendationsRespons
|
|||||||
import kr.co.vividnext.sodalive.v2.main.content.data.CommentedAudioResponse
|
import kr.co.vividnext.sodalive.v2.main.content.data.CommentedAudioResponse
|
||||||
import kr.co.vividnext.sodalive.v2.main.content.data.OriginalSeriesResponse
|
import kr.co.vividnext.sodalive.v2.main.content.data.OriginalSeriesResponse
|
||||||
import kr.co.vividnext.sodalive.v2.widget.AudioContentTag
|
import kr.co.vividnext.sodalive.v2.widget.AudioContentTag
|
||||||
|
import kr.co.vividnext.sodalive.v2.widget.subbanner.SubBannerPlacement
|
||||||
|
import kr.co.vividnext.sodalive.v2.widget.subbanner.toSubBannerItems
|
||||||
|
|
||||||
fun AudioRecommendationsResponse.toContent(): AudioRecommendationsUiState.Content = AudioRecommendationsUiState.Content(
|
fun AudioRecommendationsResponse.toContent(): AudioRecommendationsUiState.Content = AudioRecommendationsUiState.Content(
|
||||||
banners = ContentBannerSection(banners.map { it.toUiModel() }),
|
banners = ContentBannerSection(banners.map { it.toUiModel() }),
|
||||||
@@ -15,7 +17,8 @@ fun AudioRecommendationsResponse.toContent(): AudioRecommendationsUiState.Conten
|
|||||||
freeAudios = ContentAudioCardSection(freeAudios.map { it.toUiModel() }),
|
freeAudios = ContentAudioCardSection(freeAudios.map { it.toUiModel() }),
|
||||||
pointAudios = ContentAudioCardSection(pointAudios.map { it.toUiModel() }),
|
pointAudios = ContentAudioCardSection(pointAudios.map { it.toUiModel() }),
|
||||||
mostCommentedAudios = ContentCommentedAudioSection(mostCommentedAudios.map { it.toUiModel() }),
|
mostCommentedAudios = ContentCommentedAudioSection(mostCommentedAudios.map { it.toUiModel() }),
|
||||||
recommendedAudios = ContentAudioCardSection(recommendedAudios.map { it.toUiModel() })
|
recommendedAudios = ContentAudioCardSection(recommendedAudios.map { it.toUiModel() }),
|
||||||
|
subBanners = subBanners.toSubBannerItems(SubBannerPlacement.CONTENT_RECOMMENDATION)
|
||||||
)
|
)
|
||||||
|
|
||||||
fun AudioBannerResponse.toUiModel(): ContentBannerUiModel = ContentBannerUiModel(
|
fun AudioBannerResponse.toUiModel(): ContentBannerUiModel = ContentBannerUiModel(
|
||||||
|
|||||||
+6
-2
@@ -1,5 +1,7 @@
|
|||||||
package kr.co.vividnext.sodalive.v2.main.content.model
|
package kr.co.vividnext.sodalive.v2.main.content.model
|
||||||
|
|
||||||
|
import kr.co.vividnext.sodalive.v2.widget.subbanner.SubBannerItem
|
||||||
|
|
||||||
sealed interface AudioRecommendationsUiState {
|
sealed interface AudioRecommendationsUiState {
|
||||||
data object Loading : AudioRecommendationsUiState
|
data object Loading : AudioRecommendationsUiState
|
||||||
|
|
||||||
@@ -11,7 +13,8 @@ sealed interface AudioRecommendationsUiState {
|
|||||||
val freeAudios: ContentAudioCardSection,
|
val freeAudios: ContentAudioCardSection,
|
||||||
val pointAudios: ContentAudioCardSection,
|
val pointAudios: ContentAudioCardSection,
|
||||||
val mostCommentedAudios: ContentCommentedAudioSection,
|
val mostCommentedAudios: ContentCommentedAudioSection,
|
||||||
val recommendedAudios: ContentAudioCardSection
|
val recommendedAudios: ContentAudioCardSection,
|
||||||
|
val subBanners: List<SubBannerItem> = emptyList()
|
||||||
) : AudioRecommendationsUiState {
|
) : AudioRecommendationsUiState {
|
||||||
val isEmpty: Boolean = listOf(
|
val isEmpty: Boolean = listOf(
|
||||||
banners.items,
|
banners.items,
|
||||||
@@ -21,7 +24,8 @@ sealed interface AudioRecommendationsUiState {
|
|||||||
freeAudios.items,
|
freeAudios.items,
|
||||||
pointAudios.items,
|
pointAudios.items,
|
||||||
mostCommentedAudios.items,
|
mostCommentedAudios.items,
|
||||||
recommendedAudios.items
|
recommendedAudios.items,
|
||||||
|
subBanners
|
||||||
).all { it.isEmpty() }
|
).all { it.isEmpty() }
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+48
@@ -7,6 +7,8 @@ import kr.co.vividnext.sodalive.v2.main.content.data.CommentedAudioResponse
|
|||||||
import kr.co.vividnext.sodalive.v2.main.content.data.OriginalSeriesResponse
|
import kr.co.vividnext.sodalive.v2.main.content.data.OriginalSeriesResponse
|
||||||
import kr.co.vividnext.sodalive.v2.main.content.model.toContent
|
import kr.co.vividnext.sodalive.v2.main.content.model.toContent
|
||||||
import kr.co.vividnext.sodalive.v2.widget.AudioContentTag
|
import kr.co.vividnext.sodalive.v2.widget.AudioContentTag
|
||||||
|
import kr.co.vividnext.sodalive.v2.widget.subbanner.SubBannerPlacement
|
||||||
|
import kr.co.vividnext.sodalive.v2.widget.subbanner.SubBannerResponse
|
||||||
import org.junit.Assert.assertEquals
|
import org.junit.Assert.assertEquals
|
||||||
import org.junit.Assert.assertFalse
|
import org.junit.Assert.assertFalse
|
||||||
import org.junit.Assert.assertTrue
|
import org.junit.Assert.assertTrue
|
||||||
@@ -14,6 +16,52 @@ import org.junit.Test
|
|||||||
|
|
||||||
class AudioRecommendationsMapperTest {
|
class AudioRecommendationsMapperTest {
|
||||||
|
|
||||||
|
@Test
|
||||||
|
fun `서브 배너는 콘텐츠 placement만 유지하고 다른 추천과 메인 배너를 보존한다`() {
|
||||||
|
val response = response(banners = listOf(banner()), latestAudios = listOf(audio()))
|
||||||
|
val content = response.copy(
|
||||||
|
subBanners = listOf(
|
||||||
|
SubBannerResponse(
|
||||||
|
9L,
|
||||||
|
SubBannerPlacement.HOME_RECOMMENDATION,
|
||||||
|
"https://example.com/home",
|
||||||
|
null,
|
||||||
|
"sodalive://home",
|
||||||
|
null
|
||||||
|
),
|
||||||
|
SubBannerResponse(
|
||||||
|
7L,
|
||||||
|
SubBannerPlacement.CONTENT_RECOMMENDATION,
|
||||||
|
"https://example.com/audio",
|
||||||
|
null,
|
||||||
|
"sodalive://audio",
|
||||||
|
null
|
||||||
|
),
|
||||||
|
SubBannerResponse(8L, SubBannerPlacement.CONTENT_RECOMMENDATION, "bad-image", "https://example.com", null, null)
|
||||||
|
)
|
||||||
|
).toContent()
|
||||||
|
|
||||||
|
assertEquals(listOf(7L), content.subBanners.map { it.id })
|
||||||
|
assertEquals(1, content.banners.items.size)
|
||||||
|
assertEquals(listOf(1L), content.latestAudios.items.map { it.audioContentId })
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
fun `서브 배너만 있으면 비어 있지 않고 null 목록이면 기존 콘텐츠만 유지한다`() {
|
||||||
|
val banner = SubBannerResponse(
|
||||||
|
7L,
|
||||||
|
SubBannerPlacement.CONTENT_RECOMMENDATION,
|
||||||
|
"https://example.com/image",
|
||||||
|
"https://example.com/page",
|
||||||
|
null,
|
||||||
|
null
|
||||||
|
)
|
||||||
|
assertFalse(response().copy(subBanners = listOf(banner)).toContent().isEmpty)
|
||||||
|
val content = response(latestAudios = listOf(audio())).copy(subBanners = null).toContent()
|
||||||
|
assertTrue(content.subBanners.isEmpty())
|
||||||
|
assertEquals(listOf(1L), content.latestAudios.items.map { it.audioContentId })
|
||||||
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
fun `price가 0이면 무료 tag가 포함된다`() {
|
fun `price가 0이면 무료 tag가 포함된다`() {
|
||||||
val item = response(latestAudios = listOf(audio(price = 0))).toContent().latestAudios.items.single()
|
val item = response(latestAudios = listOf(audio(price = 0))).toContent().latestAudios.items.single()
|
||||||
|
|||||||
Reference in New Issue
Block a user