[SPM-433] 프로필 수정 및 회원 관리 구현

app/src/main/java/com/sampoom/android/MainActivityViewModel.kt

@@ -3,8 +3,8 @@ package com.sampoom.android
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.sampoom.android.core.util.GlobalMessageHandler
-import com.sampoom.android.feature.auth.domain.model.User
-import com.sampoom.android.feature.auth.domain.usecase.GetStoredUserUseCase
+import com.sampoom.android.feature.user.domain.model.User
+import com.sampoom.android.feature.user.domain.usecase.GetStoredUserUseCase
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow

app/src/main/java/com/sampoom/android/app/navigation/AppNavHost.kt

@@ -1,9 +1,7 @@
 package com.sampoom.android.app.navigation
 
 import android.annotation.SuppressLint
-import androidx.activity.ComponentActivity
 import androidx.compose.foundation.background
-import androidx.compose.foundation.isSystemInDarkTheme
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.material3.CircularProgressIndicator
@@ -25,11 +23,8 @@ import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.graphics.toArgb
-import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
-import androidx.core.view.WindowInsetsControllerCompat
 import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import androidx.navigation.NavHostController
@@ -49,18 +44,19 @@ import com.sampoom.android.core.ui.theme.Main500
 import com.sampoom.android.core.ui.theme.backgroundCardColor
 import com.sampoom.android.core.ui.theme.backgroundColor
 import com.sampoom.android.core.ui.theme.textColor
-import com.sampoom.android.feature.auth.domain.model.User
 import com.sampoom.android.feature.auth.ui.AuthViewModel
 import com.sampoom.android.feature.auth.ui.LoginScreen
 import com.sampoom.android.feature.auth.ui.SignUpScreen
 import com.sampoom.android.feature.cart.ui.CartListScreen
 import com.sampoom.android.feature.dashboard.ui.DashboardScreen
+import com.sampoom.android.feature.dashboard.ui.SettingScreen
 import com.sampoom.android.feature.order.ui.OrderDetailScreen
 import com.sampoom.android.feature.order.ui.OrderListScreen
 import com.sampoom.android.feature.outbound.ui.OutboundListScreen
 import com.sampoom.android.feature.part.ui.PartListScreen
 import com.sampoom.android.feature.part.ui.PartScreen
-import com.sampoom.android.feature.setting.ui.SettingScreen
+import com.sampoom.android.feature.user.domain.model.User
+import com.sampoom.android.feature.user.ui.EmployeeListScreen
 import kotlinx.coroutines.flow.filterNotNull
 
 // Auth Screen
@@ -216,6 +212,13 @@ fun AppNavHost(
                 }
             )
         }
+        composable(ROUTE_EMPLOYEE) {
+            EmployeeListScreen(
+                onNavigateBack = {
+                    navController.navigateUp()
+                }
+            )
+        }
     }
     TopSnackBarHost(hostState = snackBarHostState, isError = currentMessage?.isError ?: false)
 }
