diff --git a/app/build.gradle.kts b/app/build.gradle.kts index f9d81ad..978c428 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -32,8 +32,8 @@ android { applicationId = "com.sampoom.android" minSdk = 26 targetSdk = 36 - versionCode = 7 - versionName = "1.0.6" + versionCode = 9 + versionName = "1.0.8" testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" } diff --git a/app/src/main/java/com/sampoom/android/core/preferences/AuthPreferences.kt b/app/src/main/java/com/sampoom/android/core/preferences/AuthPreferences.kt index 4b4b299..756d51a 100644 --- a/app/src/main/java/com/sampoom/android/core/preferences/AuthPreferences.kt +++ b/app/src/main/java/com/sampoom/android/core/preferences/AuthPreferences.kt @@ -31,8 +31,8 @@ class AuthPreferences @Inject constructor( val USER_ID: Preferences.Key = stringPreferencesKey("user_id") val USER_NAME: Preferences.Key = stringPreferencesKey("user_name") val USER_EMAIL: Preferences.Key = stringPreferencesKey("user_email") - val USER_ROLE: Preferences.Key = stringPreferencesKey("user_role") val USER_POSITION: Preferences.Key = stringPreferencesKey("user_position") + val USER_WORKSPACE: Preferences.Key = stringPreferencesKey("user_workspace") val USER_BRANCH: Preferences.Key = stringPreferencesKey("user_branch") val USER_AGENCY_ID: Preferences.Key = stringPreferencesKey("user_agency_id") val USER_STARTED_AT: Preferences.Key = stringPreferencesKey("user_started_at") @@ -49,8 +49,8 @@ class AuthPreferences @Inject constructor( prefs[Keys.USER_ID] = cryptoManager.encrypt(user.userId.toString()) prefs[Keys.USER_NAME] = cryptoManager.encrypt(user.userName) prefs[Keys.USER_EMAIL] = cryptoManager.encrypt(user.email) - prefs[Keys.USER_ROLE] = cryptoManager.encrypt(user.role) prefs[Keys.USER_POSITION] = cryptoManager.encrypt(user.position.name) + prefs[Keys.USER_WORKSPACE] = cryptoManager.encrypt(user.workspace) prefs[Keys.USER_BRANCH] = cryptoManager.encrypt(user.branch) prefs[Keys.USER_AGENCY_ID] = cryptoManager.encrypt(user.agencyId.toString()) prefs[Keys.USER_STARTED_AT] = cryptoManager.encrypt(user.startedAt.toString()) @@ -74,18 +74,18 @@ class AuthPreferences @Inject constructor( val userId = prefs[Keys.USER_ID] val userName = prefs[Keys.USER_NAME] val userEmail = prefs[Keys.USER_EMAIL] - val userRole = prefs[Keys.USER_ROLE] val accessToken = prefs[Keys.ACCESS_TOKEN] val refreshToken = prefs[Keys.REFRESH_TOKEN] val expiresAt = prefs[Keys.TOKEN_EXPIRES_AT] val userPosition = prefs[Keys.USER_POSITION] + val userWorkspace = prefs[Keys.USER_WORKSPACE] val userBranch = prefs[Keys.USER_BRANCH] val userAgencyId = prefs[Keys.USER_AGENCY_ID] val userStartedAt = prefs[Keys.USER_STARTED_AT] val userEndedAt = prefs[Keys.USER_ENDED_AT] - if (userId != null && userName != null && userEmail != null && userRole != null && - accessToken != null && refreshToken != null && userPosition != null && userBranch != null && userAgencyId != null && userStartedAt != null && userEndedAt != null + if (userId != null && userName != null && userEmail != null && + accessToken != null && refreshToken != null && userPosition != null && userWorkspace != null && userBranch != null && userAgencyId != null && userStartedAt != null && userEndedAt != null ) { try { val remaining = expiresAt?.let { @@ -96,13 +96,17 @@ class AuthPreferences @Inject constructor( cryptoManager.decrypt(userId).toLong(), cryptoManager.decrypt(userName), cryptoManager.decrypt(userEmail), - cryptoManager.decrypt(userRole), cryptoManager.decrypt(accessToken), cryptoManager.decrypt(refreshToken), remaining, cryptoManager.decrypt(userPosition).let { decrypted -> - try { UserPosition.valueOf(decrypted.uppercase()) } catch (_: Exception) { UserPosition.STAFF } + try { + UserPosition.valueOf(decrypted.uppercase()) + } catch (_: Exception) { + UserPosition.STAFF + } }, + cryptoManager.decrypt(userWorkspace), cryptoManager.decrypt(userBranch), cryptoManager.decrypt(userAgencyId).toLong(), cryptoManager.decrypt(userStartedAt), diff --git a/app/src/main/java/com/sampoom/android/feature/auth/data/mapper/AuthMappers.kt b/app/src/main/java/com/sampoom/android/feature/auth/data/mapper/AuthMappers.kt index 04c975b..304609f 100644 --- a/app/src/main/java/com/sampoom/android/feature/auth/data/mapper/AuthMappers.kt +++ b/app/src/main/java/com/sampoom/android/feature/auth/data/mapper/AuthMappers.kt @@ -10,11 +10,11 @@ fun LoginResponseDto.toModel(): User = User( userId = userId, userName = "", email = "", - role = "", accessToken = accessToken, refreshToken = refreshToken, expiresIn = expiresIn, position = UserPosition.STAFF, + workspace = "", branch = "", agencyId = 0, startedAt = null, diff --git a/app/src/main/java/com/sampoom/android/feature/auth/data/remote/dto/LoginRequestDto.kt b/app/src/main/java/com/sampoom/android/feature/auth/data/remote/dto/LoginRequestDto.kt index 935bd95..b52f270 100644 --- a/app/src/main/java/com/sampoom/android/feature/auth/data/remote/dto/LoginRequestDto.kt +++ b/app/src/main/java/com/sampoom/android/feature/auth/data/remote/dto/LoginRequestDto.kt @@ -1,7 +1,7 @@ package com.sampoom.android.feature.auth.data.remote.dto data class LoginRequestDto( - val role: String, + val workspace: String, val email: String, val password: String ) \ No newline at end of file diff --git a/app/src/main/java/com/sampoom/android/feature/auth/data/remote/dto/SignUpRequestDto.kt b/app/src/main/java/com/sampoom/android/feature/auth/data/remote/dto/SignUpRequestDto.kt index dd911aa..50cc02b 100644 --- a/app/src/main/java/com/sampoom/android/feature/auth/data/remote/dto/SignUpRequestDto.kt +++ b/app/src/main/java/com/sampoom/android/feature/auth/data/remote/dto/SignUpRequestDto.kt @@ -3,7 +3,7 @@ package com.sampoom.android.feature.auth.data.remote.dto data class SignUpRequestDto( val email: String, val password: String, - val role: String, + val workspace: String, val branch: String, val userName: String, val position: String diff --git a/app/src/main/java/com/sampoom/android/feature/auth/data/repository/AuthRepositoryImpl.kt b/app/src/main/java/com/sampoom/android/feature/auth/data/repository/AuthRepositoryImpl.kt index e567d10..3337341 100644 --- a/app/src/main/java/com/sampoom/android/feature/auth/data/repository/AuthRepositoryImpl.kt +++ b/app/src/main/java/com/sampoom/android/feature/auth/data/repository/AuthRepositoryImpl.kt @@ -22,7 +22,7 @@ class AuthRepositoryImpl @Inject constructor( override suspend fun signUp( email: String, password: String, - role: String, + workspace: String, branch: String, userName: String, position: String @@ -32,7 +32,7 @@ class AuthRepositoryImpl @Inject constructor( SignUpRequestDto( email = email, password = password, - role = role, + workspace = workspace, branch = branch, userName = userName, position = position @@ -55,7 +55,7 @@ class AuthRepositoryImpl @Inject constructor( return runCatching { val loginDto = api.login( LoginRequestDto( - role = "AGENCY", + workspace = "AGENCY", email = email, password = password ) @@ -70,6 +70,7 @@ class AuthRepositoryImpl @Inject constructor( /** 로그아웃 */ override suspend fun signOut(): Result { + preferences.clear() return runCatching { val dto = api.logout() if (!dto.success) throw Exception(dto.message) diff --git a/app/src/main/java/com/sampoom/android/feature/auth/domain/repository/AuthRepository.kt b/app/src/main/java/com/sampoom/android/feature/auth/domain/repository/AuthRepository.kt index 1c411d9..10e95e1 100644 --- a/app/src/main/java/com/sampoom/android/feature/auth/domain/repository/AuthRepository.kt +++ b/app/src/main/java/com/sampoom/android/feature/auth/domain/repository/AuthRepository.kt @@ -7,7 +7,7 @@ interface AuthRepository { suspend fun signUp( email: String, password: String, - role: String, + workspace: String, branch: String, userName: String, position: String diff --git a/app/src/main/java/com/sampoom/android/feature/auth/domain/usecase/SignUpUseCase.kt b/app/src/main/java/com/sampoom/android/feature/auth/domain/usecase/SignUpUseCase.kt index 5fbf064..aedc1a9 100644 --- a/app/src/main/java/com/sampoom/android/feature/auth/domain/usecase/SignUpUseCase.kt +++ b/app/src/main/java/com/sampoom/android/feature/auth/domain/usecase/SignUpUseCase.kt @@ -10,14 +10,14 @@ class SignUpUseCase @Inject constructor( suspend operator fun invoke( email: String, password: String, - role: String, + workspace: String, branch: String, userName: String, position: String ): Result = repository.signUp( email = email, password = password, - role = role, + workspace = workspace, branch = branch, userName = userName, position = position diff --git a/app/src/main/java/com/sampoom/android/feature/auth/ui/AuthViewModel.kt b/app/src/main/java/com/sampoom/android/feature/auth/ui/AuthViewModel.kt index 9e47944..eb9caab 100644 --- a/app/src/main/java/com/sampoom/android/feature/auth/ui/AuthViewModel.kt +++ b/app/src/main/java/com/sampoom/android/feature/auth/ui/AuthViewModel.kt @@ -50,7 +50,7 @@ class AuthViewModel @Inject constructor( } fun signOut() = viewModelScope.launch { - signOutUseCase() +// signOutUseCase() _isLoggedIn.value = false _logoutEvent.emit(Unit) } diff --git a/app/src/main/java/com/sampoom/android/feature/auth/ui/SignUpUiState.kt b/app/src/main/java/com/sampoom/android/feature/auth/ui/SignUpUiState.kt index d2fa59b..25a1814 100644 --- a/app/src/main/java/com/sampoom/android/feature/auth/ui/SignUpUiState.kt +++ b/app/src/main/java/com/sampoom/android/feature/auth/ui/SignUpUiState.kt @@ -5,7 +5,7 @@ import com.sampoom.android.feature.auth.domain.model.Vendor data class SignUpUiState( val name: String = "", - val role: String = "AGENCY", + val workspace: String = "AGENCY", val branch: String = "", val position: UserPosition? = null, val email: String = "", diff --git a/app/src/main/java/com/sampoom/android/feature/auth/ui/SignUpViewModel.kt b/app/src/main/java/com/sampoom/android/feature/auth/ui/SignUpViewModel.kt index a99150a..1376f8d 100644 --- a/app/src/main/java/com/sampoom/android/feature/auth/ui/SignUpViewModel.kt +++ b/app/src/main/java/com/sampoom/android/feature/auth/ui/SignUpViewModel.kt @@ -157,7 +157,7 @@ class SignUpViewModel @Inject constructor( singUp( email = s.email, password = s.password, - role = s.role, + workspace = s.workspace, branch = s.branch, userName = s.name, position = s.position!!.name diff --git a/app/src/main/java/com/sampoom/android/feature/user/data/mapper/UserMappers.kt b/app/src/main/java/com/sampoom/android/feature/user/data/mapper/UserMappers.kt index 9924147..e833b89 100644 --- a/app/src/main/java/com/sampoom/android/feature/user/data/mapper/UserMappers.kt +++ b/app/src/main/java/com/sampoom/android/feature/user/data/mapper/UserMappers.kt @@ -14,11 +14,11 @@ 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, @@ -35,11 +35,11 @@ fun UpdateProfileResponseDto.toModel(): User = User( userId = userId, userName = userName, email = "", - role = "", accessToken = "", refreshToken = "", expiresIn = 0L, position = UserPosition.STAFF, + workspace = "", branch = "", agencyId = 0, startedAt = null, @@ -49,8 +49,8 @@ fun UpdateProfileResponseDto.toModel(): User = User( fun EditEmployeeResponseDto.toModel(): Employee = Employee( userId = userId, email = "", - role = role, userName = userName, + workspace = "", organizationId = 0, branch = "", position = position.toUserPosition(), @@ -64,8 +64,8 @@ fun EditEmployeeResponseDto.toModel(): Employee = Employee( fun UpdateEmployeeStatusResponseDto.toModel(): Employee = Employee( userId = userId, email = "", - role = role, userName = userName, + workspace = "", organizationId = 0, branch = "", position = UserPosition.STAFF, @@ -79,8 +79,8 @@ fun UpdateEmployeeStatusResponseDto.toModel(): Employee = Employee( fun EmployeeDto.toModel(): Employee = Employee( userId, email, - role, userName, + workspace, organizationId, branch, position, diff --git a/app/src/main/java/com/sampoom/android/feature/user/data/remote/api/UserApi.kt b/app/src/main/java/com/sampoom/android/feature/user/data/remote/api/UserApi.kt index 180474c..be26fdc 100644 --- a/app/src/main/java/com/sampoom/android/feature/user/data/remote/api/UserApi.kt +++ b/app/src/main/java/com/sampoom/android/feature/user/data/remote/api/UserApi.kt @@ -18,7 +18,7 @@ import retrofit2.http.Query interface UserApi { // 프로필 조회 @GET("user/profile") - suspend fun getProfile(@Query("role") role: String): ApiResponse + suspend fun getProfile(@Query("workspace") workspace: String): ApiResponse // 프로필 수정 @PATCH("user/profile") @@ -28,14 +28,14 @@ interface UserApi { @PATCH("user/profile/{userId}") suspend fun editEmployee( @Path("userId") userId: Long, - @Query("role") role: String, + @Query("workspace") workspace: String, @Body body: EditEmployeeRequestDto ): ApiResponse // 직원 목록 조회 @GET("user/info") suspend fun getEmployeeList( - @Query("role") role: String, + @Query("workspace") workspace: String, @Query("organizationId") organizationId: Long, @Query("page") page: Int = 0, @Query("size") size: Int = 20 @@ -45,7 +45,7 @@ interface UserApi { @PATCH("user/status/{userId}") suspend fun updateEmployeeStatus( @Path("userId") userId: Long, - @Query("role") role: String, + @Query("workspace") workspace: String, @Body body: UpdateEmployeeStatusRequestDto ): ApiResponse } \ No newline at end of file diff --git a/app/src/main/java/com/sampoom/android/feature/user/data/remote/dto/EditEmployeeResponseDto.kt b/app/src/main/java/com/sampoom/android/feature/user/data/remote/dto/EditEmployeeResponseDto.kt index 0e2b93b..d73472b 100644 --- a/app/src/main/java/com/sampoom/android/feature/user/data/remote/dto/EditEmployeeResponseDto.kt +++ b/app/src/main/java/com/sampoom/android/feature/user/data/remote/dto/EditEmployeeResponseDto.kt @@ -3,6 +3,5 @@ package com.sampoom.android.feature.user.data.remote.dto data class EditEmployeeResponseDto( val userId: Long, val userName: String, - val role: String, val position: String ) diff --git a/app/src/main/java/com/sampoom/android/feature/user/data/remote/dto/EmployeeDto.kt b/app/src/main/java/com/sampoom/android/feature/user/data/remote/dto/EmployeeDto.kt index f48abfb..0a8a951 100644 --- a/app/src/main/java/com/sampoom/android/feature/user/data/remote/dto/EmployeeDto.kt +++ b/app/src/main/java/com/sampoom/android/feature/user/data/remote/dto/EmployeeDto.kt @@ -6,8 +6,8 @@ import com.sampoom.android.core.model.UserPosition data class EmployeeDto( val userId: Long, val email: String, - val role: String, val userName: String, + val workspace: String, val organizationId: Long, val branch: String, val position: UserPosition, diff --git a/app/src/main/java/com/sampoom/android/feature/user/data/remote/dto/GetProfileResponseDto.kt b/app/src/main/java/com/sampoom/android/feature/user/data/remote/dto/GetProfileResponseDto.kt index 9a296b5..b54aaef 100644 --- a/app/src/main/java/com/sampoom/android/feature/user/data/remote/dto/GetProfileResponseDto.kt +++ b/app/src/main/java/com/sampoom/android/feature/user/data/remote/dto/GetProfileResponseDto.kt @@ -6,6 +6,7 @@ data class GetProfileResponseDto( val email: String, val role: String, val position: String, + val workspace: String, val branch: String, val organizationId: Long, val startedAt: String, diff --git a/app/src/main/java/com/sampoom/android/feature/user/data/remote/dto/UpdateEmployeeStatusResponseDto.kt b/app/src/main/java/com/sampoom/android/feature/user/data/remote/dto/UpdateEmployeeStatusResponseDto.kt index 303a5d3..2de0dd8 100644 --- a/app/src/main/java/com/sampoom/android/feature/user/data/remote/dto/UpdateEmployeeStatusResponseDto.kt +++ b/app/src/main/java/com/sampoom/android/feature/user/data/remote/dto/UpdateEmployeeStatusResponseDto.kt @@ -3,6 +3,5 @@ package com.sampoom.android.feature.user.data.remote.dto data class UpdateEmployeeStatusResponseDto( val userId: Long, val userName: String, - val role: String, val employeeStatus: String ) diff --git a/app/src/main/java/com/sampoom/android/feature/user/data/repository/UserRepositoryImpl.kt b/app/src/main/java/com/sampoom/android/feature/user/data/repository/UserRepositoryImpl.kt index 4728155..606e344 100644 --- a/app/src/main/java/com/sampoom/android/feature/user/data/repository/UserRepositoryImpl.kt +++ b/app/src/main/java/com/sampoom/android/feature/user/data/repository/UserRepositoryImpl.kt @@ -28,10 +28,10 @@ class UserRepositoryImpl @Inject constructor( } /** 프로필 조회 */ - override suspend fun getProfile(role: String): Result { + override suspend fun getProfile(workspace: String): Result { return runCatching { retry(times = 5, initialDelay = 300) { - val dto = api.getProfile(role) + val dto = api.getProfile(workspace) if (!dto.success) throw Exception(dto.message) val profileUser = dto.data.toModel() val loginUser = preferences.getStoredUser() @@ -41,11 +41,11 @@ class UserRepositoryImpl @Inject constructor( userId = profileUser.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, @@ -76,11 +76,11 @@ class UserRepositoryImpl @Inject constructor( userId = updatedProfile.userId, userName = updatedProfile.userName, email = user.email, - role = user.role, accessToken = storedUser.accessToken, refreshToken = storedUser.refreshToken, expiresIn = storedUser.expiresIn, position = user.position, + workspace = user.workspace, branch = user.branch, agencyId = user.agencyId, startedAt = user.startedAt, @@ -104,7 +104,7 @@ class UserRepositoryImpl @Inject constructor( /** 직원 프로필 수정 */ override suspend fun editEmployee( employee: Employee, - role: String + workspace: String ): Result { return runCatching { val requestDto = EditEmployeeRequestDto( @@ -112,7 +112,7 @@ class UserRepositoryImpl @Inject constructor( ) val dto = api.editEmployee( userId = employee.userId, - role = role, + workspace = workspace, body = requestDto ) if (!dto.success) throw Exception(dto.message) @@ -121,8 +121,8 @@ class UserRepositoryImpl @Inject constructor( val completeEmployee = Employee( userId = updatedEmployee.userId, email = employee.email, - role = updatedEmployee.role.takeIf { it.isNotBlank() } ?: employee.role, userName = updatedEmployee.userName.takeIf { it.isNotBlank() } ?: employee.userName, + workspace = updatedEmployee.workspace.takeIf { it.isNotBlank() } ?: employee.workspace, organizationId = employee.organizationId, branch = employee.branch, position = updatedEmployee.position, @@ -140,7 +140,7 @@ class UserRepositoryImpl @Inject constructor( /** 직원 상태 수정 */ override suspend fun updateEmployeeStatus( employee: Employee, - role: String + workspace: String ): Result { return runCatching { val requestDto = UpdateEmployeeStatusRequestDto( @@ -148,7 +148,7 @@ class UserRepositoryImpl @Inject constructor( ) val dto = api.updateEmployeeStatus( userId = employee.userId, - role = role, + workspace = workspace, body = requestDto ) if (!dto.success) throw Exception(dto.message) @@ -157,8 +157,8 @@ class UserRepositoryImpl @Inject constructor( val completedEmployeeStatus = Employee( userId = updateEmployeeStatus.userId, email = employee.email, - role = updateEmployeeStatus.role.takeIf { it.isNotBlank() } ?: employee.role, userName = updateEmployeeStatus.userName.takeIf { it.isNotBlank() } ?: employee.userName, + workspace = updateEmployeeStatus.workspace.takeIf { it.isNotBlank() } ?: employee.workspace, organizationId = employee.organizationId, branch = employee.branch, position = employee.position, @@ -177,11 +177,11 @@ class UserRepositoryImpl @Inject constructor( override suspend fun getEmployeeCount(): Result { return runCatching { val user = preferences.getStoredUser() ?: throw Exception() - val role = user.role + val workspace = user.workspace val organizationId = user.agencyId val dto = api.getEmployeeList( - role = role, + workspace = workspace, organizationId = organizationId, page = 0, size = 1 diff --git a/app/src/main/java/com/sampoom/android/feature/user/domain/model/Employee.kt b/app/src/main/java/com/sampoom/android/feature/user/domain/model/Employee.kt index 9335cba..6489ecc 100644 --- a/app/src/main/java/com/sampoom/android/feature/user/domain/model/Employee.kt +++ b/app/src/main/java/com/sampoom/android/feature/user/domain/model/Employee.kt @@ -6,8 +6,8 @@ import com.sampoom.android.core.model.UserPosition data class Employee( val userId: Long, val email: String, - val role: String, val userName: String, + val workspace: String, val organizationId: Long, val branch: String, val position: UserPosition, diff --git a/app/src/main/java/com/sampoom/android/feature/user/domain/model/User.kt b/app/src/main/java/com/sampoom/android/feature/user/domain/model/User.kt index 69b3c77..31c2333 100644 --- a/app/src/main/java/com/sampoom/android/feature/user/domain/model/User.kt +++ b/app/src/main/java/com/sampoom/android/feature/user/domain/model/User.kt @@ -6,11 +6,11 @@ data class User( val userId: Long, val userName: String, val email: String, - val role: String, val accessToken: String, val refreshToken: String, val expiresIn: Long, val position: UserPosition, + val workspace: String, val branch: String, val agencyId: Long, val startedAt: String?, diff --git a/app/src/main/java/com/sampoom/android/feature/user/domain/repository/UserRepository.kt b/app/src/main/java/com/sampoom/android/feature/user/domain/repository/UserRepository.kt index 6ac4dec..6c278c0 100644 --- a/app/src/main/java/com/sampoom/android/feature/user/domain/repository/UserRepository.kt +++ b/app/src/main/java/com/sampoom/android/feature/user/domain/repository/UserRepository.kt @@ -7,10 +7,10 @@ import kotlinx.coroutines.flow.Flow interface UserRepository { suspend fun getStoredUser(): User? - suspend fun getProfile(role: String): Result + suspend fun getProfile(workspace: String): Result suspend fun updateProfile(user: User): Result fun getEmployeeList(): Flow> - suspend fun editEmployee(employee: Employee, role: String): Result - suspend fun updateEmployeeStatus(employee: Employee, role: String): Result + suspend fun editEmployee(employee: Employee, workspace: String): Result + suspend fun updateEmployeeStatus(employee: Employee, workspace: String): Result suspend fun getEmployeeCount(): Result } \ No newline at end of file diff --git a/app/src/main/java/com/sampoom/android/feature/user/domain/usecase/EditEmployeeUseCase.kt b/app/src/main/java/com/sampoom/android/feature/user/domain/usecase/EditEmployeeUseCase.kt index 395dbbe..d81d82d 100644 --- a/app/src/main/java/com/sampoom/android/feature/user/domain/usecase/EditEmployeeUseCase.kt +++ b/app/src/main/java/com/sampoom/android/feature/user/domain/usecase/EditEmployeeUseCase.kt @@ -7,5 +7,5 @@ import javax.inject.Inject class EditEmployeeUseCase @Inject constructor( private val repository: UserRepository ) { - suspend operator fun invoke(employee: Employee, role: String): Result = repository.editEmployee(employee, role) + suspend operator fun invoke(employee: Employee, workspace: String): Result = repository.editEmployee(employee, workspace) } \ No newline at end of file diff --git a/app/src/main/java/com/sampoom/android/feature/user/domain/usecase/GetProfileUseCase.kt b/app/src/main/java/com/sampoom/android/feature/user/domain/usecase/GetProfileUseCase.kt index 9151686..3b7e43c 100644 --- a/app/src/main/java/com/sampoom/android/feature/user/domain/usecase/GetProfileUseCase.kt +++ b/app/src/main/java/com/sampoom/android/feature/user/domain/usecase/GetProfileUseCase.kt @@ -7,5 +7,5 @@ import javax.inject.Inject class GetProfileUseCase @Inject constructor( private val repository: UserRepository ) { - suspend operator fun invoke(role: String): Result = repository.getProfile(role) + suspend operator fun invoke(workspace: String): Result = repository.getProfile(workspace) } \ No newline at end of file diff --git a/app/src/main/java/com/sampoom/android/feature/user/domain/usecase/UpdateEmployeeStatusUseCase.kt b/app/src/main/java/com/sampoom/android/feature/user/domain/usecase/UpdateEmployeeStatusUseCase.kt index 0d30ec7..72b08bc 100644 --- a/app/src/main/java/com/sampoom/android/feature/user/domain/usecase/UpdateEmployeeStatusUseCase.kt +++ b/app/src/main/java/com/sampoom/android/feature/user/domain/usecase/UpdateEmployeeStatusUseCase.kt @@ -7,5 +7,5 @@ import javax.inject.Inject class UpdateEmployeeStatusUseCase @Inject constructor( private val repository: UserRepository ) { - suspend operator fun invoke(employee: Employee, role: String): Result = repository.updateEmployeeStatus(employee, role) + suspend operator fun invoke(employee: Employee, workspace: String): Result = repository.updateEmployeeStatus(employee, workspace) } \ No newline at end of file