diff --git a/src/main/kotlin/com/routebox/routebox/application/inquiry/dto/GetInquiryResult.kt b/src/main/kotlin/com/routebox/routebox/application/inquiry/dto/GetInquiryResult.kt index 1b3413e..b1bb40f 100644 --- a/src/main/kotlin/com/routebox/routebox/application/inquiry/dto/GetInquiryResult.kt +++ b/src/main/kotlin/com/routebox/routebox/application/inquiry/dto/GetInquiryResult.kt @@ -1,26 +1,30 @@ package com.routebox.routebox.application.inquiry.dto +import InquiryType import com.routebox.routebox.domain.inquiry.Inquiry +import com.routebox.routebox.domain.inquiry.InquiryStatus data class GetInquiryResult( val inquiryId: Long, val userId: Long, - val type: String, + val type: InquiryType, val content: String, - val status: String, + val status: InquiryStatus, val reply: String?, val imageUrls: List, + val createdAt: String, ) { companion object { fun from(inquiry: Inquiry, imageUrls: List): GetInquiryResult { return GetInquiryResult( inquiryId = inquiry.inquiryId, userId = inquiry.userId, - type = inquiry.type.name, + type = inquiry.type, content = inquiry.content, - status = inquiry.status.name, + status = inquiry.status, reply = inquiry.reply, imageUrls = imageUrls, + createdAt = inquiry.createdAt.toString(), ) } } diff --git a/src/main/kotlin/com/routebox/routebox/controller/inquiry/dto/GetInquiryDetailResponse.kt b/src/main/kotlin/com/routebox/routebox/controller/inquiry/dto/GetInquiryDetailResponse.kt index 6a6a9ba..04aa7cb 100644 --- a/src/main/kotlin/com/routebox/routebox/controller/inquiry/dto/GetInquiryDetailResponse.kt +++ b/src/main/kotlin/com/routebox/routebox/controller/inquiry/dto/GetInquiryDetailResponse.kt @@ -1,13 +1,15 @@ package com.routebox.routebox.controller.inquiry.dto +import InquiryType import com.routebox.routebox.application.inquiry.dto.GetInquiryResult +import com.routebox.routebox.domain.inquiry.InquiryStatus data class GetInquiryDetailResponse( val inquiryId: Long, val userId: Long, - val type: String, + val type: InquiryType, val content: String, - val status: String, + val status: InquiryStatus, val reply: String?, val imageUrls: List?, ) { diff --git a/src/main/kotlin/com/routebox/routebox/controller/inquiry/dto/InquiryDto.kt b/src/main/kotlin/com/routebox/routebox/controller/inquiry/dto/InquiryDto.kt index 1bd0e9d..3cb71da 100644 --- a/src/main/kotlin/com/routebox/routebox/controller/inquiry/dto/InquiryDto.kt +++ b/src/main/kotlin/com/routebox/routebox/controller/inquiry/dto/InquiryDto.kt @@ -1,11 +1,13 @@ package com.routebox.routebox.controller.inquiry.dto import com.routebox.routebox.application.inquiry.dto.GetInquiryResult +import com.routebox.routebox.domain.inquiry.InquiryStatus data class InquiryDto( val inquiryId: Long, val content: String, - val status: String, + val status: InquiryStatus, + val createdAt: String, ) { companion object { fun from(inquiry: GetInquiryResult): InquiryDto { @@ -13,6 +15,7 @@ data class InquiryDto( inquiryId = inquiry.inquiryId, content = inquiry.content, status = inquiry.status, + createdAt = inquiry.createdAt, ) } }