fix: not load meal's review

EAT-SSU · Oct 10, 2024 · 73f60f3 · 73f60f3
1 parent 7130386
commit 73f60f3
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 24 deletions.
diff --git a/app/src/main/java/com/eatssu/android/data/dto/response/ReviewListResponse.kt b/app/src/main/java/com/eatssu/android/data/dto/response/ReviewListResponse.kt
@@ -26,8 +26,8 @@ data class GetReviewListResponse(
         )
 }
 
-fun GetReviewListResponse.toReviewList(): List<Review>? {
-    return dataList?.map { data ->
+fun GetReviewListResponse.toReviewList(): List<Review> {
+    return dataList!!.map { data ->
         Review(
             reviewId = data.reviewId,
             isWriter = data.isWriter,

diff --git a/app/src/main/java/com/eatssu/android/ui/review/list/ReviewActivity.kt b/app/src/main/java/com/eatssu/android/ui/review/list/ReviewActivity.kt
@@ -42,23 +42,6 @@ class ReviewActivity :
 
     }
 
-    //Todo 이게 최선일까?
-    override fun onRestart() {
-        super.onRestart()
-        Timber.d("onRestart")
-
-        lodeData()
-        bindData()
-    }
-
-    override fun onResume() {
-        super.onResume()
-        Timber.d("onResume")
-
-        lodeData()
-        bindData()
-    }
-
 
     private fun getIndex() {
         //get menuId
@@ -79,7 +62,7 @@ class ReviewActivity :
         when (menuType) {
             "FIXED" -> {
                 binding.btnNextReview.setOnClickListener {
-                    val intent = Intent(this, ReviewWriteRateActivity::class.java)  // 인텐트를 생성해줌,
+                    val intent = Intent(this, ReviewWriteRateActivity::class.java)
                     intent.putExtra("itemId", itemId)
                     intent.putExtra("itemName", itemName)
                     intent.putExtra("menuType", menuType)
@@ -89,7 +72,7 @@ class ReviewActivity :
 
             "VARIABLE" -> {
                 binding.btnNextReview.setOnClickListener {
-                    val intent = Intent(this, ReviewWriteMenuActivity::class.java)  // 인텐트를 생성해줌,
+                    val intent = Intent(this, ReviewWriteMenuActivity::class.java)
                     intent.putExtra("itemId", itemId)
                     intent.putExtra("menuType", menuType)
                     startActivity(intent)
@@ -136,7 +119,6 @@ class ReviewActivity :
                             setHasFixedSize(true)
                         }
 
-
                         it.reviewInfo?.apply {
                             binding.tvMenu.text = name.replace(Regex("[\\[\\]]"), "")
 

diff --git a/app/src/main/java/com/eatssu/android/ui/review/list/ReviewViewModel.kt b/app/src/main/java/com/eatssu/android/ui/review/list/ReviewViewModel.kt
@@ -7,6 +7,7 @@ import com.eatssu.android.data.dto.response.toReviewList
 import com.eatssu.android.data.model.Review
 import com.eatssu.android.data.model.ReviewInfo
 import com.eatssu.android.data.usecase.GetMealReviewInfoUseCase
+import com.eatssu.android.data.usecase.GetMealReviewListUseCase
 import com.eatssu.android.data.usecase.GetMenuReviewInfoUseCase
 import com.eatssu.android.data.usecase.GetMenuReviewListUseCase
 import dagger.hilt.android.lifecycle.HiltViewModel
@@ -25,10 +26,10 @@ import javax.inject.Inject
 
 @HiltViewModel
 class ReviewViewModel @Inject constructor(
+    private val getMenuReviewInfoUseCase: GetMenuReviewInfoUseCase,
     private val getMenuReviewListUseCase: GetMenuReviewListUseCase,
-    private val getMealReviewListUseCase: GetMenuReviewListUseCase,
     private val getMealReviewInfoUseCase: GetMealReviewInfoUseCase,
-    private val getMenuReviewInfoUseCase: GetMenuReviewInfoUseCase,
+    private val getMealReviewListUseCase: GetMealReviewListUseCase,
 ) : ViewModel() {
 
     private val _uiState: MutableStateFlow<ReviewState> = MutableStateFlow(ReviewState())