Merge pull request #167 from YAPP-Github/refactor/#166-report-dto-serialization

[Refactor/#166] Report 관련 Dto의 Enum class 직렬화 전략을 변경합니다.

Author: wjdrjs00

data/src/main/java/com/threegap/bitnagil/data/report/model/request/ReportRequestDto.kt

@@ -12,7 +12,7 @@ data class ReportRequestDto(
     @SerialName("reportContent")
     val reportContent: String,
     @SerialName("reportCategory")
-    val reportCategory: String,
+    val reportCategory: ReportCategory,
     @SerialName("reportImageUrls")
     val reportImageUrls: List<String>,
     @SerialName("reportLocation")
@@ -27,7 +27,7 @@ fun Report.toDto(): ReportRequestDto {
     return ReportRequestDto(
         reportTitle = this.title,
         reportContent = this.content,
-        reportCategory = ReportCategory.toString(this.category),
+        reportCategory = this.category,
         reportImageUrls = this.imageUrls,
         reportLocation = this.address,
         latitude = this.latitude,

data/src/main/java/com/threegap/bitnagil/data/report/model/response/ReportDetailDto.kt

@@ -12,13 +12,13 @@ class ReportDetailDto(
     @SerialName("reportDate")
     val reportDate: String,
     @SerialName("reportStatus")
-    val reportStatus: String,
+    val reportStatus: ReportStatus,
     @SerialName("reportTitle")
     val reportTitle: String,
     @SerialName("reportContent")
     val reportContent: String,
     @SerialName("reportCategory")
-    val reportCategory: String,
+    val reportCategory: ReportCategory,
     @SerialName("reportLocation")
     val reportLocation: String,
     @SerialName("reportImageUrls")
@@ -29,10 +29,10 @@ fun ReportDetailDto.toDomain(id: String?): ReportDetail =
     ReportDetail(
         id = id ?: "",
         date = LocalDate.parse(this.reportDate),
-        status = ReportStatus.fromString(this.reportStatus),
+        status = this.reportStatus,
         title = this.reportTitle,
         content = this.reportContent,
-        category = ReportCategory.fromString(this.reportCategory),
+        category = this.reportCategory,
         address = this.reportLocation,
         imageUrls = this.reportImageUrls,
     )

data/src/main/java/com/threegap/bitnagil/data/report/model/response/ReportItemDto.kt

@@ -11,11 +11,11 @@ data class ReportItemDto(
     @SerialName("reportId")
     val reportId: Int,
     @SerialName("reportStatus")
-    val reportStatus: String,
+    val reportStatus: ReportStatus,
     @SerialName("reportTitle")
     val reportTitle: String,
     @SerialName("reportCategory")
-    val reportCategory: String,
+    val reportCategory: ReportCategory,
     @SerialName("reportLocation")
     val reportLocation: String,
     @SerialName("reportImageUrl")
@@ -25,9 +25,9 @@ data class ReportItemDto(
 fun ReportItemDto.toDomain(): ReportItem =
     ReportItem(
         id = this.reportId,
-        status = ReportStatus.fromString(this.reportStatus),
+        status = this.reportStatus,
         title = this.reportTitle,
-        category = ReportCategory.fromString(this.reportCategory),
+        category = this.reportCategory,
         address = this.reportLocation,
         imageUrl = this.reportImageUrl,
     )

domain/build.gradle.kts

@@ -1,8 +1,10 @@
 plugins {
     alias(libs.plugins.bitnagil.kotlin)
+    alias(libs.plugins.kotlin.serialization)
 }
 
 dependencies {
+    implementation(libs.kotlinx.serialization.json)
     implementation(libs.kotlinx.coroutines.core)
     implementation(libs.javax.inject)
     testImplementation(libs.junit)

domain/src/main/java/com/threegap/bitnagil/domain/report/model/ReportCategory.kt

@@ -1,30 +1,12 @@
 package com.threegap.bitnagil.domain.report.model
 
+import kotlinx.serialization.Serializable
+
+@Serializable
 enum class ReportCategory {
     TRANSPORTATION,
     LIGHTING,
     WATERFACILITY,
     AMENITY,
     ;
-
-    companion object {
-        fun fromString(value: String): ReportCategory {
-            return when (value) {
-                "TRANSPORTATION" -> TRANSPORTATION
-                "LIGHTING" -> LIGHTING
-                "WATERFACILITY" -> WATERFACILITY
-                "AMENITY" -> AMENITY
-                else -> throw IllegalArgumentException("Invalid ReportCategory value: $value")
-            }
-        }
-
-        fun toString(value: ReportCategory): String {
-            return when (value) {
-                TRANSPORTATION -> "TRANSPORTATION"
-                LIGHTING -> "LIGHTING"
-                WATERFACILITY -> "WATERFACILITY"
-                AMENITY -> "AMENITY"
-            }
-        }
-    }
 }

domain/src/main/java/com/threegap/bitnagil/domain/report/model/ReportStatus.kt

@@ -1,27 +1,11 @@
 package com.threegap.bitnagil.domain.report.model
 
+import kotlinx.serialization.Serializable
+
+@Serializable
 enum class ReportStatus {
-    Pending,
-    InProgress,
-    Completed,
+    PENDING,
+    IN_PROGRESS,
+    COMPLETED,
     ;
-
-    companion object {
-        fun fromString(value: String): ReportStatus {
-            return when (value) {
-                "PENDING" -> Pending
-                "IN_PROGRESS" -> InProgress
-                "COMPLETED" -> Completed
-                else -> throw IllegalArgumentException("Invalid ReportStatus value: $value")
-            }
-        }
-
-        fun toString(value: ReportStatus): String {
-            return when (value) {
-                Pending -> "PENDING"
-                InProgress -> "IN_PROGRESS"
-                Completed -> "COMPLETED"
-            }
-        }
-    }
 }

presentation/src/main/java/com/threegap/bitnagil/presentation/reportdetail/model/ReportProcess.kt

@@ -13,9 +13,9 @@ enum class ReportProcess(
     companion object {
         fun fromDomain(status: ReportStatus): ReportProcess {
             return when (status) {
-                ReportStatus.Pending -> Reported
-                ReportStatus.InProgress -> Progress
-                ReportStatus.Completed -> Complete
+                ReportStatus.PENDING -> Reported
+                ReportStatus.IN_PROGRESS -> Progress
+                ReportStatus.COMPLETED -> Complete
             }
         }
     }

presentation/src/main/java/com/threegap/bitnagil/presentation/reporthistory/model/ReportProcess.kt

@@ -14,9 +14,9 @@ enum class ReportProcess(
     companion object {
         fun fromDomain(status: ReportStatus): ReportProcess {
             return when (status) {
-                ReportStatus.Pending -> Reported
-                ReportStatus.InProgress -> Progress
-                ReportStatus.Completed -> Complete
+                ReportStatus.PENDING -> Reported
+                ReportStatus.IN_PROGRESS -> Progress
+                ReportStatus.COMPLETED -> Complete
             }
         }
     }