[feature/withdraw] 식당리스트 화면 리뷰 분기처리 (#96)

SsongSik · SsongSik · commit 8d08a69b1def · 2024-02-08T15:04:58.000+09:00
diff --git a/data/src/main/java/com/everymeal/data/datasource/review/ReviewDataSource.kt b/data/src/main/java/com/everymeal/data/datasource/review/ReviewDataSource.kt
@@ -10,8 +10,6 @@ import kotlinx.coroutines.flow.Flow
 interface ReviewDataSource {
 
     suspend fun getPagingStoreReviews(
-        offset: Int,
-        limit: Int,
         order: String?,
         group: String?,
         grade: Int?,
diff --git a/data/src/main/java/com/everymeal/data/datasource/review/ReviewDataSourceImpl.kt b/data/src/main/java/com/everymeal/data/datasource/review/ReviewDataSourceImpl.kt
@@ -16,8 +16,6 @@ class ReviewDataSourceImpl @Inject constructor(
     private val storeReviewApi: StoreReviewApi,
 ) : ReviewDataSource {
     override suspend fun getPagingStoreReviews(
-        offset: Int,
-        limit: Int,
         order: String?,
         group: String?,
         grade: Int?,
diff --git a/data/src/main/java/com/everymeal/data/repository/review/DefaultReviewRepository.kt b/data/src/main/java/com/everymeal/data/repository/review/DefaultReviewRepository.kt
@@ -20,16 +20,12 @@ class DefaultReviewRepository @Inject constructor(
     private val reviewDataSource: ReviewDataSource,
 ) : ReviewRepository {
     override suspend fun getPagingStoreReviews(
-        offset: Int,
-        limit: Int,
         order: String?,
         group: String?,
         grade: Int?,
         campusIdx: Int
     ): Flow<PagingData<StoreReviewEntity>> {
         return reviewDataSource.getPagingStoreReviews(
-            offset,
-            limit,
             order,
             group,
             grade,
diff --git a/domain/src/main/java/com/everymeal/domain/repository/review/ReviewRepository.kt b/domain/src/main/java/com/everymeal/domain/repository/review/ReviewRepository.kt
@@ -9,8 +9,6 @@ import kotlinx.coroutines.flow.Flow
 
 interface ReviewRepository {
     suspend fun getPagingStoreReviews(
-        offset: Int,
-        limit: Int,
         order: String?,
         group: String?,
         grade: Int?,
diff --git a/domain/src/main/java/com/everymeal/domain/usecase/review/GetStoreReviewUseCase.kt b/domain/src/main/java/com/everymeal/domain/usecase/review/GetStoreReviewUseCase.kt
@@ -10,13 +10,11 @@ class GetStoreReviewUseCase @Inject constructor(
     private val reviewRepository: ReviewRepository
 ) {
     suspend operator fun invoke(
-        offset: Int,
-        limit: Int,
         order: String?,
         group: String?,
         grade: Int?,
         campusIdx: Int
     ) : Flow<PagingData<StoreReviewEntity>> {
-        return reviewRepository.getPagingStoreReviews(offset, limit, order, group, grade, campusIdx)
+        return reviewRepository.getPagingStoreReviews(order, group, grade, campusIdx)
     }
 }
diff --git a/presentation/src/main/java/com/everymeal/presentation/ui/detail/DetailListContract.kt b/presentation/src/main/java/com/everymeal/presentation/ui/detail/DetailListContract.kt
@@ -16,10 +16,11 @@ class DetailContract {
         val reportCategoryType: ReportCategoryType = ReportCategoryType.NONE,
         val restaurantCategoryType: RestaurantCategoryType = RestaurantCategoryType.NONE,
         val rating: Int = 0,
+        val isReviewScreen: Boolean = false
     ) : ViewState
 
     sealed class DetailEvent : ViewEvent {
-        object InitDetailScreen : DetailEvent()
+        data class InitDetailScreen(val isReviewScreen: Boolean = false) : DetailEvent()
         data class SortBottomSheetStateChange(val sortBottomSheetState: Boolean) : DetailEvent()
         data class MealRatingBottomSheetStateChange(val mealRatingBottomSheetState: Boolean) : DetailEvent()
         data class ReportBottomSheetStateChange(val reportBottomSheetState: Boolean) : DetailEvent()
diff --git a/presentation/src/main/java/com/everymeal/presentation/ui/detail/DetailListScreen.kt b/presentation/src/main/java/com/everymeal/presentation/ui/detail/DetailListScreen.kt
@@ -31,11 +31,13 @@ import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.paging.compose.LazyPagingItems
 import androidx.paging.compose.collectAsLazyPagingItems
 import com.everymeal.domain.model.restaurant.RestaurantDataEntity
+import com.everymeal.domain.model.review.StoreReviewEntity
 import com.everymeal.presentation.R
 import com.everymeal.presentation.components.EveryMealCategoryRatingBottomSheetDialog
 import com.everymeal.presentation.components.EveryMealDetailReportBottomSheetDialog
 import com.everymeal.presentation.components.EveryMealReportBottomSheetDialog
 import com.everymeal.presentation.components.EveryMealRestaurantItem
+import com.everymeal.presentation.components.EveryMealReviewItem
 import com.everymeal.presentation.components.EveryMealSortCategoryBottomSheetDialog
 import com.everymeal.presentation.ui.save.SaveTopBar
 import com.everymeal.presentation.ui.theme.Grey2
@@ -55,8 +57,11 @@ fun DetailListScreen(
     val pagingRestaurantList: LazyPagingItems<RestaurantDataEntity> =
         detailListViewModel.restaurantItems.collectAsLazyPagingItems()
 
+    val pagingReviewList: LazyPagingItems<StoreReviewEntity> =
+        detailListViewModel.restaurantReviews.collectAsLazyPagingItems()
+
     LaunchedEffect(Unit) {
-        detailListViewModel.setEvent(DetailContract.DetailEvent.InitDetailScreen)
+        detailListViewModel.setEvent(DetailContract.DetailEvent.InitDetailScreen(title == "리뷰"))
     }
 
     LaunchedEffect(key1 = detailListViewModel.effect) {
@@ -258,6 +263,19 @@ fun DetailListScreen(
                     Spacer(modifier = Modifier.padding(16.dp))
                 }
             }
+
+            items(pagingReviewList.itemCount) { index ->
+                val item = pagingReviewList[index]
+                item?.let {
+                    EveryMealReviewItem(
+                        review = it,
+                        onDetailRestaurantClick = { restaurantId ->
+                            detailListViewModel.setEvent(DetailContract.DetailEvent.OnRestaurantDetailClick(restaurantId))
+                        }
+                    )
+                    Spacer(modifier = Modifier.padding(16.dp))
+                }
+            }
         }
     }
 }
diff --git a/presentation/src/main/java/com/everymeal/presentation/ui/detail/DetailListViewModel.kt b/presentation/src/main/java/com/everymeal/presentation/ui/detail/DetailListViewModel.kt
@@ -4,8 +4,10 @@ import androidx.lifecycle.viewModelScope
 import androidx.paging.PagingData
 import androidx.paging.cachedIn
 import com.everymeal.domain.model.restaurant.RestaurantDataEntity
+import com.everymeal.domain.model.review.StoreReviewEntity
 import com.everymeal.domain.usecase.local.GetUniversityIndexUseCase
 import com.everymeal.domain.usecase.restaurant.GetUnivRestaurantUseCase
+import com.everymeal.domain.usecase.review.GetStoreReviewUseCase
 import com.everymeal.presentation.base.BaseViewModel
 import com.everymeal.presentation.ui.detail.DetailContract.DetailEvent
 import com.everymeal.presentation.ui.detail.DetailContract.DetailState
@@ -21,23 +23,38 @@ import javax.inject.Inject
 @HiltViewModel
 class DetailListViewModel @Inject constructor(
     private val getUnivRestaurantUseCase: GetUnivRestaurantUseCase,
-    private val getUniversityIndexUseCase: GetUniversityIndexUseCase
+    private val getUniversityIndexUseCase: GetUniversityIndexUseCase,
+    private val getStoreReviewUseCase: GetStoreReviewUseCase
 ): BaseViewModel<DetailState, DetailEffect, DetailEvent>(
     DetailState()
 ) {
     private val _restaurantItems : MutableStateFlow<PagingData<RestaurantDataEntity>> = MutableStateFlow(value = PagingData.empty())
     val restaurantItems : StateFlow<PagingData<RestaurantDataEntity>> = _restaurantItems.asStateFlow()
 
+    private val _restaurantReviews : MutableStateFlow<PagingData<StoreReviewEntity>> = MutableStateFlow(value = PagingData.empty())
+    val restaurantReviews : StateFlow<PagingData<StoreReviewEntity>> = _restaurantReviews.asStateFlow()
+
     override fun handleEvents(event: DetailEvent) {
         when (event) {
             is DetailEvent.InitDetailScreen -> {
-                getRestaurantList()
+                reflectUpdateState(
+                    isReviewScreen = event.isReviewScreen
+                )
+                if(event.isReviewScreen) {
+                    getReviewList()
+                } else {
+                    getRestaurantList()
+                }
             }
             is DetailEvent.OnClickDetailListCategoryType -> {
                 reflectUpdateState(
                     detailSortCategoryType = event.detailSortCategoryType
                 )
-                getRestaurantList()
+                if(viewState.value.isReviewScreen) {
+                    getReviewList()
+                } else {
+                    getRestaurantList()
+                }
             }
             is DetailEvent.SortBottomSheetStateChange -> {
                 reflectUpdateState(
@@ -48,7 +65,11 @@ class DetailListViewModel @Inject constructor(
                 reflectUpdateState(
                     mealRatingBottomSheetState = event.mealRatingBottomSheetState
                 )
-                getRestaurantList()
+                if(viewState.value.isReviewScreen) {
+                    getReviewList()
+                } else {
+                    getRestaurantList()
+                }
             }
             is DetailEvent.ReportBottomSheetStateChange -> {
                 reflectUpdateState(
@@ -79,20 +100,42 @@ class DetailListViewModel @Inject constructor(
                 reflectUpdateState(
                     restaurantCategoryType = RestaurantCategoryType.NONE
                 )
-                getRestaurantList()
+                if(viewState.value.isReviewScreen) {
+                    getReviewList()
+                } else {
+                    getRestaurantList()
+                }
             }
             is DetailEvent.OnDeleteClickRating -> {
                 reflectUpdateState(
                     rating = 0
                 )
-                getRestaurantList()
+                if(viewState.value.isReviewScreen) {
+                    getReviewList()
+                } else {
+                    getRestaurantList()
+                }
             }
             is DetailEvent.OnRestaurantDetailClick -> {
                 sendEffect({ DetailEffect.OnRestaurantClickEffect(event.restaurantId) })
             }
         }
     }
 
+    private fun getReviewList() {
+        viewModelScope.launch {
+            getStoreReviewUseCase(
+                order = viewState.value.detailSortCategoryType.sort(),
+                group = viewState.value.restaurantCategoryType.sort(),
+                grade = if(viewState.value.rating == 0) null else viewState.value.rating,
+                campusIdx = getUniversityIndexUseCase().first().toInt()
+            ).cachedIn(viewModelScope)
+             .collect {
+                _restaurantReviews.emit(it)
+             }
+        }
+    }
+
     private fun getRestaurantList() {
         viewModelScope.launch {
             getUnivRestaurantUseCase(
@@ -116,6 +159,7 @@ class DetailListViewModel @Inject constructor(
         reportCategoryType: ReportCategoryType = viewState.value.reportCategoryType,
         rating: Int = viewState.value.rating,
         restaurantCategoryType: RestaurantCategoryType = viewState.value.restaurantCategoryType,
+        isReviewScreen: Boolean = viewState.value.isReviewScreen
     ) {
         updateState {
             copy(
@@ -127,6 +171,7 @@ class DetailListViewModel @Inject constructor(
                 reportCategoryType = reportCategoryType,
                 rating = rating,
                 restaurantCategoryType = restaurantCategoryType,
+                isReviewScreen = isReviewScreen
             )
         }
     }
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
@@ -34,6 +34,7 @@ enum class DetailListScreenType {
     RESTAURANT,
     CAFE,
     DRINK,
+    REVIEW
 }
 
 fun String.DetailListScreenType(): DetailListScreenType {
@@ -42,6 +43,7 @@ fun String.DetailListScreenType(): DetailListScreenType {
         "밥집" -> DetailListScreenType.RESTAURANT
         "카페" -> DetailListScreenType.CAFE
         "술집" -> DetailListScreenType.DRINK
+        "리뷰" -> DetailListScreenType.REVIEW
         else -> DetailListScreenType.RECOMMEND
     }
 }
@@ -52,5 +54,6 @@ fun DetailListScreenType.title(): String {
         DetailListScreenType.RESTAURANT -> "밥집"
         DetailListScreenType.CAFE -> "카페"
         DetailListScreenType.DRINK -> "술집"
+        DetailListScreenType.REVIEW -> "리뷰"
     }
 }
diff --git a/presentation/src/main/java/com/everymeal/presentation/ui/home/HomeScreen.kt b/presentation/src/main/java/com/everymeal/presentation/ui/home/HomeScreen.kt
@@ -196,7 +196,7 @@ fun HomeScreen(
                         EveryMealLineButton(
                             text = stringResource(R.string.home_restaurant_review_button_text),
                             onClick = {
-
+                                homeViewModel.setEvent(HomeContract.HomeEvent.OnClickDetailList("리뷰".DetailListScreenType()))
                             },
                         )
                     }

Original file line number	Diff line number	Diff line change
`@@ -34,6 +34,7 @@ enum class DetailListScreenType {`
`34`	`34`	`RESTAURANT,`
`35`	`35`	`CAFE,`
`36`	`36`	`DRINK,`
	`37`	`+ REVIEW`
`37`	`38`	`}`
`38`	`39`
`39`	`40`	`fun String.DetailListScreenType(): DetailListScreenType {`
`@@ -42,6 +43,7 @@ fun String.DetailListScreenType(): DetailListScreenType {`
`42`	`43`	`"밥집" -> DetailListScreenType.RESTAURANT`
`43`	`44`	`"카페" -> DetailListScreenType.CAFE`
`44`	`45`	`"술집" -> DetailListScreenType.DRINK`
	`46`	`+ "리뷰" -> DetailListScreenType.REVIEW`
`45`	`47`	`else -> DetailListScreenType.RECOMMEND`
`46`	`48`	`}`
`47`	`49`	`}`
`@@ -52,5 +54,6 @@ fun DetailListScreenType.title(): String {`
`52`	`54`	`DetailListScreenType.RESTAURANT -> "밥집"`
`53`	`55`	`DetailListScreenType.CAFE -> "카페"`
`54`	`56`	`DetailListScreenType.DRINK -> "술집"`
	`57`	`+ DetailListScreenType.REVIEW -> "리뷰"`
`55`	`58`	`}`
`56`	`59`	`}`
Original file line number	Diff line number	Diff line change
`@@ -196,7 +196,7 @@ fun HomeScreen(`
`196`	`196`	`EveryMealLineButton(`
`197`	`197`	`text = stringResource(R.string.home_restaurant_review_button_text),`
`198`	`198`	`onClick = {`
`199`		`-`
	`199`	`+ homeViewModel.setEvent(HomeContract.HomeEvent.OnClickDetailList("리뷰".DetailListScreenType()))`
`200`	`200`	`},`
`201`	`201`	`)`
`202`	`202`	`}`