Merge pull request #172 from YAPP-Github/refactor/#171-enum-mapper

[Refactor/#171] 수동 Enum 매핑 로직을 제거하고 kotlinx.serialization에 위임합니다.

Author: wjdrjs00

data/src/main/java/com/threegap/bitnagil/data/auth/mapper/AuthMapper.kt

@@ -4,14 +4,13 @@ import com.threegap.bitnagil.data.auth.model.request.TermsAgreementRequestDto
 import com.threegap.bitnagil.data.auth.model.response.LoginResponseDto
 import com.threegap.bitnagil.domain.auth.model.AuthSession
 import com.threegap.bitnagil.domain.auth.model.TermsAgreement
-import com.threegap.bitnagil.domain.auth.model.UserRole
 
 // toDomain
 internal fun LoginResponseDto.toDomain() =
     AuthSession(
         accessToken = this.accessToken,
         refreshToken = this.refreshToken,
-        role = UserRole.fromString(this.role),
+        role = this.role,
     )
 
 // toDto

data/src/main/java/com/threegap/bitnagil/data/auth/model/response/LoginResponseDto.kt

@@ -1,5 +1,6 @@
 package com.threegap.bitnagil.data.auth.model.response
 
+import com.threegap.bitnagil.domain.auth.model.UserRole
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 
@@ -10,5 +11,5 @@ data class LoginResponseDto(
     @SerialName("refreshToken")
     val refreshToken: String,
     @SerialName("role")
-    val role: String,
+    val role: UserRole,
 )

data/src/main/java/com/threegap/bitnagil/data/recommendroutine/model/response/RecommendRoutinesDto.kt

@@ -9,15 +9,15 @@ import kotlinx.serialization.Serializable
 @Serializable
 data class RecommendRoutinesDto(
     @SerialName("recommendedRoutines")
-    val recommendedRoutinesByCategory: Map<String, List<RecommendedRoutineDto>>,
+    val recommendedRoutinesByCategory: Map<RecommendCategory, List<RecommendedRoutineDto>>,
     @SerialName("emotionMarbleType")
-    val emotionMarbleType: String?,
+    val emotionMarbleType: EmotionMarbleType?,
 )
 
 fun RecommendRoutinesDto.toDomain(): RecommendRoutines =
     RecommendRoutines(
-        recommendRoutinesByCategory = this.recommendedRoutinesByCategory.map { (categoryString, routines) ->
-            RecommendCategory.fromString(categoryString) to routines.map { it.toDomain() }
+        recommendRoutinesByCategory = this.recommendedRoutinesByCategory.map { (category, routines) ->
+            category to routines.map { it.toDomain() }
         }.toMap(),
-        emotionMarbleType = this.emotionMarbleType?.let { EmotionMarbleType.valueOf(it) },
+        emotionMarbleType = this.emotionMarbleType,
     )

data/src/main/java/com/threegap/bitnagil/data/recommendroutine/model/response/RecommendedRoutineDto.kt

@@ -15,22 +15,22 @@ data class RecommendedRoutineDto(
     @SerialName("recommendedRoutineDescription")
     val recommendedRoutineDescription: String,
     @SerialName("recommendedRoutineLevel")
-    val recommendedRoutineLevel: String,
+    val recommendedRoutineLevel: RecommendLevel,
     @SerialName("executionTime")
     val executionTime: String,
     @SerialName("recommendedRoutineType")
-    val recommendedRoutineType: String,
+    val recommendedRoutineType: RecommendCategory,
     @SerialName("recommendedSubRoutineSearchResult")
     val recommendedSubRoutineSearchResult: List<RecommendedSubRoutineDto>,
 )
 
 fun RecommendedRoutineDto.toDomain(): RecommendRoutine =
     RecommendRoutine(
-        id = recommendedRoutineId,
-        name = recommendedRoutineName,
-        description = recommendedRoutineDescription,
-        level = RecommendLevel.fromString(recommendedRoutineLevel),
-        executionTime = executionTime,
-        recommendedRoutineType = RecommendCategory.fromString(recommendedRoutineType),
-        recommendSubRoutines = recommendedSubRoutineSearchResult.map { it.toDomain() },
+        id = this.recommendedRoutineId,
+        name = this.recommendedRoutineName,
+        description = this.recommendedRoutineDescription,
+        level = this.recommendedRoutineLevel,
+        executionTime = this.executionTime,
+        recommendedRoutineType = this.recommendedRoutineType,
+        recommendSubRoutines = this.recommendedSubRoutineSearchResult.map { it.toDomain() },
     )

data/src/main/java/com/threegap/bitnagil/data/routine/model/request/RoutineByDayDeletionRequestDto.kt

@@ -13,7 +13,7 @@ data class RoutineDto(
     @SerialName("routineName")
     val routineName: String,
     @SerialName("repeatDay")
-    val repeatDay: List<String>,
+    val repeatDay: List<DayOfWeek>,
     @SerialName("executionTime")
     val executionTime: String,
     @SerialName("routineDate")
@@ -25,7 +25,7 @@ data class RoutineDto(
     @SerialName("subRoutineCompleteYn")
     val subRoutineCompleteYn: List<Boolean>,
     @SerialName("recommendedRoutineType")
-    val recommendedRoutineType: String?,
+    val recommendedRoutineType: RecommendedRoutineType?,
     @SerialName("routineDeletedYn")
     val routineDeletedYn: Boolean,
     @SerialName("routineStartDate")
@@ -38,13 +38,13 @@ fun RoutineDto.toDomain(): Routine =
     Routine(
         id = this.routineId,
         name = this.routineName,
-        repeatDays = this.repeatDay.map { DayOfWeek.fromString(it) },
+        repeatDays = this.repeatDay,
         executionTime = this.executionTime,
         routineDate = this.routineDate,
         isCompleted = this.routineCompleteYn,
         subRoutineNames = this.subRoutineNames,
         subRoutineCompletionStates = this.subRoutineCompleteYn,
-        recommendedRoutineType = RecommendedRoutineType.fromString(this.recommendedRoutineType),
+        recommendedRoutineType = this.recommendedRoutineType,
         isDeleted = routineDeletedYn,
         startDate = this.routineStartDate,
         endDate = this.routineEndDate,

data/src/main/java/com/threegap/bitnagil/data/routine/model/response/RoutineDto.kt

@@ -1,5 +1,7 @@
 package com.threegap.bitnagil.data.writeroutine.model.request
 
+import com.threegap.bitnagil.domain.writeroutine.model.RepeatDay
+import com.threegap.bitnagil.domain.writeroutine.model.RoutineUpdateType
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 
@@ -8,11 +10,11 @@ data class EditRoutineRequest(
     @SerialName("routineId")
     val routineId: String,
     @SerialName("updateApplyDate")
-    val updateApplyDate: String,
+    val updateApplyDate: RoutineUpdateType,
     @SerialName("routineName")
     val routineName: String,
     @SerialName("repeatDay")
-    val repeatDay: List<String>,
+    val repeatDay: List<RepeatDay>,
     @SerialName("routineStartDate")
     val routineStartDate: String,
     @SerialName("routineEndDate")

data/src/main/java/com/threegap/bitnagil/data/writeroutine/model/request/EditRoutineRequest.kt

@@ -1,5 +1,6 @@
 package com.threegap.bitnagil.data.writeroutine.model.request
 
+import com.threegap.bitnagil.domain.writeroutine.model.RepeatDay
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 
@@ -8,7 +9,7 @@ data class RegisterRoutineRequest(
     @SerialName("routineName")
     val routineName: String,
     @SerialName("repeatDay")
-    val repeatDay: List<String>,
+    val repeatDay: List<RepeatDay>,
     @SerialName("routineStartDate")
     val routineStartDate: String,
     @SerialName("routineEndDate")

data/src/main/java/com/threegap/bitnagil/data/writeroutine/model/request/RegisterRoutineRequest.kt

@@ -28,7 +28,7 @@ class WriteRoutineRepositoryImpl @Inject constructor(
     ): Result<Unit> {
         val request = RegisterRoutineRequest(
             routineName = name,
-            repeatDay = repeatDay.map { it.fullName },
+            repeatDay = repeatDay,
             executionTime = startTime.toString(),
             routineStartDate = startDate.toString(),
             routineEndDate = endDate.toString(),
@@ -54,9 +54,9 @@ class WriteRoutineRepositoryImpl @Inject constructor(
     ): Result<Unit> {
         val request = EditRoutineRequest(
             routineId = routineId,
-            updateApplyDate = routineUpdateType.value,
+            updateApplyDate = routineUpdateType,
             routineName = name,
-            repeatDay = repeatDay.map { it.fullName },
+            repeatDay = repeatDay,
             executionTime = startTime.toString(),
             routineStartDate = startDate.toString(),
             routineEndDate = endDate.toString(),

data/src/main/java/com/threegap/bitnagil/data/writeroutine/repositoryImpl/WriteRoutineRepositoryImpl.kt

@@ -1,23 +1,13 @@
 package com.threegap.bitnagil.domain.auth.model
 
+import kotlinx.serialization.Serializable
+
+@Serializable
 enum class UserRole {
     USER,
     GUEST,
     ONBOARDING,
     WITHDRAWN,
     UNKNOWN,
     ;
-
-    fun isGuest() = this == GUEST
-
-    companion object {
-        fun fromString(value: String): UserRole =
-            when (value) {
-                "USER" -> USER
-                "GUEST" -> GUEST
-                "ONBOARDING" -> ONBOARDING
-                "WITHDRAWN" -> WITHDRAWN
-                else -> UNKNOWN
-            }
-    }
 }