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

core/navigation/src/main/java/co/kr/tnt/navigation/RouteModel.kt

@@ -13,10 +13,18 @@ sealed interface Route {
     data object Login : Route
 
     @Serializable
-    data object TrainerSignUp : Route
+    data class TrainerSignUp(
+        val authId: String,
+        val authType: String,
+        val email: String,
+    ) : Route
 
     @Serializable
-    data object TraineeSignUp : Route
+    data class TraineeSignUp(
+        val authId: String,
+        val authType: String,
+        val email: String,
+    ) : Route
 
     @Serializable
     data class TrainerConnect(val isFromMyPage: Boolean) : Route

core/ui/src/main/java/co/kr/tnt/ui/util/FileUtils.kt

@@ -0,0 +1,34 @@
+package co.kr.tnt.ui.util
+
+import android.content.Context
+import android.database.Cursor
+import android.net.Uri
+import android.provider.MediaStore
+import android.util.Log
+import okhttp3.MediaType.Companion.toMediaTypeOrNull
+import okhttp3.MultipartBody
+import okhttp3.RequestBody.Companion.asRequestBody
+import java.io.File
+
+fun Uri.toMultiPart(context: Context, keyName: String = "image"): MultipartBody.Part? {
+    return getRealPathFromUri(this, context)?.let { filePath ->
+        val file = File(filePath)
+        val requestFile = file.asRequestBody("image/*".toMediaTypeOrNull())
+        MultipartBody.Part.createFormData(keyName, file.name, requestFile)
+    } ?: run {
+        Log.e("toMultipartImagePart", "Error creating multipart image for URI: $this")
+        null
+    }
+}
+
+fun getRealPathFromUri(uri: Uri, context: Context): String? {
+    val projection = arrayOf(MediaStore.Images.Media.DATA)
+    val cursor: Cursor? = context.contentResolver.query(uri, projection, null, null, null)
+    cursor?.use {
+        if (it.moveToFirst()) {
+            val columnIndex = it.getColumnIndexOrThrow(MediaStore.Images.Media.DATA)
+            return it.getString(columnIndex)
+        }
+    }
+    return null
+}

core/ui/src/main/res/values/strings.xml

@@ -16,6 +16,8 @@
     <string name="close">닫기</string>
     <string name="ok">확인</string>
 
+    <string name="error_server_request_failed">서버 요청에 실패했어요</string>
+
     <string name="trainee">트레이니</string>
     <string name="trainer">트레이너</string>
 

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

@@ -0,0 +1,68 @@
+package co.kr.data.network.model
+
+import co.kr.tnt.domain.model.UserType
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class SignUpRequest(
+    val socialType: String,
+    val socialId: String,
+    val fcmToken: String,
+    val serviceAgreement: Boolean,
+    val collectionAgreement: Boolean,
+    val advertisementAgreement: Boolean,
+    val socialEmail: String,
+    val memberType: String,
+    val name: String,
+    val birthday: String? = null,
+    val height: Double? = null,
+    val weight: Double? = null,
+    val goalContents: List<String>? = null,
+    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,
+            )
+
+            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,
+            )
+        }
+    }
+}

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

@@ -0,0 +1,21 @@
+package co.kr.data.network.model
+
+import co.kr.tnt.domain.model.SignUpResult
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class SignUpResponse(
+    val memberType: String,
+    val sessionId: String,
+    val name: String,
+    val profileImageUrl: String,
+)
+
+fun SignUpResponse.toDomain(): SignUpResult {
+    return SignUpResult(
+        memberType = memberType,
+        sessionId = sessionId,
+        name = name,
+        profileImageUrl = profileImageUrl,
+    )
+}

data/network/src/main/java/co/kr/data/network/service/ApiService.kt

@@ -2,12 +2,24 @@ package co.kr.data.network.service
 
 import co.kr.data.network.model.LoginRequest
 import co.kr.data.network.model.LoginResponse
+import co.kr.data.network.model.SignUpResponse
+import okhttp3.MultipartBody
+import okhttp3.RequestBody
 import retrofit2.http.Body
