diff --git a/app/src/main/java/com/eatssu/android/data/remote/dto/response/MealReviewListResponse.kt b/app/src/main/java/com/eatssu/android/data/remote/dto/response/MealReviewListResponse.kt index b33adb81d..203d48919 100644 --- a/app/src/main/java/com/eatssu/android/data/remote/dto/response/MealReviewListResponse.kt +++ b/app/src/main/java/com/eatssu/android/data/remote/dto/response/MealReviewListResponse.kt @@ -8,19 +8,19 @@ import kotlinx.serialization.Serializable data class MealReviewListResponse( @SerialName("numberOfElements") val numberOfElements: Int? = null, @SerialName("hasNext") val hasNext: Boolean? = null, - @SerialName("dataList") val dataList: List = arrayListOf() + @SerialName("dataList") val dataList: List = listOf() ) { @Serializable data class DataList( @SerialName("reviewId") val reviewId: Long? = null, - @SerialName("menuList") val menuList: List = arrayListOf(), + @SerialName("menuList") val menuList: List = listOf(), @SerialName("writerId") val writerId: Long? = null, @SerialName("isWriter") val isWriter: Boolean? = null, @SerialName("writerNickname") val writerNickname: String? = null, @SerialName("rating") val rating: Int? = null, @SerialName("writtenAt") val writtenAt: String? = null, @SerialName("content") val content: String? = null, - @SerialName("imageUrls") val imageUrls: List = arrayListOf(), + @SerialName("imageUrls") val imageUrls: List = listOf(), ) { @Serializable data class MenuList( @@ -38,7 +38,7 @@ fun MealReviewListResponse?.toDomain(): List { Review( reviewId = data.reviewId ?: -1L, isWriter = data.isWriter ?: false, - menuLikeInfoList = data.menuList.map { menu -> + menuLikeInfoList = data.menuList.filterNotNull().map { menu -> Review.MenuLikeInfo( menuId = menu.id ?: -1L, name = menu.name ?: "", @@ -49,7 +49,7 @@ fun MealReviewListResponse?.toDomain(): List { rating = data.rating ?: 0, writeDate = data.writtenAt ?: "", content = data.content ?: "", - imgUrl = data.imageUrls.firstOrNull(), + imgUrl = data.imageUrls.firstOrNull { it != null }, ) } ?: emptyList() } diff --git a/app/src/main/java/com/eatssu/android/data/remote/dto/response/MenuReviewListResponse.kt b/app/src/main/java/com/eatssu/android/data/remote/dto/response/MenuReviewListResponse.kt index 46aee3015..ebf1e8904 100644 --- a/app/src/main/java/com/eatssu/android/data/remote/dto/response/MenuReviewListResponse.kt +++ b/app/src/main/java/com/eatssu/android/data/remote/dto/response/MenuReviewListResponse.kt @@ -8,7 +8,7 @@ import kotlinx.serialization.Serializable data class MenuReviewListResponse( @SerialName("numberOfElements") val numberOfElements: Int? = null, @SerialName("hasNext") val hasNext: Boolean? = null, - @SerialName("dataList") val dataList: List = arrayListOf(), + @SerialName("dataList") val dataList: List = listOf(), ) { @Serializable data class DataList( @@ -20,7 +20,7 @@ data class MenuReviewListResponse( @SerialName("rating") val rating: Int? = null, @SerialName("writtenAt") val writtenAt: String? = null, @SerialName("content") val content: String? = null, - @SerialName("imageUrls") val imageUrls: List = arrayListOf(), + @SerialName("imageUrls") val imageUrls: List = listOf(), ) { @Serializable data class Menu( @@ -47,7 +47,7 @@ fun MenuReviewListResponse?.toDomain(): List { rating = data.rating ?: 0, writeDate = data.writtenAt ?: "", content = data.content ?: "", - imgUrl = data.imageUrls.firstOrNull(), + imgUrl = data.imageUrls.firstOrNull { it != null }, ) } ?: emptyList() } diff --git a/app/src/main/java/com/eatssu/android/data/remote/dto/response/MyReviewListResponse.kt b/app/src/main/java/com/eatssu/android/data/remote/dto/response/MyReviewListResponse.kt index bffd19db3..6ad9fb746 100644 --- a/app/src/main/java/com/eatssu/android/data/remote/dto/response/MyReviewListResponse.kt +++ b/app/src/main/java/com/eatssu/android/data/remote/dto/response/MyReviewListResponse.kt @@ -8,7 +8,7 @@ import kotlinx.serialization.Serializable data class MyReviewListResponse( @SerialName("numberOfElements") val numberOfElements: Int? = null, @SerialName("hasNext") val hasNext: Boolean? = null, - @SerialName("dataList") val dataList: ArrayList? = arrayListOf() + @SerialName("dataList") val dataList: List? = listOf() ) { @Serializable data class DataList( @@ -17,8 +17,8 @@ data class MyReviewListResponse( @SerialName("rating") val rating: Int? = null, @SerialName("writtenAt") val writtenAt: String? = null, @SerialName("content") val content: String? = null, - @SerialName("imageUrls") val imageUrls: ArrayList = arrayListOf(), - @SerialName("menuList") val menuList: ArrayList = arrayListOf() + @SerialName("imageUrls") val imageUrls: List = listOf(), + @SerialName("menuList") val menuList: List = listOf() ) { @Serializable data class MenuList( @@ -34,7 +34,7 @@ fun MyReviewListResponse?.toDomain(): List { Review( reviewId = data.reviewId ?: -1L, isWriter = true, - menuLikeInfoList = data.menuList.map { menu -> + menuLikeInfoList = data.menuList.filterNotNull().map { menu -> Review.MenuLikeInfo( menuId = menu.id ?: -1L, name = menu.name ?: "", @@ -45,7 +45,7 @@ fun MyReviewListResponse?.toDomain(): List { rating = data.rating ?: 0, writeDate = data.writtenAt ?: "", content = data.content ?: "", - imgUrl = data.imageUrls.firstOrNull(), + imgUrl = data.imageUrls.firstOrNull { it != null }, ) } ?: emptyList() } \ No newline at end of file