[TNT-114] 회원가입 데이터 취합 및 API 연동

data/network/src/main/java/co/kr/data/network/model/SignUpRequest.kt

@@ -21,48 +21,45 @@ data class SignUpRequest(
     val cautionNote: String? = "",
 )
 
-object SignUpRequestMapper {
-    fun fromUserType(
-        userType: UserType,
-        socialId: String,
-        socialType: String,
-        email: String,
-        fcmToken: String,
-    ): SignUpRequest {
-        return when (userType) {
-            is UserType.Trainer -> SignUpRequest(
-                memberType = "trainer",
-                name = userType.name,
-                birthday = null,
-                height = null,
-                weight = null,
-                goalContents = null,
-                cautionNote = null,
-                socialType = socialType,
-                socialId = socialId,
-                socialEmail = email,
-                fcmToken = fcmToken,
-                serviceAgreement = true,
-                collectionAgreement = true,
-                advertisementAgreement = true,
-            )
+fun UserType.toSignUpRequest(
+    socialId: String,
+    socialType: String,
+    email: String,
+    fcmToken: String,
+): SignUpRequest {
+    return when (this) {
+        is UserType.Trainer -> SignUpRequest(
+            memberType = "trainer",
+            name = name,
+            birthday = null,
+            height = null,
+            weight = null,
+            goalContents = null,
+            cautionNote = null,
+            socialType = socialType,
+            socialId = socialId,
+            socialEmail = email,
+            fcmToken = fcmToken,
+            serviceAgreement = true,
+            collectionAgreement = true,
+            advertisementAgreement = true,
+        )
 
-            is UserType.Trainee -> SignUpRequest(
-                memberType = "trainee",
-                name = userType.name,
-                birthday = userType.birthday?.toString(),
-                height = userType.height.toDouble(),
-                weight = userType.weight,
-                goalContents = userType.ptPurpose,
-                cautionNote = userType.caution?.ifBlank { null },
-                socialType = socialType,
-                socialId = socialId,
-                socialEmail = email,
-                fcmToken = fcmToken,
-                serviceAgreement = true,
-                collectionAgreement = true,
-                advertisementAgreement = true,
-            )
-        }
+        is UserType.Trainee -> SignUpRequest(
+            memberType = "trainee",
+            name = name,
+            birthday = birthday?.toString(),
+            height = height.toDouble(),
+            weight = weight,
+            goalContents = ptPurpose,
+            cautionNote = caution?.ifBlank { null },
+            socialType = socialType,
+            socialId = socialId,
+            socialEmail = email,
+            fcmToken = fcmToken,
+            serviceAgreement = true,
+            collectionAgreement = true,
+            advertisementAgreement = true,
+        )
     }
 }

data/repository/src/main/java/co/kr/data/repository/SignUpRepositoryImpl.kt

@@ -1,8 +1,8 @@
 package co.kr.data.repository
 
 import co.kr.data.network.model.SignUpRequest
-import co.kr.data.network.model.SignUpRequestMapper
 import co.kr.data.network.model.toDomain
+import co.kr.data.network.model.toSignUpRequest
 import co.kr.data.network.source.SignUpRemoteDataSource
 import co.kr.data.storage.source.SessionLocalDataSource
 import co.kr.tnt.domain.model.SignUpResult
@@ -21,6 +21,7 @@ import javax.inject.Inject
 class SignUpRepositoryImpl @Inject constructor(
     private val signupRemoteDataSource: SignUpRemoteDataSource,
     private val sessionLocalDataSource: SessionLocalDataSource,
+    private val json: Json,
 ) : SignUpRepository {
     override suspend fun signUp(
         profileImage: File?,
@@ -35,29 +36,26 @@ class SignUpRepositoryImpl @Inject constructor(
         }
 
         // TODO FCM token
-        val signUpRequest = SignUpRequestMapper.fromUserType(
-            userType = userType,
+        val signUpRequest = userType.toSignUpRequest(
             socialId = socialId,
             socialType = socialType,
             email = email,
             fcmToken = "EMPTY",
         )
-        val requestBody = prepareJsonRequestBody(signUpRequest)
+        val requestBody = signUpRequest.toRequestBody(Json)
 
         val response = signupRemoteDataSource.postSignUp(
             profileImage = profileImagePart,
             request = requestBody,
         )
 
-        response.sessionId.let { sessionId ->
-            sessionLocalDataSource.updateSessionId(sessionId)
-        }
+        sessionLocalDataSource.updateSessionId(response.sessionId)
 
         return response.toDomain()
     }
 
-    private fun prepareJsonRequestBody(signUpRequest: SignUpRequest): RequestBody {
-        val jsonString = Json.encodeToString(signUpRequest)
+    private fun SignUpRequest.toRequestBody(json: Json): RequestBody {
+        val jsonString = json.encodeToString(this)
         return jsonString.toRequestBody("application/json".toMediaTypeOrNull())
     }
 }