🔀 :: (#291) 프로필 기본 이미지 변경 작업

core/network/src/main/java/com/idiotfrogs/network/service/UserService.kt

@@ -2,15 +2,13 @@ package com.idiotfrogs.network.service
 
 import com.idiotfrogs.model.user.ProfileResponse
 import com.idiotfrogs.model.user.UserResponse
-import com.idiotfrogs.model.user.UserUpdateRequest
 import okhttp3.MultipartBody
 import retrofit2.http.DELETE
 import retrofit2.http.GET
 import retrofit2.http.Multipart
 import retrofit2.http.PATCH
 import retrofit2.http.PUT
 import retrofit2.http.Part
-import retrofit2.http.Path
 import retrofit2.http.Query
 
 interface UserService {
@@ -20,12 +18,12 @@ interface UserService {
     @DELETE("users/me")
     suspend fun withdraw()
 
-    @PUT("users/{userId}")
+    @PUT("users/me")
     @Multipart
     suspend fun updateMyProfile(
-        @Path("userId") userId: Long,
         @Part profileImage: MultipartBody.Part,
-        @Query("nickname") nickname: String
+        @Query("nickname") nickname: String,
+        @Query("resetProfileImage") useDefaultImage: Boolean,
     ): UserResponse
 
     @PATCH("users/sign-up")

data/src/main/java/com/idiotfrogs/data/datasource/user/UserDataSource.kt

@@ -2,7 +2,6 @@ package com.idiotfrogs.data.datasource.user
 
 import com.idiotfrogs.model.user.ProfileResponse
 import com.idiotfrogs.model.user.UserResponse
-import com.idiotfrogs.model.user.UserUpdateRequest
 import okhttp3.MultipartBody
 
 interface UserDataSource {
@@ -11,9 +10,9 @@ interface UserDataSource {
     suspend fun withdraw()
 
     suspend fun updateMyProfile(
-        userId: Long,
         profileImage: MultipartBody.Part,
         nickname: String,
+        useDefaultImage: Boolean
     ): UserResponse
 
     suspend fun signUp(

data/src/main/java/com/idiotfrogs/data/datasource/user/UserDataSourceImpl.kt

@@ -2,7 +2,6 @@ package com.idiotfrogs.data.datasource.user
 
 import com.idiotfrogs.model.user.ProfileResponse
 import com.idiotfrogs.model.user.UserResponse
-import com.idiotfrogs.model.user.UserUpdateRequest
 import com.idiotfrogs.network.service.UserService
 import okhttp3.MultipartBody
 import javax.inject.Inject
@@ -19,14 +18,14 @@ class UserDataSourceImpl @Inject constructor(
     }
 
     override suspend fun updateMyProfile(
-        userId: Long,
         profileImage: MultipartBody.Part,
         nickname: String,
+        useDefaultImage: Boolean,
     ): UserResponse {
         return userService.updateMyProfile(
-            userId = userId,
             profileImage = profileImage,
-            nickname = nickname
+            nickname = nickname,
+            useDefaultImage = useDefaultImage
         )
     }
 

data/src/main/java/com/idiotfrogs/data/repository/user/UserRepository.kt

@@ -11,9 +11,9 @@ interface UserRepository {
     suspend fun withdraw()
 
     suspend fun updateMyProfile(
-        userId: Long,
         profileImage: File?,
-        nickname: String
+        nickname: String,
+        useDefaultImage: Boolean
     ): UserResponse
 
     suspend fun signUp(

data/src/main/java/com/idiotfrogs/data/repository/user/UserRepositoryImpl.kt

@@ -22,9 +22,9 @@ class UserRepositoryImpl @Inject constructor(
     }
 
     override suspend fun updateMyProfile(
-        userId: Long,
         profileImage: File?,
         nickname: String,
+        useDefaultImage: Boolean,
     ): UserResponse {
         val imageRequestBody = profileImage?.asRequestBody("image/jpeg".toMediaType())
             ?: "".toRequestBody("image/*".toMediaType())
@@ -35,9 +35,9 @@ class UserRepositoryImpl @Inject constructor(
         )
 
         return userDataSource.updateMyProfile(
-            userId = userId,
             profileImage = imagePart,
-            nickname = nickname
+            nickname = nickname,
+            useDefaultImage = useDefaultImage
         )
     }
 

domain/src/main/java/com/idiotfrogs/domain/usecase/user/UpdateMyProfileUseCase.kt

@@ -10,14 +10,14 @@ class UpdateMyProfileUseCase @Inject constructor(
     private val userRepository: UserRepository
 ) {
     suspend operator fun invoke(
-        userId: Long,
         profileImage: File?,
         nickname: String,
+        useDefaultImage: Boolean
     ): Result<UserResponse> = safeCatching {
             userRepository.updateMyProfile(
-                userId,
                 profileImage,
-                nickname
+                nickname,
+                useDefaultImage
             )
         }
 }

feature/profile/src/main/java/com/idiotfrogs/profile/editprofile/EditProfileScreen.kt

@@ -123,15 +123,15 @@ fun EditProfileScreen(
 
                 onAction.invoke(
                     EditProfileAction.UpdateProfile(
-                        userId = user.id,
                         profileImage = file,
-                        nickname = textFieldState.text.toString()
+                        nickname = textFieldState.text.toString(),
+                        useDefaultImage = useDefaultImage
                     )
                 )
             }
         )
         Spacer(modifier = Modifier.height(16.dp))
-        if (imageUri != null && !useDefaultImage) {
+        if ((imageUri != null || user.profileImageUrl.isNotEmpty()) && !useDefaultImage) {
             Box(modifier = Modifier.align(Alignment.CenterHorizontally)) {
                 GlideImage(
                     imageModel = { imageUri ?: user.profileImageUrl }, // 둘 중 하나는 not-null

feature/profile/src/main/java/com/idiotfrogs/profile/editprofile/EditProfileViewModel.kt

@@ -33,7 +33,7 @@ class EditProfileViewModel @Inject constructor(
         when (action) {
             EditProfileAction.BackClicked -> intent { postSideEffect(EditProfileSideEffect.NavigateToBack) }
             is EditProfileAction.UpdateProfile -> {
-                updateProfile(action.userId, action.profileImage, action.nickname)
+                updateProfile(action.profileImage, action.nickname, action.useDefaultImage)
             }
         }
     }
@@ -65,15 +65,16 @@ class EditProfileViewModel @Inject constructor(
         }
     }
 
-    private fun updateProfile(userId: Long, profileImage: File?, nickname: String) {
+    private fun updateProfile(profileImage: File?, nickname: String, useDefaultImage: Boolean) {
         safeLaunch {
             updateMyProfileUseCase(
-                userId = userId,
                 profileImage = profileImage,
-                nickname = nickname
+                nickname = nickname,
+                useDefaultImage = useDefaultImage
             )
                 .onSuccess {
                     RefreshSideEffect.tryEmit(RefreshEvent.Profile)
+                    RefreshSideEffect.tryEmit(RefreshEvent.Home)
                     intent { postSideEffect(EditProfileSideEffect.NavigateToBack) }
                 }
         }
@@ -95,7 +96,7 @@ data class EditProfileData(
 sealed interface EditProfileAction {
     data object BackClicked : EditProfileAction
     data class UpdateProfile(
-        val userId: Long, val profileImage: File?, val nickname: String
+        val profileImage: File?, val nickname: String, val useDefaultImage: Boolean
     ) : EditProfileAction
 }