+import retrofit2.http.Multipart
 import retrofit2.http.POST
+import retrofit2.http.Part
 
 interface ApiService {
     @POST("/login")
     suspend fun postLogin(
         @Body request: LoginRequest,
     ): LoginResponse
+
+    @Multipart
+    @POST("/members/sign-up")
+    suspend fun postSignUp(
+        @Part profileImage: MultipartBody.Part?,
+        @Part("request") request: RequestBody,
+    ): SignUpResponse
 }

data/network/src/main/java/co/kr/data/network/source/SignUpRemoteDataSource.kt

@@ -0,0 +1,21 @@
+package co.kr.data.network.source
+
+import co.kr.data.network.model.SignUpResponse
+import co.kr.data.network.service.ApiService
+import co.kr.data.network.util.networkHandler
+import okhttp3.MultipartBody
+import okhttp3.RequestBody
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class SignUpRemoteDataSource @Inject constructor(
+    private val apiService: ApiService,
+) {
+    suspend fun postSignUp(
+        profileImage: MultipartBody.Part?,
+        request: RequestBody,
+    ): SignUpResponse = networkHandler {
+        apiService.postSignUp(profileImage, request)
+    }
+}

data/repository/build.gradle.kts

@@ -13,4 +13,6 @@ dependencies {
     implementation(projects.domain)
     implementation(projects.data.network)
     implementation(projects.data.storage)
+    implementation(libs.okhttp.logging)
+    implementation(libs.kotlinx.serialization.json)
 }

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

@@ -0,0 +1,56 @@
+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.source.SignUpRemoteDataSource
+import co.kr.data.storage.source.SessionLocalDataSource
+import co.kr.tnt.domain.model.SignUpResult
+import co.kr.tnt.domain.model.UserType
+import co.kr.tnt.domain.repository.SignUpRepository
+import kotlinx.serialization.encodeToString
+import kotlinx.serialization.json.Json
+import okhttp3.MediaType.Companion.toMediaTypeOrNull
+import okhttp3.MultipartBody
+import okhttp3.RequestBody
+import okhttp3.RequestBody.Companion.toRequestBody
+import javax.inject.Inject
+
+class SignUpRepositoryImpl @Inject constructor(
+    private val signupRemoteDataSource: SignUpRemoteDataSource,
+    private val sessionLocalDataSource: SessionLocalDataSource,
+) : SignUpRepository {
+    override suspend fun signUp(
+        profileImage: MultipartBody.Part?,
+        userType: UserType,
+        socialId: String,
+        socialType: String,
+        email: String,
+    ): SignUpResult {
+        // TODO FCM token
+        val signUpRequest = SignUpRequestMapper.fromUserType(
+            userType = userType,
+            socialId = socialId,
+            socialType = socialType,
+            email = email,
+            fcmToken = "EMPTY",
+        )
+        val requestBody = prepareJsonRequestBody(signUpRequest)
+
+        val response = signupRemoteDataSource.postSignUp(
+            profileImage = profileImage,
+            request = requestBody,
+        )
+
+        response.sessionId.let { sessionId ->
+            sessionLocalDataSource.updateSessionId(sessionId)
+        }
+
+        return response.toDomain()
+    }
+
+    private fun prepareJsonRequestBody(signUpRequest: SignUpRequest): RequestBody {
+        val jsonString = Json.encodeToString(signUpRequest)
+        return jsonString.toRequestBody("application/json".toMediaTypeOrNull())
+    }
+}

data/repository/src/main/java/co/kr/data/repository/di/RepositoryModule.kt

@@ -1,7 +1,9 @@
 package co.kr.data.repository.di
 
 import co.kr.data.repository.LoginRepositoryImpl
+import co.kr.data.repository.SignUpRepositoryImpl
 import co.kr.tnt.domain.repository.LoginRepository
+import co.kr.tnt.domain.repository.SignUpRepository
 import dagger.Binds
 import dagger.Module
 import dagger.hilt.InstallIn
