[#11] HotelScreen 구현

app/build.gradle.kts

@@ -100,6 +100,10 @@ dependencies {
     // coil
     implementation(libs.coil.compose)
 
+    // paging
+    implementation(libs.paging.runtime)
+    implementation(libs.paging.compose)
+
     // test
     testImplementation(libs.junit)
     androidTestImplementation(libs.androidx.junit)

app/src/main/java/kr/ksw/visitkorea/data/paging/source/LocationBasedPagingSource.kt

@@ -0,0 +1,41 @@
+package kr.ksw.visitkorea.data.paging.source
+
+import androidx.paging.PagingSource
+import androidx.paging.PagingState
+import kr.ksw.visitkorea.data.mapper.toItems
+import kr.ksw.visitkorea.data.remote.api.LocationBasedListApi
+import kr.ksw.visitkorea.data.remote.dto.LocationBasedDTO
+
+class LocationBasedPagingSource (
+    private val locationBasedListApi: LocationBasedListApi,
+    private val contentTypeId: String,
+    private val mapX: String,
+    private val mapY: String
+) : PagingSource<Int, LocationBasedDTO>() {
+
+    override fun getRefreshKey(state: PagingState<Int, LocationBasedDTO>): Int? {
+        return state.anchorPosition?.let { anchor ->
+            val anchorPage = state.closestPageToPosition(anchor)
+            anchorPage?.prevKey?.plus(1) ?: anchorPage?.nextKey?.minus(1)
+        }
+    }
+
+    override suspend fun load(params: LoadParams<Int>): LoadResult<Int, LocationBasedDTO> {
+        val page = params.key ?: 1
+        val loadSize = params.loadSize
+        val response = locationBasedListApi.getLocationBasedListByContentType(
+            numOfRows = loadSize,
+            pageNo =  page,
+            mapX = mapX,
+            mapY = mapY,
+            contentTypeId = contentTypeId
+        )
+        val data = response.toItems()
+        return LoadResult.Page(
+            data = data,
+            prevKey = if(page == 1) null else page - 1,
+            nextKey = if(data.size == loadSize) page + 1 else null
+        )
+    }
+
+}

app/src/main/java/kr/ksw/visitkorea/data/remote/dto/LocationBasedDTO.kt

@@ -22,7 +22,8 @@ data class LocationBasedDTO(
     val mapX: String,
     @SerializedName("mapy")
     val mapY: String,
-    val cat3: String,
+    @SerializedName("cat3")
+    val category: String,
     val tel: String,
     val title: String,
 )

app/src/main/java/kr/ksw/visitkorea/domain/di/HotelModule.kt

@@ -0,0 +1,17 @@
+package kr.ksw.visitkorea.domain.di
+
+import dagger.Binds
+import dagger.Module
+import dagger.hilt.InstallIn
+import dagger.hilt.android.components.ActivityRetainedComponent
+import kr.ksw.visitkorea.domain.usecase.hotel.GetHotelListUseCase
+import kr.ksw.visitkorea.domain.usecase.hotel.GetHotelListUseCaseImpl
+
+@Module
+@InstallIn(ActivityRetainedComponent::class)
+abstract class HotelModule {
+    @Binds
+    abstract fun bindGetHotelListUseCase(
+        getHotelListUseCase: GetHotelListUseCaseImpl
+    ): GetHotelListUseCase
+}

app/src/main/java/kr/ksw/visitkorea/domain/usecase/home/GetCultureCenterForHomeUseCase.kt

@@ -1,10 +1,10 @@
 package kr.ksw.visitkorea.domain.usecase.home
 
-import kr.ksw.visitkorea.domain.usecase.model.CultureCenter
+import kr.ksw.visitkorea.domain.usecase.model.CommonCardModel
 
 interface GetCultureCenterForHomeUseCase {
     suspend operator fun invoke(
         mapX: String,
-        mapY: String,
-    ): Result<List<CultureCenter>>
+        mapY: String
+    ): Result<List<CommonCardModel>>
 }

app/src/main/java/kr/ksw/visitkorea/domain/usecase/home/GetCultureCenterForHomeUseCaseImpl.kt

@@ -1,22 +1,21 @@
 package kr.ksw.visitkorea.domain.usecase.home
 
 import kr.ksw.visitkorea.data.repository.LocationBasedListRepository
-import kr.ksw.visitkorea.domain.usecase.mapper.toCultureCenterModel
-import kr.ksw.visitkorea.domain.usecase.model.CultureCenter
+import kr.ksw.visitkorea.domain.usecase.mapper.toCommonCardModel
+import kr.ksw.visitkorea.domain.usecase.model.CommonCardModel
 import javax.inject.Inject
 
 class GetCultureCenterForHomeUseCaseImpl @Inject constructor(
     private val locationBasedListRepository: LocationBasedListRepository
 ) : GetCultureCenterForHomeUseCase {
     override suspend fun invoke(
         mapX: String,
-        mapY: String,
-    ): Result<List<CultureCenter>> {
+        mapY: String,): Result<List<CommonCardModel>> {
         return locationBasedListRepository.getLocationBasedListByContentType(
             10, 1, mapX, mapY, "14"
         ).map { list ->
             list.map { dto ->
-                dto.toCultureCenterModel()
+                dto.toCommonCardModel()
             }
         }
     }

app/src/main/java/kr/ksw/visitkorea/domain/usecase/home/GetLeisureSportsForHomeUseCase.kt

@@ -1,10 +1,10 @@
 package kr.ksw.visitkorea.domain.usecase.home
 
-import kr.ksw.visitkorea.domain.usecase.model.LeisureSports
+import kr.ksw.visitkorea.domain.usecase.model.CommonCardModel
 
 interface GetLeisureSportsForHomeUseCase {
     suspend operator fun invoke(
         mapX: String,
         mapY: String,
-    ): Result<List<LeisureSports>>
+    ): Result<List<CommonCardModel>>
 }

app/src/main/java/kr/ksw/visitkorea/domain/usecase/home/GetLeisureSportsForHomeUseCaseImpl.kt

@@ -1,8 +1,8 @@
 package kr.ksw.visitkorea.domain.usecase.home
 
 import kr.ksw.visitkorea.data.repository.LocationBasedListRepository
-import kr.ksw.visitkorea.domain.usecase.mapper.toLeisureSportsModel
-import kr.ksw.visitkorea.domain.usecase.model.LeisureSports
+import kr.ksw.visitkorea.domain.usecase.mapper.toCommonCardModel
+import kr.ksw.visitkorea.domain.usecase.model.CommonCardModel
 import javax.inject.Inject
 
 class GetLeisureSportsForHomeUseCaseImpl @Inject constructor(
@@ -11,12 +11,12 @@ class GetLeisureSportsForHomeUseCaseImpl @Inject constructor(
     override suspend fun invoke(
         mapX: String,
         mapY: String,
-    ): Result<List<LeisureSports>> {
+    ): Result<List<CommonCardModel>> {
         return locationBasedListRepository.getLocationBasedListByContentType(
             10, 1, mapX, mapY, "28"
         ).map { list ->
             list.map { dto ->
-                dto.toLeisureSportsModel()
+                dto.toCommonCardModel()
             }
         }
     }

app/src/main/java/kr/ksw/visitkorea/domain/usecase/hotel/GetHotelListUseCase.kt

@@ -0,0 +1,13 @@
+package kr.ksw.visitkorea.domain.usecase.hotel
+
+import androidx.paging.PagingData
+import kotlinx.coroutines.flow.Flow
+import kr.ksw.visitkorea.data.remote.dto.LocationBasedDTO
+
+interface GetHotelListUseCase {
+    suspend operator fun invoke(
+        forceFetch: Boolean,
+        mapX: String,
+        mapY: String
+    ): Result<Flow<PagingData<LocationBasedDTO>>>
+}

app/src/main/java/kr/ksw/visitkorea/domain/usecase/hotel/GetHotelListUseCaseImpl.kt

@@ -0,0 +1,45 @@
+package kr.ksw.visitkorea.domain.usecase.hotel
+
+import androidx.paging.Pager
+import androidx.paging.PagingConfig
+import androidx.paging.PagingData
+import androidx.paging.PagingSource
+import kotlinx.coroutines.flow.Flow
+import kr.ksw.visitkorea.data.paging.source.LocationBasedPagingSource
+import kr.ksw.visitkorea.data.remote.api.LocationBasedListApi
+import kr.ksw.visitkorea.data.remote.dto.LocationBasedDTO
+import javax.inject.Inject
+
+class GetHotelListUseCaseImpl @Inject constructor(
+    private val locationBasedListApi: LocationBasedListApi
+): GetHotelListUseCase {
+    private var pagingSource: PagingSource<Int, LocationBasedDTO>? = null
+
+    override suspend fun invoke(
+        forceFetch: Boolean,
+        mapX: String,
+        mapY: String
+    ): Result<Flow<PagingData<LocationBasedDTO>>> = runCatching {
+        if(forceFetch &&
+            pagingSource != null &&
+            pagingSource?.invalid != true) {
+            pagingSource?.invalidate()
+        }
+        Pager(
+            config = PagingConfig(
+                pageSize = 10,
+                initialLoadSize = 10
+            ),
+            pagingSourceFactory = {
+                LocationBasedPagingSource(
+                    locationBasedListApi,
+                    "32",
+                    mapX,
+                    mapY
+                ).also {
+                    pagingSource = it
+                }
+            }
+        ).flow
+    }
+}

app/src/main/java/kr/ksw/visitkorea/domain/usecase/mapper/ToPresentationModelMapper.kt

@@ -1,8 +1,7 @@
 package kr.ksw.visitkorea.domain.usecase.mapper
 
 import kr.ksw.visitkorea.data.remote.dto.LocationBasedDTO
-import kr.ksw.visitkorea.domain.usecase.model.CultureCenter
-import kr.ksw.visitkorea.domain.usecase.model.LeisureSports
+import kr.ksw.visitkorea.domain.usecase.model.CommonCardModel
 import kr.ksw.visitkorea.domain.usecase.model.Restaurant
 import kr.ksw.visitkorea.domain.usecase.model.TouristSpot
 import kr.ksw.visitkorea.domain.usecase.util.toDistForUi
@@ -17,16 +16,11 @@ fun LocationBasedDTO.toTouristSpotModel(): TouristSpot = TouristSpot(
     title
 )
 
-fun LocationBasedDTO.toCultureCenterModel(): CultureCenter = CultureCenter(
+fun LocationBasedDTO.toCommonCardModel(): CommonCardModel = CommonCardModel(
     address,
     firstImage.toImageUrl(),
-    title
-)
-
-fun LocationBasedDTO.toLeisureSportsModel(): LeisureSports = LeisureSports(
-    address,
-    firstImage.toImageUrl(),
-    title
+    title,
+    contentId
 )
 
 val restaurantMap = mapOf(
@@ -44,5 +38,5 @@ fun LocationBasedDTO.toRestaurantModel(): Restaurant = Restaurant(
     dist.toDistForUi(),
     firstImage.toImageUrl(),
     title,
-    restaurantMap[cat3] ?: ""
+    restaurantMap[category] ?: ""
 )

app/src/main/java/kr/ksw/visitkorea/domain/usecase/model/LeisureSports.kt → app/src/main/java/kr/ksw/visitkorea/domain/usecase/model/CommonCardModel.kt

@@ -1,7 +1,8 @@
 package kr.ksw.visitkorea.domain.usecase.model
 
-data class LeisureSports(
+data class CommonCardModel(
     val address: String = "",
     val firstImage: String = "",
     val title: String = "",
+    val contentId: String = "",
 )

app/src/main/java/kr/ksw/visitkorea/presentation/home/screen/CultureCard.kt

@@ -36,14 +36,15 @@ import kr.ksw.visitkorea.presentation.ui.theme.VisitKoreaTheme
 
 @Composable
 fun CultureCard(
+    modifier: Modifier = Modifier,
+    ratio: Float = 0.7f,
     title: String,
     address: String,
     image: String,
 ) {
     Card (
-        modifier = Modifier
-            .width(160.dp)
-            .aspectRatio(0.78f),
+        modifier = modifier
+            .aspectRatio(ratio),
         shape = RoundedCornerShape(24.dp),
         elevation = CardDefaults.elevatedCardElevation(
             defaultElevation = 4.dp
@@ -53,7 +54,7 @@ fun CultureCard(
             AsyncImage(
                 modifier = Modifier
                     .fillMaxWidth()
-                    .height(144.dp)
+                    .aspectRatio(1f)
                     .background(color = Color.LightGray),
                 model = ImageRequest
                     .Builder(LocalContext.current)
@@ -104,9 +105,9 @@ fun CultureCardPreview() {
                 .padding(20.dp)
         ) {
             CultureCard(
-                "문화시설",
-                "문화시설 주소",
-                "https://ksw"
+                title = "문화시설",
+                address = "문화시설 주소",
+                image = "https://ksw"
             )
         }
     }

app/src/main/java/kr/ksw/visitkorea/presentation/home/screen/HomeScreen.kt

@@ -172,9 +172,10 @@ fun HomeScreen(
                     ) { index ->
                         val cultureCenter = homeState.cultureCenterList[index]
                         CultureCard(
-                            cultureCenter.title,
-                            cultureCenter.address,
-                            cultureCenter.firstImage
+                            Modifier.fillParentMaxWidth(0.5f),
+                            title = cultureCenter.title,
+                            address = cultureCenter.address,
+                            image = cultureCenter.firstImage
                         )
                     }
                 }
@@ -202,9 +203,10 @@ fun HomeScreen(
                     ) { index ->
                         val leisureSports = homeState.leisureSportsList[index]
                         CultureCard(
-                            leisureSports.title,
-                            leisureSports.address,
-                            leisureSports.firstImage
+                            Modifier.fillParentMaxWidth(0.5f),
+                            title = leisureSports.title,
+                            address = leisureSports.address,
+                            image = leisureSports.firstImage
                         )
                     }
                 }

app/src/main/java/kr/ksw/visitkorea/presentation/home/viewmodel/HomeState.kt

@@ -1,16 +1,15 @@
 package kr.ksw.visitkorea.presentation.home.viewmodel
 
 import androidx.compose.runtime.Immutable
-import kr.ksw.visitkorea.domain.usecase.model.CultureCenter
-import kr.ksw.visitkorea.domain.usecase.model.LeisureSports
+import kr.ksw.visitkorea.domain.usecase.model.CommonCardModel
 import kr.ksw.visitkorea.domain.usecase.model.Restaurant
 import kr.ksw.visitkorea.domain.usecase.model.TouristSpot
 
 @Immutable
 data class HomeState(
     val mainImage: String = "",
     val touristSpotList: List<TouristSpot> = emptyList(),
-    val cultureCenterList: List<CultureCenter> = emptyList(),
-    val leisureSportsList: List<LeisureSports> = emptyList(),
+    val cultureCenterList: List<CommonCardModel> = emptyList(),
+    val leisureSportsList: List<CommonCardModel> = emptyList(),
     val restaurantList: List<Restaurant> = emptyList(),
 )