[NDGL-88] feature: 추천 여행 템플릿 조회 API 연동

Author: jihee-dev

data/travel/src/main/java/com/yapp/ndgl/data/travel/api/TravelTemplateApi.kt

@@ -2,6 +2,7 @@ package com.yapp.ndgl.data.travel.api
 
 import com.yapp.ndgl.data.core.model.BaseResponse
 import com.yapp.ndgl.data.travel.model.PopularTravelTemplates
+import com.yapp.ndgl.data.travel.model.RecommendTravelTemplates
 import retrofit2.http.GET
 import retrofit2.http.Query
 
@@ -12,4 +13,7 @@ interface TravelTemplateApi {
         @Query("page") page: Int? = null,
         @Query("size") size: Int? = null,
     ): BaseResponse<PopularTravelTemplates>
+
+    @GET("/api/v1/travel-templates/recommend")
+    suspend fun getRecommendTravelTemplates(): BaseResponse<RecommendTravelTemplates>
 }

data/travel/src/main/java/com/yapp/ndgl/data/travel/model/RecommendTravelTemplates.kt

@@ -0,0 +1,9 @@
+package com.yapp.ndgl.data.travel.model
+
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class RecommendTravelTemplates(
+    val content: List<TravelTemplateSummary>,
+    val hasNext: Boolean,
+)

data/travel/src/main/java/com/yapp/ndgl/data/travel/model/TravelSummary.kt

@@ -3,6 +3,7 @@ package com.yapp.ndgl.data.travel.repository
 import com.yapp.ndgl.data.core.model.getData
 import com.yapp.ndgl.data.travel.api.TravelTemplateApi
 import com.yapp.ndgl.data.travel.model.PopularTravelTemplates
+import com.yapp.ndgl.data.travel.model.RecommendTravelTemplates
 import javax.inject.Inject
 import javax.inject.Singleton
 
@@ -17,4 +18,8 @@ class TravelTemplateRepository @Inject constructor(
     suspend fun getPopularTravelTemplates(travelProgramId: Long): PopularTravelTemplates {
         return travelTemplateApi.getPopularTravelTemplates(travelProgramId = travelProgramId).getData()
     }
+
+    suspend fun getRecommendTravelTemplates(): RecommendTravelTemplates {
+        return travelTemplateApi.getRecommendTravelTemplates().getData()
+    }
 }

data/travel/src/main/java/com/yapp/ndgl/data/travel/repository/HomeRepository.kt

@@ -7,7 +7,6 @@ import com.yapp.ndgl.core.base.UiSideEffect
 import com.yapp.ndgl.core.base.UiState
 import com.yapp.ndgl.data.travel.model.PlaceCategory
 import com.yapp.ndgl.data.travel.model.ProgramType
-import com.yapp.ndgl.data.travel.model.TravelSummary
 import java.time.LocalDate
 
 @Stable
