#172 feat : Signup 사진 있을때 없을때 분기처리 로직 수정

plashdof · Dec 6, 2023 · 022f341 · 022f341
1 parent e27403f
commit 022f341
Show file tree

Hide file tree

Showing 5 changed files with 48 additions and 18 deletions.
diff --git a/Aos/app/src/main/java/com/avengers/nibobnebob/data/remote/IntroApi.kt b/Aos/app/src/main/java/com/avengers/nibobnebob/data/remote/IntroApi.kt
@@ -27,6 +27,18 @@ interface IntroApi {
         @Part profileImage: MultipartBody.Part
     ): Response<Unit>
 
+    @Multipart
+    @POST("api/user")
+    suspend fun signupNoImage(
+        @Part("email") email: RequestBody,
+        @Part("password") password: RequestBody,
+        @Part("provider") provider: RequestBody,
+        @Part("nickName") nickName: RequestBody,
+        @Part("region") region: RequestBody,
+        @Part("birthdate") birthdate: RequestBody,
+        @Part("isMale") isMale: Boolean,
+    ): Response<Unit>
+
     @POST("api/auth/social-login")
     suspend fun loginNaver(
         @Header("Authorization") token: String

diff --git a/Aos/app/src/main/java/com/avengers/nibobnebob/data/repository/IntroRepositoryImpl.kt b/Aos/app/src/main/java/com/avengers/nibobnebob/data/repository/IntroRepositoryImpl.kt
@@ -27,21 +27,37 @@ class IntroRepositoryImpl @Inject constructor(
         region: RequestBody,
         birthdate: RequestBody,
         isMale: Boolean,
-        profileImage: MultipartBody.Part
+        profileImage: MultipartBody.Part?
     ): Flow<BaseState<Unit>> = flow {
-        val result = runRemote {
-            api.signup(
-                email,
-                password,
-                provider,
-                nickName,
-                region,
-                birthdate,
-                isMale,
-                profileImage
-            )
+        profileImage?.let { image ->
+            val result = runRemote {
+                api.signup(
+                    email,
+                    password,
+                    provider,
+                    nickName,
+                    region,
+                    birthdate,
+                    isMale,
+                    image
+                )
+            }
+            emit(result)
+        } ?: run {
+            val result = runRemote {
+                api.signupNoImage(
+                    email,
+                    password,
+                    provider,
+                    nickName,
+                    region,
+                    birthdate,
+                    isMale,
+                )
+            }
+            emit(result)
         }
-        emit(result)
+
     }
 
     override fun loginNaver(token: String): Flow<BaseState<LoginData>> = flow {

diff --git a/Aos/app/src/main/java/com/avengers/nibobnebob/domain/repository/IntroRepository.kt b/Aos/app/src/main/java/com/avengers/nibobnebob/domain/repository/IntroRepository.kt
@@ -16,7 +16,7 @@ interface IntroRepository {
         region: RequestBody,
         birthdate: RequestBody,
         isMale: Boolean,
-        profileImage: MultipartBody.Part
+        profileImage: MultipartBody.Part?
     ): Flow<BaseState<Unit>>
 
     fun loginNaver(

diff --git a/...rc/main/java/com/avengers/nibobnebob/presentation/ui/intro/signup/DetailSignupFragment.kt b/...rc/main/java/com/avengers/nibobnebob/presentation/ui/intro/signup/DetailSignupFragment.kt
@@ -54,10 +54,12 @@ class DetailSignupFragment :
         }
     }
 
-    private fun initImageObserver(){
+    private fun initImageObserver() {
         repeatOnStarted {
-            parentViewModel.image.collect{
-                viewModel.setImage(it, it.toMultiPart(requireContext()))
+            parentViewModel.image.collect {
+                if (it.isNotBlank()) {
+                    viewModel.setImage(it, it.toMultiPart(requireContext(), "profileImage"))
+                }
             }
         }
     }

diff --git a/...c/main/java/com/avengers/nibobnebob/presentation/ui/intro/signup/DetailSignupViewModel.kt b/...c/main/java/com/avengers/nibobnebob/presentation/ui/intro/signup/DetailSignupViewModel.kt
@@ -61,7 +61,7 @@ class DetailSignupViewModel @Inject constructor(
     val birth = MutableStateFlow("")
     val location = MutableStateFlow("")
     val profileImg = MutableStateFlow("")
-    private lateinit var profileFile: MultipartBody.Part
+    private var profileFile: MultipartBody.Part? = null
 
     val isDataReady =
         combine(