diff --git a/remote/src/main/java/kr/hs/dgsw/smartschool/remote/mapper/OutResponseMapper.kt b/remote/src/main/java/kr/hs/dgsw/smartschool/remote/mapper/OutResponseMapper.kt index 795a877f..e932cb4d 100644 --- a/remote/src/main/java/kr/hs/dgsw/smartschool/remote/mapper/OutResponseMapper.kt +++ b/remote/src/main/java/kr/hs/dgsw/smartschool/remote/mapper/OutResponseMapper.kt @@ -1,5 +1,6 @@ package kr.hs.dgsw.smartschool.remote.mapper +import android.util.Log import kr.hs.dgsw.smartschool.data.utils.yearDateTimeToLocalDate import kr.hs.dgsw.smartschool.domain.model.out.Out import kr.hs.dgsw.smartschool.domain.model.out.OutItem @@ -13,18 +14,20 @@ internal fun List.toModel(): List = this.map { it.toOut() } -internal fun OutResponse.toOut(): Out = - Out( +internal fun OutResponse.toOut(): Out { + return Out( id = id, reason = reason, status = status.toOutStatus(), student = student.toModel(), rejectReason = rejectReason ?: "", - startOutDate = startOutDate.yearDateTimeToLocalDate().toString(), - endOutDate = endOutDate.yearDateTimeToLocalDate().toString(), + startOutDate = startOutDate, + endOutDate = endOutDate, createdAt = createdAt.yearDateTimeToLocalDate().toString(), + modifiedAt = modifiedAt.yearDateTimeToLocalDate().toString() ) +} internal fun OutDetailResponse.toOutItem(type: OutType): OutItem = OutItem( diff --git a/remote/src/main/java/kr/hs/dgsw/smartschool/remote/response/out/OutResponse.kt b/remote/src/main/java/kr/hs/dgsw/smartschool/remote/response/out/OutResponse.kt index b0326b3c..1edb1325 100644 --- a/remote/src/main/java/kr/hs/dgsw/smartschool/remote/response/out/OutResponse.kt +++ b/remote/src/main/java/kr/hs/dgsw/smartschool/remote/response/out/OutResponse.kt @@ -9,8 +9,8 @@ data class OutResponse( @field:SerializedName("status") val status: OutResponseStatus, @field:SerializedName("student") val student: StudentResponse, @field:SerializedName("rejectReason")val rejectReason: String?, - @field:SerializedName("startOutDate") val startOutDate: String, - @field:SerializedName("endOutDate") val endOutDate: String, + @field:SerializedName("startAt") val startOutDate: String, + @field:SerializedName("endAt") val endOutDate: String, @field:SerializedName("createdAt") val createdAt: String, @field:SerializedName("modifiedAt") val modifiedAt: String, )