Merge pull request #47 from Nexters/feature/add-name-setting

eshc123 · web-flow · commit e79ecf4b0f7d · 2025-08-16T18:59:03.000+09:00
이름 설정 화면에서 이름을 변경할 수 있습니다.
diff --git a/core/data/src/main/java/com/plottwist/core/data/auth/repository/AuthRepositoryImpl.kt b/core/data/src/main/java/com/plottwist/core/data/auth/repository/AuthRepositoryImpl.kt
@@ -2,16 +2,19 @@ package com.plottwist.core.data.auth.repository
 
 import com.plottwist.core.data.common.DeviceInfoProvider
 import com.plottwist.core.domain.auth.repository.AuthRepository
+import com.plottwist.core.domain.onboarding.OnboardingRepository
 import com.plottwist.core.domain.push.repository.PushRepository
 import com.plottwist.core.network.model.auth.DeviceInfo
 import com.plottwist.core.network.model.auth.GoogleLoginRequest
+import com.plottwist.core.network.model.onboarding.MemberNameRequest
 import com.plottwist.core.network.service.AuthApiService
 import com.plottwist.core.network.service.TukApiService
 import com.plottwist.core.preference.datasource.AuthDataSource
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.collect
 import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.firstOrNull
+import kotlinx.coroutines.flow.onEach
 import javax.inject.Inject
 
 
