[feat/review_api]: Merge Error 해결

everymeals · Feb 4, 2024 · ac87aca · ac87aca
1 parent 9651d1e
commit ac87aca
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 18 deletions.
diff --git a/data/src/main/java/com/everymeal/data/model/restaruant/GetUnivRestaurantResponse.kt b/data/src/main/java/com/everymeal/data/model/restaruant/GetUnivRestaurantResponse.kt
@@ -1,8 +1,7 @@
 package com.everymeal.data.model.restaruant
 
-import com.everymeal.domain.model.restaurant.Restaurant
 import com.everymeal.domain.model.restaurant.GetUnivRestaurantEntity
-import com.everymeal.domain.model.restaurant.RestaurantDataEntity
+import com.everymeal.domain.model.restaurant.Restaurant
 import kotlinx.serialization.Serializable
 
 @Serializable
@@ -52,7 +51,7 @@ data class Sort(
     val unsorted: Boolean,
 )
 
-fun RestaurantResponse.toEntity(): Restaurant {
+fun RestaurantResponse.toRestaurant(): Restaurant {
     return Restaurant(
         idx = this.idx,
         name = this.name,
@@ -68,8 +67,9 @@ fun RestaurantResponse.toEntity(): Restaurant {
     )
 }
 
-fun GetUnivRestaurantResponse.toEntity(): GetUnivRestaurantEntity {
+
+fun GetUnivRestaurantResponse.toGetUnivRestaurantEntity(): GetUnivRestaurantEntity {
     return GetUnivRestaurantEntity(
-        data = this.content.map { it.toEntity() }
+        data = this.content.map { it.toRestaurant() }
     )
 }
diff --git a/data/src/main/java/com/everymeal/data/repository/restaurant/RestaurantRepositoryImpl.kt b/data/src/main/java/com/everymeal/data/repository/restaurant/RestaurantRepositoryImpl.kt
@@ -3,14 +3,13 @@ package com.everymeal.data.repository.restaurant
 import androidx.paging.PagingData
 import androidx.paging.map
 import com.everymeal.data.datasource.restaurant.RestaurantDataSource
-import com.everymeal.data.model.restaruant.toEntity
+import com.everymeal.data.model.restaruant.toGetUnivRestaurantEntity
+import com.everymeal.data.model.restaruant.toRestaurant
+import com.everymeal.domain.model.restaurant.GetUnivRestaurantEntity
 import com.everymeal.domain.model.restaurant.Restaurant
 import com.everymeal.domain.repository.restaurant.RestaurantRepository
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.map
-import androidx.paging.map
-import com.everymeal.data.model.restaruant.toEntity
-import com.everymeal.domain.model.restaurant.GetUnivRestaurantEntity
 import javax.inject.Inject
 
 class RestaurantRepositoryImpl @Inject constructor(
@@ -24,12 +23,12 @@ class RestaurantRepositoryImpl @Inject constructor(
     ): Flow<PagingData<Restaurant>> {
         return restaurantDataSource.getUnivRestaurant(campusIdx, order, group, grade)
             .map { pagingData ->
-                pagingData.map { it.toEntity() }
+                pagingData.map { it.toRestaurant() }
             }
     }
 
     override suspend fun getRestaurantDetail(index: Int): Result<Restaurant> {
-        return restaurantDataSource.getRestaurantDetail(index).map { it.toEntity() }
+        return restaurantDataSource.getRestaurantDetail(index).map { it.toRestaurant() }
     }
 
     override suspend fun getHomeRestaurant(
@@ -38,6 +37,7 @@ class RestaurantRepositoryImpl @Inject constructor(
         group: String?,
         grade: String?
     ): Result<GetUnivRestaurantEntity> {
-        return restaurantDataSource.getHomeRestaurant(campusIdx, order, group, grade).map { it.toEntity() }
+        return restaurantDataSource.getHomeRestaurant(campusIdx, order, group, grade)
+            .map { it.toGetUnivRestaurantEntity() }
     }
 }
diff --git a/domain/src/main/java/com/everymeal/domain/model/restaurant/GetUnivRestaurantEntity.kt b/domain/src/main/java/com/everymeal/domain/model/restaurant/GetUnivRestaurantEntity.kt
@@ -0,0 +1,5 @@
+package com.everymeal.domain.model.restaurant
+
+data class GetUnivRestaurantEntity(
+    val data: List<Restaurant>
+)
diff --git a/domain/src/main/java/com/everymeal/domain/repository/restaurant/RestaurantRepository.kt b/domain/src/main/java/com/everymeal/domain/repository/restaurant/RestaurantRepository.kt
@@ -17,7 +17,6 @@ interface RestaurantRepository {
     suspend fun getRestaurantDetail(
         index: Int
     ): Result<Restaurant>
-    ) : Result<RestaurantDataEntity>
 
     suspend fun getHomeRestaurant(
         campusIdx: Int,

diff --git a/presentation/src/main/java/com/everymeal/presentation/ui/home/HomeContract.kt b/presentation/src/main/java/com/everymeal/presentation/ui/home/HomeContract.kt
@@ -1,7 +1,6 @@
 package com.everymeal.presentation.ui.home
 
-import com.everymeal.domain.model.restaurant.GetUnivRestaurantEntity
-import com.everymeal.domain.model.restaurant.RestaurantDataEntity
+import com.everymeal.domain.model.restaurant.Restaurant
 import com.everymeal.presentation.base.LoadState
 import com.everymeal.presentation.base.ViewEvent
 import com.everymeal.presentation.base.ViewSideEffect
@@ -12,7 +11,7 @@ class HomeContract {
         val uiState: LoadState = LoadState.LOADING,
         val detailListScreenType: DetailListScreenType = DetailListScreenType.RECOMMEND,
         val bottomSheetState: Boolean = false,
-        val restaurantData: List<RestaurantDataEntity> = emptyList()
+        val restaurantData: List<Restaurant> = emptyList()
     ) : ViewState
 
     sealed class HomeEvent : ViewEvent {

diff --git a/...entation/src/main/java/com/everymeal/presentation/ui/restaurant/DetailRestaurantScreen.kt b/...entation/src/main/java/com/everymeal/presentation/ui/restaurant/DetailRestaurantScreen.kt
@@ -252,7 +252,7 @@ fun DetailRestaurantScreen(
 @OptIn(ExperimentalFoundationApi::class)
 @Composable
 fun DetailRestaurantImage(
-    restaurantInfo : RestaurantDataEntity
+    restaurantInfo : Restaurant
 ) {
     val images = restaurantInfo.images ?: listOf()
 
@@ -538,7 +538,7 @@ fun DetailRestaurantTabInfo(
 
 @Composable
 fun DetailRestaurantTabImage(
-    restaurantInfo : RestaurantDataEntity
+    restaurantInfo : Restaurant
 ) {
     Column {
         restaurantInfo.images?.let { images ->