From 8aec746335225a35d1a3207111797ff462afae66 Mon Sep 17 00:00:00 2001 From: wateralsie Date: Thu, 4 Apr 2024 11:48:11 +0900 Subject: [PATCH] #200 Update dining response --- .../main/java/in/koreatech/koin/data/mapper/DiningMapper.kt | 6 +++++- .../java/in/koreatech/koin/data/response/DiningResponse.kt | 5 +++++ .../java/in/koreatech/koin/domain/model/dining/Dining.kt | 5 +++++ 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/data/src/main/java/in/koreatech/koin/data/mapper/DiningMapper.kt b/data/src/main/java/in/koreatech/koin/data/mapper/DiningMapper.kt index 4486d3b81..2664493e6 100644 --- a/data/src/main/java/in/koreatech/koin/data/mapper/DiningMapper.kt +++ b/data/src/main/java/in/koreatech/koin/data/mapper/DiningMapper.kt @@ -2,7 +2,6 @@ package `in`.koreatech.koin.data.mapper import `in`.koreatech.koin.data.response.DiningResponse import `in`.koreatech.koin.domain.model.dining.Dining -import `in`.koreatech.koin.domain.model.dining.DiningType fun DiningResponse.toDining() = Dining( this.id, @@ -13,8 +12,13 @@ fun DiningResponse.toDining() = Dining( (this.priceCash ?: 0).toString(), (this.kcal ?: 0).toString(), this.menu, + this.imageUrl ?: "", this.createdAt, this.updatedAt, + this.isSoldOut, + // TODO: sold_out 품절 시각으로 변경시 대응 +// this.soldOutAt ?: "" + this.isChanged, this.error ?: "" ) diff --git a/data/src/main/java/in/koreatech/koin/data/response/DiningResponse.kt b/data/src/main/java/in/koreatech/koin/data/response/DiningResponse.kt index f873dbd40..7e674b97c 100644 --- a/data/src/main/java/in/koreatech/koin/data/response/DiningResponse.kt +++ b/data/src/main/java/in/koreatech/koin/data/response/DiningResponse.kt @@ -11,7 +11,12 @@ data class DiningResponse( @SerializedName("price_cash") val priceCash: Int?, @SerializedName("kcal") val kcal: Int?, @SerializedName("menu") val menu: List, + @SerializedName("image_url") val imageUrl: String?, @SerializedName("created_at") val createdAt: String, @SerializedName("updated_at") val updatedAt: String, + @SerializedName("sold_out") val isSoldOut: Boolean, + // TODO: sold_out 품절 시각으로 변경시 대응 +// @SerializedName("sold_out") val soldOutAt: String?, + @SerializedName("is_changed") val isChanged: Boolean, @SerializedName("error") val error: String? ) \ No newline at end of file diff --git a/domain/src/main/java/in/koreatech/koin/domain/model/dining/Dining.kt b/domain/src/main/java/in/koreatech/koin/domain/model/dining/Dining.kt index 98d3de064..da0fbcea2 100644 --- a/domain/src/main/java/in/koreatech/koin/domain/model/dining/Dining.kt +++ b/domain/src/main/java/in/koreatech/koin/domain/model/dining/Dining.kt @@ -9,7 +9,12 @@ data class Dining( val priceCash: String, val kcal: String, val menu: List, + val imageUrl: String, val createdAt: String, val updatedAt: String, + val isSoldOut: Boolean, + // TODO: sold_out 품절 시각으로 변경시 대응 +// val soldOutAt: String, + val isChanged: Boolean, val error: String )