From 2ff605118ddb2c4f02488e6317b730434afbaf9a Mon Sep 17 00:00:00 2001 From: uiel Date: Tue, 19 Nov 2024 12:26:51 +0900 Subject: [PATCH] =?UTF-8?q?refactor=20::=20attachments=20nullable=20?= =?UTF-8?q?=EC=B2=98=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../team/retum/usecase/entity/notice/NoticeDetailsEntity.kt | 4 ++-- .../model/response/notice/FetchNoticeDetailsResponse.kt | 2 +- .../java/team/retum/jobis/notice/ui/NoticeDetailsScreen.kt | 2 +- .../retum/jobis/notice/viewmodel/NoticeDetailsViewModel.kt | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/core/domain/src/main/java/team/retum/usecase/entity/notice/NoticeDetailsEntity.kt b/core/domain/src/main/java/team/retum/usecase/entity/notice/NoticeDetailsEntity.kt index 1d5a884d9..f21c6e3e2 100644 --- a/core/domain/src/main/java/team/retum/usecase/entity/notice/NoticeDetailsEntity.kt +++ b/core/domain/src/main/java/team/retum/usecase/entity/notice/NoticeDetailsEntity.kt @@ -11,7 +11,7 @@ data class NoticeDetailsEntity( val title: String, val content: String, val createdAt: String, - val attachments: List, + val attachments: List?, ) { data class AttachmentEntity( val url: String, @@ -29,7 +29,7 @@ internal fun FetchNoticeDetailsResponse.toEntity() = NoticeDetailsEntity( title = this.title, content = this.content, createdAt = outputFormat.format(inputFormat.parse(this.createdAt)!!), - attachments = this.attachments.map { it.toEntity() }, + attachments = this.attachments?.map { it.toEntity() }, ) private fun FetchNoticeDetailsResponse.AttachmentResponse.toEntity() = diff --git a/core/network/src/main/java/team/retum/network/model/response/notice/FetchNoticeDetailsResponse.kt b/core/network/src/main/java/team/retum/network/model/response/notice/FetchNoticeDetailsResponse.kt index 1c99e634d..ac0be71bc 100644 --- a/core/network/src/main/java/team/retum/network/model/response/notice/FetchNoticeDetailsResponse.kt +++ b/core/network/src/main/java/team/retum/network/model/response/notice/FetchNoticeDetailsResponse.kt @@ -9,7 +9,7 @@ data class FetchNoticeDetailsResponse( @Json(name = "title") val title: String, @Json(name = "content") val content: String, @Json(name = "created_at") val createdAt: String, - @Json(name = "attachments") val attachments: List, + @Json(name = "attachments") val attachments: List?, ) { @JsonClass(generateAdapter = true) data class AttachmentResponse( diff --git a/feature/notice/src/main/java/team/retum/jobis/notice/ui/NoticeDetailsScreen.kt b/feature/notice/src/main/java/team/retum/jobis/notice/ui/NoticeDetailsScreen.kt index fd2dfcc78..3a28e378d 100644 --- a/feature/notice/src/main/java/team/retum/jobis/notice/ui/NoticeDetailsScreen.kt +++ b/feature/notice/src/main/java/team/retum/jobis/notice/ui/NoticeDetailsScreen.kt @@ -119,7 +119,7 @@ private fun NoticeDetailsScreen( .verticalScroll(scrollState), ) { Notice(noticeDetailsEntity = state.noticeDetailsEntity) - state.noticeDetailsEntity.attachments.forEach { + state.noticeDetailsEntity.attachments?.forEach { AttachFile( fileName = it.url, saveFileData = saveFileData, diff --git a/feature/notice/src/main/java/team/retum/jobis/notice/viewmodel/NoticeDetailsViewModel.kt b/feature/notice/src/main/java/team/retum/jobis/notice/viewmodel/NoticeDetailsViewModel.kt index 134376713..fbbb33d02 100644 --- a/feature/notice/src/main/java/team/retum/jobis/notice/viewmodel/NoticeDetailsViewModel.kt +++ b/feature/notice/src/main/java/team/retum/jobis/notice/viewmodel/NoticeDetailsViewModel.kt @@ -98,7 +98,7 @@ internal data class NoticeDetailsState( title = "", content = "", createdAt = "", - attachments = emptyList(), + attachments = null, ), filePath = "", )