refactor: 분기가 3개이상일시에 if-> when을 사용

WithPeace · Mar 31, 2024 · e1afaa9 · e1afaa9
1 parent ef5c4c1
commit e1afaa9
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 12 deletions.
diff --git a/core/data/src/main/kotlin/com/withpeace/withpeace/core/data/mapper/ChangedProfileMapper.kt b/core/data/src/main/kotlin/com/withpeace/withpeace/core/data/mapper/ChangedProfileMapper.kt
@@ -1,11 +1,12 @@
 package com.withpeace.withpeace.core.data.mapper
 
 import com.withpeace.withpeace.core.domain.model.profile.ChangedProfile
+import com.withpeace.withpeace.core.domain.model.profile.Nickname
 import com.withpeace.withpeace.core.network.di.response.ChangedProfileResponse
 
 fun ChangedProfileResponse.toDomain(): ChangedProfile {
     return ChangedProfile(
-        nickname = this.nickname,
+        nickname = Nickname.create(this.nickname),
         profileImageUrl = profileImageUrl,
     )
 }
diff --git a/.../domain/src/main/java/com/withpeace/withpeace/core/domain/model/profile/ChangedProfile.kt b/.../domain/src/main/java/com/withpeace/withpeace/core/domain/model/profile/ChangedProfile.kt
@@ -1,6 +1,6 @@
 package com.withpeace.withpeace.core.domain.model.profile
 
 data class ChangedProfile(
-    val nickname: String,
-    val profileImageUrl: String,
+    val nickname: Nickname?,
+    val profileImageUrl: String?,
 )
diff --git a/.../src/main/java/com/withpeace/withpeace/core/domain/model/profile/ProfileChangingStatus.kt b/.../src/main/java/com/withpeace/withpeace/core/domain/model/profile/ProfileChangingStatus.kt
@@ -10,15 +10,15 @@ sealed interface ProfileChangingStatus {
             beforeProfile: ChangingProfileInfo,
             afterProfile: ChangingProfileInfo,
         ): ProfileChangingStatus {
-            return if (beforeProfile.profileImage != afterProfile.profileImage
-                && afterProfile.nickname != beforeProfile.nickname && afterProfile.profileImage != null
-            ) {
-                AllChanging
-            } else if (afterProfile.profileImage != null && beforeProfile.profileImage != afterProfile.profileImage
-            ) {
-                OnlyImageChanging
-            } else {
-                OnlyNicknameChanging
+            return when {
+                beforeProfile.profileImage != afterProfile.profileImage &&
+                    afterProfile.nickname != beforeProfile.nickname &&
+                    afterProfile.profileImage != null -> AllChanging
+
+                afterProfile.profileImage != null &&
+                    beforeProfile.profileImage != afterProfile.profileImage -> OnlyImageChanging
+
+                else -> OnlyNicknameChanging
             }
         }
     }