Skip to content

Commit d262f3f

Browse files
authored
[Feat] 리뷰 v2 오류 수정 (#424)
* chore: 리뷰 없을 때 배경색 Gray100 * fix: review info에서 평균 반올림 * doce: Todo 추가 * fix: menu에 대한 리뷰일 때 리뷰 수정화면으로 이동이 안되는 에러
1 parent 02f6fb5 commit d262f3f

File tree

5 files changed

+17
-10
lines changed

5 files changed

+17
-10
lines changed

app/src/main/java/com/eatssu/android/data/remote/dto/response/MealReviewInfoResponse.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package com.eatssu.android.data.remote.dto.response
22

33
import com.eatssu.android.domain.model.ReviewInfo
44
import com.google.gson.annotations.SerializedName
5+
import kotlin.math.round
56

67
data class MealReviewInfoResponse(
78
@SerializedName("menuNames") val menuNames: List<String>? = null,
@@ -21,7 +22,7 @@ data class MealReviewInfoResponse(
2122

2223
fun MealReviewInfoResponse.toDomain() = ReviewInfo(
2324
reviewCnt = totalReviewCount ?: 0,
24-
rating = rating ?: 0.0,
25+
rating = (round((rating ?: 0.0) * 10) / 10),
2526
oneStarCount = reviewRatingCount?.oneStarCount ?: 0,
2627
twoStarCount = reviewRatingCount?.twoStarCount ?: 0,
2728
threeStarCount = reviewRatingCount?.threeStarCount ?: 0,

app/src/main/java/com/eatssu/android/data/remote/dto/response/MenuReviewInfoResponse.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package com.eatssu.android.data.remote.dto.response
22

33
import com.eatssu.android.domain.model.ReviewInfo
44
import com.google.gson.annotations.SerializedName
5+
import kotlin.math.round
56

67
data class MenuReviewInfoResponse(
78
@SerializedName("menuName") val menuName: String? = null,
@@ -21,7 +22,7 @@ data class MenuReviewInfoResponse(
2122

2223
fun MenuReviewInfoResponse.toDomain() = ReviewInfo(
2324
reviewCnt = totalReviewCount ?: 0,
24-
rating = rating ?: 0.0,
25+
rating = (round((rating ?: 0.0) * 10) / 10),
2526
oneStarCount = reviewRatingCount?.oneStarCount ?: 0,
2627
twoStarCount = reviewRatingCount?.twoStarCount ?: 0,
2728
threeStarCount = reviewRatingCount?.threeStarCount ?: 0,

app/src/main/java/com/eatssu/android/presentation/cafeteria/review/ReviewNav.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,8 @@ fun ReviewNav(
7272
val reviewId = prev?.get<Long>("reviewId") ?: 0L
7373
val initialRating = prev?.get<Int>("initialRating") ?: 0
7474
val initialContent = prev?.get<String>("initialContent") ?: ""
75-
val menuLikeInfoNames =
76-
prev?.get<ArrayList<Review.MenuLikeInfo>>("menuList") ?: arrayListOf()
75+
val menuLikeInfoNames = prev?.get<List<Review.MenuLikeInfo>>("menuList")
76+
?.let { ArrayList(it) } ?: arrayListOf()
7777

7878
ModifyReviewScreen(
7979
reviewId = reviewId,

app/src/main/java/com/eatssu/android/presentation/mypage/myreview/MyReviewListScreen.kt

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package com.eatssu.android.presentation.mypage.myreview
22

3+
import androidx.compose.foundation.background
34
import androidx.compose.foundation.layout.Arrangement
45
import androidx.compose.foundation.layout.Box
56
import androidx.compose.foundation.layout.Column
@@ -38,6 +39,7 @@ import com.eatssu.common.UiEvent
3839
import com.eatssu.common.UiState
3940
import com.eatssu.design_system.component.EatSsuTopBar
4041
import com.eatssu.design_system.theme.EatssuTheme
42+
import com.eatssu.design_system.theme.Gray100
4143
import com.eatssu.design_system.theme.Gray600
4244
import timber.log.Timber
4345

@@ -114,8 +116,7 @@ internal fun MyReviewListScreen(
114116
Surface(modifier = modifier.padding(innerPadding)) {
115117
Column(
116118
modifier = Modifier
117-
.fillMaxSize()
118-
.padding(horizontal = 24.dp),
119+
.fillMaxSize(),
119120
horizontalAlignment = Alignment.CenterHorizontally,
120121
) {
121122

@@ -127,7 +128,9 @@ internal fun MyReviewListScreen(
127128
val reviewList = dataState.myReviews ?: emptyList()
128129

129130
LazyColumn(
130-
modifier = Modifier.weight(1f)
131+
modifier = Modifier
132+
.weight(1f)
133+
.padding(horizontal = 24.dp),
131134
) {
132135
items(reviewList) { item ->
133136
ReviewItem(
@@ -150,7 +153,9 @@ internal fun MyReviewListScreen(
150153
is MyReviewState.NoReview -> {
151154
Timber.d("리뷰 없음")
152155
Column(
153-
modifier = Modifier.fillMaxSize(),
156+
modifier = Modifier
157+
.fillMaxSize()
158+
.background(Gray100),
154159
horizontalAlignment = Alignment.CenterHorizontally,
155160
verticalArrangement = Arrangement.Center
156161
) {

app/src/main/java/com/eatssu/android/presentation/mypage/myreview/MyReviewNav.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,8 @@ fun MyReviewNav(
4747
val reviewId = prev?.get<Long>("reviewId") ?: 0L
4848
val initialRating = prev?.get<Int>("initialRating") ?: 0
4949
val initialContent = prev?.get<String>("initialContent") ?: ""
50-
val menuLikeInfoNames =
51-
prev?.get<ArrayList<Review.MenuLikeInfo>>("menuList") ?: arrayListOf()
50+
val menuLikeInfoNames = prev?.get<List<Review.MenuLikeInfo>>("menuList")
51+
?.let { ArrayList(it) } ?: arrayListOf()
5252

5353
ModifyReviewScreen(
5454
reviewId = reviewId,

0 commit comments

Comments
 (0)