@@ -20,7 +23,8 @@ class AuthRepositoryImpl @Inject constructor(
     private val authDataSource: AuthDataSource,
     private val deviceInfoProvider: DeviceInfoProvider,
     private val pushRepository: PushRepository,
-    private val tukApiService: TukApiService
+    private val tukApiService: TukApiService,
+    private val onboardingRepository: OnboardingRepository
 ) : AuthRepository {
 
     override suspend fun googleLogin(accountId: String): Result<Boolean> {
@@ -45,9 +49,17 @@ class AuthRepositoryImpl @Inject constructor(
                 val result = response.data
                 authDataSource.setAccessToken(result.accessToken).collect()
                 authDataSource.setRefreshToken(result.refreshToken).collect()
-                authDataSource.setOnboardingCompleted(!result.isFirstLogin).collect()
 
-                Result.success(!result.isFirstLogin)
+                if(!result.isFirstLogin) {
+                    val name = onboardingRepository.getMemberInfo().getOrNull()?.name
+                    if(name.isNullOrEmpty()) {
+                        return Result.success(false)
+                    }else {
+                        Result.success(true)
+                    }
+                } else {
+                    Result.success(false)
+                }
 
             } else {
                 Result.failure(Exception("Fail Google Login"))
@@ -61,9 +73,9 @@ class AuthRepositoryImpl @Inject constructor(
     override fun checkLoginStatus(): Flow<Boolean> {
         return combine(
             authDataSource.getAccessToken(),
-            authDataSource.getOnboardingCompleted()
-        ) { accessToken, onboardingCompleted ->
-            accessToken?.isNotEmpty() ?: false && onboardingCompleted ?: false
+            authDataSource.getMemberName()
+        ) { accessToken, name ->
+            accessToken?.isNotEmpty() ?: false && !name.isNullOrEmpty()
         }
     }
 
@@ -89,4 +101,29 @@ class AuthRepositoryImpl @Inject constructor(
             Result.failure(e)
         }
     }
+
+    override suspend fun updateMemberName(name: String): Result<Unit> {
+        return try {
+            val response = tukApiService.updateMemberName(
+                MemberNameRequest(name)
+            )
+
+            if (response.success) {
+                setMemberName(name).collect()
+                Result.success(Unit)
+            } else {
+                Result.failure(Exception("Fail Delete member"))
+            }
+        } catch (e: Exception) {
+            Result.failure(e)
+        }
+    }
+
+    override fun getMemberName(): Flow<String?> {
+        return authDataSource.getMemberName()
+    }
+
+    override fun setMemberName(name: String): Flow<Unit> {
+        return authDataSource.setMemberName(name)
+    }
 }
diff --git a/core/data/src/main/java/com/plottwist/core/data/onboarding/OnboardingRepositoryImpl.kt b/core/data/src/main/java/com/plottwist/core/data/onboarding/OnboardingRepositoryImpl.kt
@@ -20,7 +20,7 @@ class OnboardingRepositoryImpl @Inject constructor(
             val  result = onboardingService.updateOnboardingInfo(UpdateOnboardingInfoRequest(name))
 
             if (result.success) {
-                authDataSource.setOnboardingCompleted(true).collect()
+                authDataSource.setMemberName(name).collect()
                 return Result.success(Unit)
             }
 
@@ -35,6 +35,7 @@ class OnboardingRepositoryImpl @Inject constructor(
             val result = onboardingService.getMemberInfo()
 
             if (result.success) {
+                authDataSource.setMemberName(result.data.name).collect()
                 return Result.success(result.data.toDomainModel())
             }
 
diff --git a/core/domain/src/main/java/com/plottwist/core/domain/auth/repository/AuthRepository.kt b/core/domain/src/main/java/com/plottwist/core/domain/auth/repository/AuthRepository.kt
@@ -8,4 +8,7 @@ interface AuthRepository {
     fun logout(): Flow<Unit>
     fun getAccessToken() : Flow<String?>
     suspend fun deleteAccount(): Result<Boolean>
+    suspend fun updateMemberName(name: String): Result<Unit>
+    fun getMemberName(): Flow<String?>
+    fun setMemberName(name: String): Flow<Unit>
 }
diff --git a/core/domain/src/main/java/com/plottwist/core/domain/auth/usecase/GetMemberNameUseCase.kt b/core/domain/src/main/java/com/plottwist/core/domain/auth/usecase/GetMemberNameUseCase.kt
@@ -0,0 +1,13 @@
+package com.plottwist.core.domain.auth.usecase
+
+import com.plottwist.core.domain.auth.repository.AuthRepository
+import kotlinx.coroutines.flow.Flow
+import javax.inject.Inject
+
+class GetMemberNameUseCase @Inject constructor(
+    private val authRepository: AuthRepository
+) {
+    operator fun invoke(): Flow<String?> {
+        return authRepository.getMemberName()
+    }
+}
diff --git a/core/domain/src/main/java/com/plottwist/core/domain/auth/usecase/UpdateMemberNameUseCase.kt b/core/domain/src/main/java/com/plottwist/core/domain/auth/usecase/UpdateMemberNameUseCase.kt
@@ -0,0 +1,12 @@
+package com.plottwist.core.domain.auth.usecase
+
+import com.plottwist.core.domain.auth.repository.AuthRepository
+import javax.inject.Inject
+
+class UpdateMemberNameUseCase @Inject constructor(
+    private val authRepository: AuthRepository
+) {
+    suspend operator fun invoke(name: String): Result<Unit> {
+        return authRepository.updateMemberName(name)
+    }
+}
diff --git a/core/network/src/main/java/com/plottwist/core/network/model/onboarding/MemberNameRequest.kt b/core/network/src/main/java/com/plottwist/core/network/model/onboarding/MemberNameRequest.kt
@@ -0,0 +1,8 @@
+package com.plottwist.core.network.model.onboarding
+
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class MemberNameRequest(
+    val name: String
+)
diff --git a/core/network/src/main/java/com/plottwist/core/network/service/TukApiService.kt b/core/network/src/main/java/com/plottwist/core/network/service/TukApiService.kt
@@ -13,6 +13,8 @@ import com.plottwist.core.network.model.gathering.GetPurposesResponse
 import com.plottwist.core.network.model.gathering.GetTagsResponse
 import com.plottwist.core.network.model.gathering.UpdateGatheringRequest
 import com.plottwist.core.network.model.gathering.UpdateGatheringResponse
+import com.plottwist.core.network.model.onboarding.MemberInfoResponse
+import com.plottwist.core.network.model.onboarding.MemberNameRequest
 import retrofit2.Response
 import retrofit2.http.Body
 import retrofit2.http.DELETE
@@ -64,4 +66,9 @@ interface TukApiService {
 
     @DELETE("/api/v1/members")
     suspend fun deleteMember(): DeleteMemberResponse
+
+    @PATCH("/api/v1/members")
+    suspend fun updateMemberName(
+        @Body memberNameRequest : MemberNameRequest
+    ): MemberInfoResponse
 }
diff --git a/core/preference/src/main/java/com/plottwist/core/preference/datasource/AuthDataSource.kt b/core/preference/src/main/java/com/plottwist/core/preference/datasource/AuthDataSource.kt
@@ -6,11 +6,11 @@ interface AuthDataSource {
 
     fun getAccessToken(): Flow<String?>
     fun getRefreshToken(): Flow<String?>
-    fun getOnboardingCompleted(): Flow<Boolean?>
+    fun getMemberName(): Flow<String?>
 
     fun setAccessToken(accessToken: String): Flow<Unit>
     fun setRefreshToken(refreshToken: String): Flow<Unit>
-    fun setOnboardingCompleted(completed: Boolean): Flow<Unit>
+    fun setMemberName(name: String): Flow<Unit>
 
     fun clear(): Flow<Unit>
 }
diff --git a/core/preference/src/main/java/com/plottwist/core/preference/datasource/AuthDataSourceImpl.kt b/core/preference/src/main/java/com/plottwist/core/preference/datasource/AuthDataSourceImpl.kt
@@ -2,7 +2,6 @@ package com.plottwist.core.preference.datasource
 
 import androidx.datastore.core.DataStore
 import androidx.datastore.preferences.core.Preferences
-import androidx.datastore.preferences.core.booleanPreferencesKey
 import androidx.datastore.preferences.core.edit
 import androidx.datastore.preferences.core.stringPreferencesKey
 import kotlinx.coroutines.flow.Flow
@@ -24,9 +23,9 @@ class AuthDataSourceImpl @Inject constructor(
             preferences[REFRESH_TOKEN]
         }
 
-    override fun getOnboardingCompleted(): Flow<Boolean?> =
+    override fun getMemberName(): Flow<String?> =
         dataStore.data.map { preferences ->
-            preferences[ONBOARDING_COMPLETED]
+            preferences[MEMBER_NAME]
         }
 
 
@@ -42,23 +41,24 @@ class AuthDataSourceImpl @Inject constructor(
         }
     }
 
-    override fun setOnboardingCompleted(completed: Boolean): Flow<Unit> = flow {
+    override fun setMemberName(name: String): Flow<Unit> = flow {
         dataStore.edit { preferences ->
-            preferences[ONBOARDING_COMPLETED] = completed
+            preferences[MEMBER_NAME] = name
         }
     }
 
     override fun clear(): Flow<Unit> = flow {
         dataStore.edit { preferences ->
             preferences[ACCESS_TOKEN] = ""
             preferences[REFRESH_TOKEN] = ""
+            preferences[MEMBER_NAME] = ""
         }
     }
 
     companion object {
         const val TOKEN_PREFERENCES_NAME = "token_preferences"
         private val ACCESS_TOKEN = stringPreferencesKey("access_token")
         private val REFRESH_TOKEN = stringPreferencesKey("refresh_token")
-        private val ONBOARDING_COMPLETED = booleanPreferencesKey("onboarding_completed")
+        private val MEMBER_NAME = stringPreferencesKey("member_name")
     }
 }
diff --git a/core/ui-navigation/src/main/java/com/plottwist/core/ui/navigation/Route.kt b/core/ui-navigation/src/main/java/com/plottwist/core/ui/navigation/Route.kt
@@ -83,4 +83,7 @@ sealed interface Route {
         val gatheringId: Long,
         val selectedIntervalDays : Long
     ): Route
+
+    @Serializable
+    data object EditName : Route
 }
diff --git a/feature/home/src/main/java/com/plottwist/feature/home/HomeViewModel.kt b/feature/home/src/main/java/com/plottwist/feature/home/HomeViewModel.kt
@@ -3,6 +3,7 @@ package com.plottwist.feature.home
 import androidx.compose.foundation.text.input.TextFieldState
 import androidx.lifecycle.ViewModel
 import com.plottwist.core.domain.auth.usecase.CheckLoginStatusUseCase
+import com.plottwist.core.domain.auth.usecase.GetMemberNameUseCase
 import com.plottwist.core.domain.gathering.usecase.GetGatheringsUseCase
 import com.plottwist.core.domain.gathering.usecase.GetPurposesUseCase
 import com.plottwist.core.domain.model.Purposes
@@ -11,6 +12,7 @@ import com.plottwist.core.domain.onboarding.usecase.UpdateDeviceTokenUseCase
 import com.plottwist.core.ui.UiState
 import com.plottwist.core.weburl.WebUrlConfig
 import dagger.hilt.android.lifecycle.HiltViewModel
+import kotlinx.coroutines.flow.catch
 import kotlinx.coroutines.flow.collectLatest
 import kotlinx.coroutines.flow.distinctUntilChanged
 import kotlinx.coroutines.flow.map
@@ -26,12 +28,13 @@ class HomeViewModel @Inject constructor(
     private val getPurposesUseCase: GetPurposesUseCase,
     private val webViewConfig: WebUrlConfig,
     private val updateDeviceTokenUseCase: UpdateDeviceTokenUseCase,
-    private val getMemberInfoUseCase: GetMemberInfoUseCase
+    private val getMemberInfoUseCase: GetMemberInfoUseCase,
+    private val getMemberNameUseCase: GetMemberNameUseCase
 ) : ContainerHost<HomeState, HomeSideEffect>, ViewModel() {
     override val container = container<HomeState, HomeSideEffect>(HomeState()) {
         observeLoginState()
+        observeMemberName()
         getPurposes()
-        getMemberInfo()
     }
 
     private fun getPurposes() = intent {
@@ -122,7 +125,6 @@ class HomeViewModel @Inject constructor(
         }.distinctUntilChanged().collectLatest { loginState ->
             when (loginState) {
                 LoginState.LoggedIn -> {
-                    getMemberInfo()
                     fetchGatherings(loginState)
                     updateDeviceTokenUseCase()
                     postSideEffect(HomeSideEffect.RequestNotificationPermission)
@@ -140,6 +142,30 @@ class HomeViewModel @Inject constructor(
         }
     }
 
+    private fun observeMemberName() = intent {
+        getMemberNameUseCase().catch {
+            reduce {
+                state.copy(
+                    userName = UiState.Error
+                )
+            }
+        }.collectLatest { name ->
+            if(name.isNullOrEmpty()){
+                reduce {
+                    state.copy(
+                        userName = UiState.Error
+                    )
+                }
+            } else {
+                reduce {
+                    state.copy(
+                        userName = UiState.Success(name)
+                    )
+                }
+            }
+        }
+    }
+
     private fun fetchGatherings(loginState: LoginState) = intent {
         val result = getGatheringsUseCase()
 
diff --git a/feature/main/src/main/java/com/plottwist/feature/main/ui/component/TukNavHost.kt b/feature/main/src/main/java/com/plottwist/feature/main/ui/component/TukNavHost.kt
@@ -17,7 +17,9 @@ import com.plottwist.feature.home.navigation.homeNavGraph
 import com.plottwist.feature.home.navigation.navigateToHome
 import com.plottwist.feature.login.navigation.loginNavGraph
 import com.plottwist.feature.login.navigation.navigateToLogin
+import com.plottwist.feature.mypage.navigation.editNameNavGraph
 import com.plottwist.feature.mypage.navigation.myPageNavGraph
+import com.plottwist.feature.mypage.navigation.navigateToEditName
 import com.plottwist.feature.mypage.navigation.navigateToMyPage
 import com.plottwist.feature.mypage.navigation.navigateToNotificationSetting
 import com.plottwist.feature.mypage.navigation.navigateToPolicyWebView
@@ -115,6 +117,9 @@ fun TukNavHost(
                     "개인정보 처리방침",
                     "https://www.tuk.kr/privacy-policy"
                 )
+            },
+            navigateToEditName = {
+                navController.navigateToEditName()
             }
         )
         notificationSettingNavGraph(
@@ -252,5 +257,11 @@ fun TukNavHost(
                 )
             }
         )
+
+        editNameNavGraph(
+            onBack = {
+                navController.popBackStack()
+            }
+        )
     }
 }
diff --git a/feature/mypage/src/main/java/com/plottwist/feature/mypage/MyPageScreen.kt b/feature/mypage/src/main/java/com/plottwist/feature/mypage/MyPageScreen.kt
@@ -44,7 +44,8 @@ fun MyPageScreen(
     navigateToHome: () -> Unit,
     navigateToNotificationSetting: () -> Unit,
     navigateToTerms: () -> Unit,
-    navigateToPrivacyPolicy: () -> Unit
+    navigateToPrivacyPolicy: () -> Unit,
+    navigateToEditName: () -> Unit
 ) {
 
     val state by viewModel.container.stateFlow.collectAsState()
@@ -55,7 +56,7 @@ fun MyPageScreen(
     viewModel.collectSideEffect { sideEffect ->
         when (sideEffect) {
             MyPageSideEffect.NavigateToEditName -> {
-
+                navigateToEditName()
             }
 
             MyPageSideEffect.NavigateToNotificationSetting -> {
diff --git a/feature/mypage/src/main/java/com/plottwist/feature/mypage/edit_name/EditNameContract.kt b/feature/mypage/src/main/java/com/plottwist/feature/mypage/edit_name/EditNameContract.kt
@@ -0,0 +1,20 @@
+package com.plottwist.feature.mypage.edit_name
+
+import androidx.compose.foundation.text.input.TextFieldState
+
+data class EditNameState(
+    val name: TextFieldState = TextFieldState(),
+    val originalName: String = "",
+    val isLoading: Boolean = false
+)
+
+sealed class EditNameAction {
+    data object ClickBack : EditNameAction()
+    data object ClickSave : EditNameAction()
+}
+
+sealed class EditNameSideEffect {
+    data object NavigateBack : EditNameSideEffect()
+    data object SaveSuccess : EditNameSideEffect()
+    data class ShowToast(val message: String) : EditNameSideEffect()
+}
diff --git a/feature/mypage/src/main/java/com/plottwist/feature/mypage/edit_name/EditNameScreen.kt b/feature/mypage/src/main/java/com/plottwist/feature/mypage/edit_name/EditNameScreen.kt
diff --git a/feature/mypage/src/main/java/com/plottwist/feature/mypage/edit_name/EditNameViewModel.kt b/feature/mypage/src/main/java/com/plottwist/feature/mypage/edit_name/EditNameViewModel.kt
diff --git a/feature/mypage/src/main/java/com/plottwist/feature/mypage/navigation/EditNameNavigation.kt b/feature/mypage/src/main/java/com/plottwist/feature/mypage/navigation/EditNameNavigation.kt
diff --git a/feature/mypage/src/main/java/com/plottwist/feature/mypage/navigation/MyPageNavigation.kt b/feature/mypage/src/main/java/com/plottwist/feature/mypage/navigation/MyPageNavigation.kt
diff --git a/feature/onboarding/src/main/java/com/plottwist/feature/onboarding/OnboardingNameScreen.kt b/feature/onboarding/src/main/java/com/plottwist/feature/onboarding/OnboardingNameScreen.kt

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ class OnboardingRepositoryImpl @Inject constructor(`
`20`	`20`	`val result = onboardingService.updateOnboardingInfo(UpdateOnboardingInfoRequest(name))`
`21`	`21`
`22`	`22`	`if (result.success) {`
`23`		`- authDataSource.setOnboardingCompleted(true).collect()`
	`23`	`+ authDataSource.setMemberName(name).collect()`
`24`	`24`	`return Result.success(Unit)`
`25`	`25`	`}`
`26`	`26`
`@@ -35,6 +35,7 @@ class OnboardingRepositoryImpl @Inject constructor(`
`35`	`35`	`val result = onboardingService.getMemberInfo()`
`36`	`36`
`37`	`37`	`if (result.success) {`
	`38`	`+ authDataSource.setMemberName(result.data.name).collect()`
`38`	`39`	`return Result.success(result.data.toDomainModel())`
`39`	`40`	`}`
`40`	`41`
Original file line number	Diff line number	Diff line change
`@@ -8,4 +8,7 @@ interface AuthRepository {`
`8`	`8`	`fun logout(): Flow<Unit>`
`9`	`9`	`fun getAccessToken() : Flow<String?>`
`10`	`10`	`suspend fun deleteAccount(): Result<Boolean>`
	`11`	`+ suspend fun updateMemberName(name: String): Result<Unit>`
	`12`	`+ fun getMemberName(): Flow<String?>`
	`13`	`+ fun setMemberName(name: String): Flow<Unit>`
`11`	`14`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,6 @@ package com.plottwist.core.preference.datasource`
`2`	`2`
`3`	`3`	`import androidx.datastore.core.DataStore`
`4`	`4`	`import androidx.datastore.preferences.core.Preferences`
`5`		`-import androidx.datastore.preferences.core.booleanPreferencesKey`
`6`	`5`	`import androidx.datastore.preferences.core.edit`
`7`	`6`	`import androidx.datastore.preferences.core.stringPreferencesKey`
`8`	`7`	`import kotlinx.coroutines.flow.Flow`
`@@ -24,9 +23,9 @@ class AuthDataSourceImpl @Inject constructor(`
`24`	`23`	`preferences[REFRESH_TOKEN]`
`25`	`24`	`}`
`26`	`25`
`27`		`- override fun getOnboardingCompleted(): Flow<Boolean?> =`
	`26`	`+ override fun getMemberName(): Flow<String?> =`
`28`	`27`	`dataStore.data.map { preferences ->`
`29`		`- preferences[ONBOARDING_COMPLETED]`
	`28`	`+ preferences[MEMBER_NAME]`
`30`	`29`	`}`
`31`	`30`
`32`	`31`
`@@ -42,23 +41,24 @@ class AuthDataSourceImpl @Inject constructor(`
`42`	`41`	`}`
`43`	`42`	`}`
`44`	`43`
`45`		`- override fun setOnboardingCompleted(completed: Boolean): Flow<Unit> = flow {`
	`44`	`+ override fun setMemberName(name: String): Flow<Unit> = flow {`
`46`	`45`	`dataStore.edit { preferences ->`
`47`		`- preferences[ONBOARDING_COMPLETED] = completed`
	`46`	`+ preferences[MEMBER_NAME] = name`
`48`	`47`	`}`
`49`	`48`	`}`
`50`	`49`
`51`	`50`	`override fun clear(): Flow<Unit> = flow {`
`52`	`51`	`dataStore.edit { preferences ->`
`53`	`52`	`preferences[ACCESS_TOKEN] = ""`
`54`	`53`	`preferences[REFRESH_TOKEN] = ""`
	`54`	`+ preferences[MEMBER_NAME] = ""`
`55`	`55`	`}`
`56`	`56`	`}`
`57`	`57`
`58`	`58`	`companion object {`
`59`	`59`	`const val TOKEN_PREFERENCES_NAME = "token_preferences"`
`60`	`60`	`private val ACCESS_TOKEN = stringPreferencesKey("access_token")`
`61`	`61`	`private val REFRESH_TOKEN = stringPreferencesKey("refresh_token")`
`62`		`- private val ONBOARDING_COMPLETED = booleanPreferencesKey("onboarding_completed")`
	`62`	`+ private val MEMBER_NAME = stringPreferencesKey("member_name")`
`63`	`63`	`}`
`64`	`64`	`}`
Original file line number	Diff line number	Diff line change
`@@ -83,4 +83,7 @@ sealed interface Route {`
`83`	`83`	`val gatheringId: Long,`
`84`	`84`	`val selectedIntervalDays : Long`
`85`	`85`	`): Route`
	`86`	`+`
	`87`	`+ @Serializable`
	`88`	`+ data object EditName : Route`
`86`	`89`	`}`