@@ -14,4 +16,9 @@ internal abstract class RepositoryModule {
     abstract fun bindsLoginRepository(
         repository: LoginRepositoryImpl,
     ): LoginRepository
+
+    @Binds
+    abstract fun bindsSignUpRepository(
+        repository: SignUpRepositoryImpl,
+    ): SignUpRepository
 }

domain/build.gradle.kts

@@ -5,5 +5,6 @@ plugins {
 
 dependencies {
     implementation(libs.inject)
+    implementation(libs.okhttp.logging)
     implementation(libs.coroutines.core)
 }

domain/src/main/java/co/kr/tnt/domain/model/SignUpResult.kt

@@ -0,0 +1,8 @@
+package co.kr.tnt.domain.model
+
+data class SignUpResult(
+    val memberType: String,
+    val sessionId: String,
+    val name: String,
+    val profileImageUrl: String,
+)

domain/src/main/java/co/kr/tnt/domain/model/UserType.kt

@@ -1,5 +1,7 @@
 package co.kr.tnt.domain.model
 
+import java.time.LocalDate
+
 sealed class UserType {
     abstract val id: String
     abstract val name: String
@@ -15,10 +17,11 @@ sealed class UserType {
         override val id: String = "",
         override val name: String = "",
         override val image: String? = null,
-        val age: Int = 0,
-        val weight: Float = 0f,
+        val birthday: LocalDate? = null,
+        val age: Int? = 0,
+        val weight: Double = 0.0,
         val height: Int = 0,
         val ptPurpose: List<String> = emptyList(),
-        val caution: String? = null,
+        val caution: String? = "",
     ) : UserType()
 }

domain/src/main/java/co/kr/tnt/domain/repository/SignUpRepository.kt

@@ -0,0 +1,15 @@
+package co.kr.tnt.domain.repository
+
+import co.kr.tnt.domain.model.SignUpResult
+import co.kr.tnt.domain.model.UserType
+import okhttp3.MultipartBody
+
+interface SignUpRepository {
+    suspend fun signUp(
+        profileImage: MultipartBody.Part?,
+        userType: UserType,
+        socialId: String,
+        socialType: String,
+        email: String,
+    ): SignUpResult
+}

feature/main/src/main/java/co/kr/tnt/main/ui/TnTNavHost.kt

@@ -13,9 +13,11 @@ import co.kr.tnt.roleselect.navigateToRoleSelection
 import co.kr.tnt.roleselect.roleSelectionScreen
 import co.kr.tnt.trainee.connect.navigation.navigateToTraineeConnect
 import co.kr.tnt.trainee.connect.navigation.traineeConnectScreen
+import co.kr.tnt.trainee.signup.navigation.navigateToTraineeSignUp
 import co.kr.tnt.trainee.signup.navigation.traineeSignUpScreen
 import co.kr.tnt.trainer.connect.navigation.navigateToTrainerConnect
 import co.kr.tnt.trainer.connect.navigation.trainerConnectScreen
+import co.kr.tnt.trainer.signup.navigation.navigateToTrainerSignUp
 import co.kr.tnt.trainer.signup.navigation.trainerSignUpScreen
 
 @Composable
@@ -50,6 +52,22 @@ fun TnTNavHost(
                     )
                 },
             )
+            roleSelectionScreen(
+                navigateToTraineeSignUp = { authId, authType, email ->
+                    navController.navigateToTraineeSignUp(
+                        authId = authId,
+                        authType = authType,
+                        email = email,
+                    )
+                },
+                navigateToTrainerSignUp = { authId, authType, email ->
+                    navController.navigateToTrainerSignUp(
+                        authId = authId,
+                        authType = authType,
+                        email = email,
+                    )
+                },
+            )
             trainerSignUpScreen(
                 navigateToPrevious = { navController.popBackStack() },
                 navigateToConnect = { navController.navigateToTrainerConnect(isFromMyPage = false) },
@@ -70,7 +88,6 @@ fun TnTNavHost(
                     navController.navigateToHome(isTrainer = false, clearBackStack = true)
                 },
             )
-            roleSelectionScreen()
             homeNavGraph()
         }
     }