@@ -18,7 +17,7 @@ data class HomeState(
     val travelProgramTabs: List<TravelProgramTab> = emptyList(),
     val allPopularTravels: List<TravelContent> = emptyList(),
     val popularTravelsByProgram: Map<Long, List<TravelContent>> = emptyMap(),
-    val recommendedContents: List<TravelSummary> = emptyList(),
+    val recommendedContents: List<TravelContent> = emptyList(),
 ) : UiState {
     @Stable
     sealed interface MyTravel {
@@ -79,6 +78,7 @@ data class HomeState(
         val nights: Int,
         val days: Int,
         val programName: String,
+        val programType: ProgramType,
         val thumbnail: String,
     )
 }

data/travel/src/main/java/com/yapp/ndgl/data/travel/repository/TravelTemplateRepository.kt

@@ -112,6 +112,7 @@ private fun HomeScreenPreview() {
             nights = 7,
             days = 9,
             programName = "곽튜브",
+            programType = ProgramType.YOUTUBE,
             thumbnail = "https://picsum.photos/200/300",
         ),
         HomeState.TravelContent(
@@ -122,6 +123,7 @@ private fun HomeScreenPreview() {
             nights = 5,
             days = 6,
             programName = "빠니보틀",
+            programType = ProgramType.TV,
             thumbnail = "https://picsum.photos/200/300",
         ),
         HomeState.TravelContent(
@@ -132,6 +134,7 @@ private fun HomeScreenPreview() {
             nights = 4,
             days = 6,
             programName = "곽튜브",
+            programType = ProgramType.YOUTUBE,
             thumbnail = "https://picsum.photos/200/300",
         ),
     )

feature/home/src/main/java/com/yapp/ndgl/feature/home/main/HomeContract.kt

@@ -6,7 +6,6 @@ import com.yapp.ndgl.core.util.suspendRunCatching
 import com.yapp.ndgl.data.auth.repository.AuthRepository
 import com.yapp.ndgl.data.travel.model.TravelProgram
 import com.yapp.ndgl.data.travel.model.TravelTemplateSummary
-import com.yapp.ndgl.data.travel.repository.HomeRepository
 import com.yapp.ndgl.data.travel.repository.TravelProgramRepository
 import com.yapp.ndgl.data.travel.repository.TravelTemplateRepository
 import com.yapp.ndgl.data.travel.repository.UserTravelRepository
@@ -22,7 +21,6 @@ import javax.inject.Inject
 @HiltViewModel
 class HomeViewModel @Inject constructor(
     private val authRepository: AuthRepository,
-    private val homeRepository: HomeRepository,
     private val travelProgramRepository: TravelProgramRepository,
     private val travelTemplateRepository: TravelTemplateRepository,
     private val userTravelRepository: UserTravelRepository,
@@ -162,9 +160,11 @@ class HomeViewModel @Inject constructor(
 
     private fun loadRecommendedTravel() {
         viewModelScope.launch {
-            suspendRunCatching { homeRepository.getRecommendedTravels() }.onSuccess { travels ->
-                reduce { copy(recommendedContents = travels) }
-            }
+            suspendRunCatching { travelTemplateRepository.getRecommendTravelTemplates() }
+                .onSuccess { travels ->
+                    val recommendTravels = travels.content.map { it.toTravelContent() }
+                    reduce { copy(recommendedContents = recommendTravels) }
+                }
         }
     }
 
@@ -184,6 +184,7 @@ class HomeViewModel @Inject constructor(
         nights = nights,
         days = days,
         programName = programName,
+        programType = programType,
         thumbnail = thumbnail ?: "",
     )
 

feature/home/src/main/java/com/yapp/ndgl/feature/home/main/HomeScreen.kt

@@ -32,8 +32,8 @@ import com.yapp.ndgl.core.ui.theme.NDGLTheme
 import com.yapp.ndgl.core.util.FlagEmojiUtil.toFlagEmoji
 import com.yapp.ndgl.data.travel.model.ProgramType
 import com.yapp.ndgl.feature.home.R
+import com.yapp.ndgl.feature.home.util.toIconRes
 import kotlinx.collections.immutable.toPersistentList
-import com.yapp.ndgl.core.ui.R as CoreR
 
 private const val COLUMN_ITEM_COUNT = 3
 
@@ -207,11 +207,6 @@ private fun PopularTravelItem(
     }
 }
 
-private fun ProgramType.toIconRes() = when (this) {
-    ProgramType.YOUTUBE -> CoreR.drawable.ic_20_video
-    ProgramType.TV -> CoreR.drawable.ic_20_video
-}
-
 @Preview(showBackground = true)
 @Composable
 private fun PopularTravelSectionPreview() {
@@ -224,6 +219,7 @@ private fun PopularTravelSectionPreview() {
             nights = 7,
             days = 9,
             programName = "곽튜브",
+            programType = ProgramType.YOUTUBE,
             thumbnail = "",
         ),
         HomeState.TravelContent(
@@ -234,6 +230,7 @@ private fun PopularTravelSectionPreview() {
             nights = 5,
             days = 6,
             programName = "빠니보틀",
+            programType = ProgramType.TV,
             thumbnail = "",
         ),
         HomeState.TravelContent(
@@ -244,6 +241,7 @@ private fun PopularTravelSectionPreview() {
             nights = 4,
             days = 6,
             programName = "곽튜브",
+            programType = ProgramType.YOUTUBE,
             thumbnail = "",
         ),
     )