@@ -238,6 +241,9 @@ fun MainScreen(
             composable(ROUTE_DASHBOARD) {
                 DashboardScreen(
                     paddingValues = innerPadding,
+                    onEmployeeClick = {
+                        parentNavController.navigate(ROUTE_EMPLOYEE)
+                    },
                     onSettingClick = {
                         parentNavController.navigate(ROUTE_SETTINGS)
                     },

app/src/main/java/com/sampoom/android/core/network/TokenRefreshService.kt

@@ -3,7 +3,7 @@ package com.sampoom.android.core.network
 import com.sampoom.android.core.preferences.AuthPreferences
 import com.sampoom.android.feature.auth.data.remote.api.AuthApi
 import com.sampoom.android.feature.auth.data.remote.dto.RefreshRequestDto
-import com.sampoom.android.feature.auth.domain.model.User
+import com.sampoom.android.feature.user.domain.model.User
 import retrofit2.Retrofit
 import retrofit2.converter.gson.GsonConverterFactory
 import javax.inject.Inject

app/src/main/java/com/sampoom/android/core/preferences/AuthPreferences.kt

@@ -7,7 +7,7 @@ import androidx.datastore.preferences.core.longPreferencesKey
 import androidx.datastore.preferences.core.stringPreferencesKey
 import androidx.datastore.preferences.preferencesDataStore
 import com.sampoom.android.core.model.UserPosition
-import com.sampoom.android.feature.auth.domain.model.User
+import com.sampoom.android.feature.user.domain.model.User
 import dagger.hilt.android.qualifiers.ApplicationContext
 import javax.inject.Inject
 import javax.inject.Singleton

app/src/main/java/com/sampoom/android/feature/auth/domain/AuthValidator.kt → app/src/main/java/com/sampoom/android/core/util/AuthValidator.kt

@@ -1,4 +1,4 @@
-package com.sampoom.android.feature.auth.domain
+package com.sampoom.android.core.util
 
 import com.sampoom.android.R
 

app/src/main/java/com/sampoom/android/feature/auth/data/mapper/AuthMappers.kt

@@ -1,11 +1,10 @@
 package com.sampoom.android.feature.auth.data.mapper
 
 import com.sampoom.android.core.model.UserPosition
-import com.sampoom.android.feature.auth.data.remote.dto.GetProfileResponseDto
 import com.sampoom.android.feature.auth.data.remote.dto.GetVendorsResponseDto
 import com.sampoom.android.feature.auth.data.remote.dto.LoginResponseDto
-import com.sampoom.android.feature.auth.domain.model.User
 import com.sampoom.android.feature.auth.domain.model.Vendor
+import com.sampoom.android.feature.user.domain.model.User
 
 fun LoginResponseDto.toModel(): User = User(
     userId = userId,
@@ -23,28 +22,6 @@ fun LoginResponseDto.toModel(): User = User(
     endedAt = null
 )
 
-fun GetProfileResponseDto.toModel(): User = User(
-    userId = userId,
-    userName = userName,
-    email = email,
-    role = role,
-    accessToken = "",
-    refreshToken = "",
-    expiresIn = 0L,
-    position = position.toUserPosition(),
-    workspace = workspace,
-    branch = branch,
-    agencyId = organizationId,
-    startedAt = startedAt,
-    endedAt = endedAt
-)
-
-private fun String.toUserPosition(): UserPosition = try {
-    UserPosition.valueOf(this.uppercase())
-} catch (_: IllegalArgumentException) {
-    UserPosition.STAFF
-}
-
 fun GetVendorsResponseDto.toModel(): Vendor = Vendor(
     id = id,
     vendorCode = vendorCode,

app/src/main/java/com/sampoom/android/feature/auth/data/remote/api/AuthApi.kt

@@ -2,22 +2,17 @@ package com.sampoom.android.feature.auth.data.remote.api
 
 import com.sampoom.android.core.model.ApiResponse
 import com.sampoom.android.core.model.ApiSuccessResponse
+import com.sampoom.android.feature.auth.data.remote.dto.GetVendorsResponseDto
 import com.sampoom.android.feature.auth.data.remote.dto.LoginRequestDto
-import com.sampoom.android.feature.auth.data.remote.dto.SignUpRequestDto
-import com.sampoom.android.feature.auth.data.remote.dto.SignUpResponseDto
 import com.sampoom.android.feature.auth.data.remote.dto.LoginResponseDto
 import com.sampoom.android.feature.auth.data.remote.dto.RefreshRequestDto
 import com.sampoom.android.feature.auth.data.remote.dto.RefreshResponseDto
-import com.sampoom.android.feature.auth.data.remote.dto.UpdateProfileRequestDto
-import com.sampoom.android.feature.auth.data.remote.dto.UpdateProfileResponseDto
-import com.sampoom.android.feature.auth.data.remote.dto.GetProfileResponseDto
-import com.sampoom.android.feature.auth.data.remote.dto.GetVendorsResponseDto
+import com.sampoom.android.feature.auth.data.remote.dto.SignUpRequestDto
+import com.sampoom.android.feature.auth.data.remote.dto.SignUpResponseDto
 import retrofit2.http.Body
 import retrofit2.http.GET
 import retrofit2.http.Headers
-import retrofit2.http.PATCH
 import retrofit2.http.POST
-import retrofit2.http.Query
 
 interface AuthApi {
     @POST("auth/signup")
@@ -34,12 +29,6 @@ interface AuthApi {
     @Headers("X-No-Auth: true")
     suspend fun login(@Body body: LoginRequestDto): ApiResponse<LoginResponseDto>
 
-    @GET("user/profile")
-    suspend fun getProfile(@Query("workspace") workspace: String): ApiResponse<GetProfileResponseDto>
-
-    @PATCH("user/profile")
-    suspend fun updateProfile(@Body body: UpdateProfileRequestDto): ApiResponse<UpdateProfileResponseDto>
-
     @GET("site/vendors")
     suspend fun getVendors(): ApiResponse<List<GetVendorsResponseDto>>
 }

app/src/main/java/com/sampoom/android/feature/auth/data/repository/AuthRepositoryImpl.kt

@@ -7,10 +7,9 @@ import com.sampoom.android.feature.auth.data.remote.api.AuthApi
 import com.sampoom.android.feature.auth.data.remote.dto.LoginRequestDto
 import com.sampoom.android.feature.auth.data.remote.dto.RefreshRequestDto
 import com.sampoom.android.feature.auth.data.remote.dto.SignUpRequestDto
-import com.sampoom.android.feature.auth.domain.model.User
 import com.sampoom.android.feature.auth.domain.model.VendorList
 import com.sampoom.android.feature.auth.domain.repository.AuthRepository
-import com.sampoom.android.feature.outbound.data.mapper.toModel
+import com.sampoom.android.feature.user.domain.model.User
 import kotlinx.coroutines.delay
 import javax.inject.Inject
 
@@ -63,29 +62,7 @@ class AuthRepositoryImpl @Inject constructor(
             val loginUser = loginDto.data.toModel()
 
             preferences.saveUser(loginUser)
-
-            val profileUser = retry(times = 5, initialDelay = 300) {
-                getProfile("AGENCY").getOrThrow()
-            }
-
-            val user = User(
-                userId = loginUser.userId,
-                userName = profileUser.userName,
-                email = profileUser.email,
-                role = profileUser.role,
-                accessToken = loginUser.accessToken,
-                refreshToken = loginUser.refreshToken,
-                expiresIn = loginUser.expiresIn,
-                position = profileUser.position,
-                workspace = profileUser.workspace,
-                branch = profileUser.branch,
-                agencyId = profileUser.agencyId,
-                startedAt = profileUser.startedAt,
-                endedAt = profileUser.endedAt
-            )
-
-            preferences.saveUser(user)
-            user
+            loginUser
         }
     }
 
@@ -126,14 +103,6 @@ class AuthRepositoryImpl @Inject constructor(
 
     override suspend fun isSignedIn(): Boolean = preferences.hasToken()
 
-    override suspend fun getProfile(workspace: String): Result<User> {
-        return runCatching {
-            val dto = api.getProfile(workspace)
-            if (!dto.success) throw Exception(dto.message)
-            dto.data.toModel()
-        }
-    }
-
     override suspend fun getVendorList(): Result<VendorList> {
         return runCatching {
             val dto = api.getVendors()

app/src/main/java/com/sampoom/android/feature/auth/domain/repository/AuthRepository.kt

@@ -1,7 +1,7 @@
 package com.sampoom.android.feature.auth.domain.repository
 
-import com.sampoom.android.feature.auth.domain.model.User
 import com.sampoom.android.feature.auth.domain.model.VendorList
+import com.sampoom.android.feature.user.domain.model.User
 
 interface AuthRepository {
     suspend fun signUp(
@@ -18,6 +18,5 @@ interface AuthRepository {
     suspend fun refreshToken(): Result<User>
     suspend fun clearTokens(): Result<Unit>
     suspend fun isSignedIn(): Boolean
-    suspend fun getProfile(workspace: String): Result<User>
     suspend fun getVendorList(): Result<VendorList>
 }

app/src/main/java/com/sampoom/android/feature/auth/domain/usecase/LoginUseCase.kt

@@ -1,6 +1,6 @@
 package com.sampoom.android.feature.auth.domain.usecase
 
-import com.sampoom.android.feature.auth.domain.model.User
+import com.sampoom.android.feature.user.domain.model.User
 import com.sampoom.android.feature.auth.domain.repository.AuthRepository
 import javax.inject.Inject
 

app/src/main/java/com/sampoom/android/feature/auth/domain/usecase/SignUpUseCase.kt

@@ -1,6 +1,6 @@
 package com.sampoom.android.feature.auth.domain.usecase
 
-import com.sampoom.android.feature.auth.domain.model.User
+import com.sampoom.android.feature.user.domain.model.User
 import com.sampoom.android.feature.auth.domain.repository.AuthRepository
 import javax.inject.Inject
 

app/src/main/java/com/sampoom/android/feature/auth/ui/LoginViewModel.kt

@@ -6,9 +6,10 @@ import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.sampoom.android.core.network.serverMessageOrNull
 import com.sampoom.android.core.util.GlobalMessageHandler
-import com.sampoom.android.feature.auth.domain.AuthValidator
-import com.sampoom.android.feature.auth.domain.ValidationResult
+import com.sampoom.android.core.util.AuthValidator
+import com.sampoom.android.core.util.ValidationResult
 import com.sampoom.android.feature.auth.domain.usecase.LoginUseCase
+import com.sampoom.android.feature.user.domain.usecase.GetProfileUseCase
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
@@ -20,6 +21,7 @@ import javax.inject.Inject
 class LoginViewModel @Inject constructor(
     private val messageHandler: GlobalMessageHandler,
     private val singIn: LoginUseCase,
+    private val getProfile: GetProfileUseCase,
     private val application: Application
 ) : ViewModel() {
 
@@ -86,9 +88,21 @@ class LoginViewModel @Inject constructor(
         _uiState.update { it.copy(loading = true, success = false) }
         singIn(s.email, s.password)
             .onSuccess {
-                _uiState.update {
-                    it.copy(loading = false, success = true)
-                }
+                getProfile("AGENCY")
+                    .onSuccess {
+                        _uiState.update {
+                            it.copy(loading = false, success = true)
+                        }
+                    }
+                    .onFailure { throwable ->
+                        val backendMessage = throwable.serverMessageOrNull()
+                        val error = backendMessage ?: (throwable.message ?: errorLabel)
+                        messageHandler.showMessage(message = error, isError = true)
+
+                        _uiState.update {
+                            it.copy(loading = false, success = false)
+                        }
+                    }
             }
             .onFailure { throwable ->
                 val backendMessage = throwable.serverMessageOrNull()
@@ -98,6 +112,7 @@ class LoginViewModel @Inject constructor(
                 _uiState.update {
                     it.copy(loading = false, success = false)
                 }
+                return@launch
             }
         Log.d(TAG, "submit: ${_uiState.value}")
     }