Change UpdateStudentUserInfUseCase to receive major from parameter

Author: nodobi

domain/src/main/java/in/koreatech/koin/domain/usecase/user/UpdateStudentUserInfoUseCase.kt

@@ -7,13 +7,11 @@ import `in`.koreatech.koin.domain.error.user.UserErrorHandler
 import `in`.koreatech.koin.domain.model.error.ErrorHandler
 import `in`.koreatech.koin.domain.model.user.Gender
 import `in`.koreatech.koin.domain.model.user.User
-import `in`.koreatech.koin.domain.repository.DeptRepository
 import `in`.koreatech.koin.domain.repository.UserRepository
 import `in`.koreatech.koin.domain.util.ext.isValidStudentId
 import javax.inject.Inject
 
 class UpdateStudentUserInfoUseCase @Inject constructor(
-    private val deptRepository: DeptRepository,
     private val userRepository: UserRepository,
     private val userErrorHandler: UserErrorHandler
 ) {
@@ -24,6 +22,7 @@ class UpdateStudentUserInfoUseCase @Inject constructor(
         separatedPhoneNumber: List<String>?,
         gender: Gender?,
         studentId: String,
+        major: String,
         checkedEmailValidation: Boolean
     ): ErrorHandler? {
         return try {
@@ -35,15 +34,13 @@ class UpdateStudentUserInfoUseCase @Inject constructor(
                 throw IllegalStateException(ERROR_USERINFO_GENDER_NOT_SET)
             }
 
-            if(!studentId.isValidStudentId) {
+            if (!studentId.isValidStudentId) {
                 throw IllegalStateException(ERROR_INVALID_STUDENT_ID)
             }
 
-            val newUser: User = when(beforeUser) {
+            val newUser: User = when (beforeUser) {
                 User.Anonymous -> throw IllegalAccessException()
                 is User.Student -> {
-                    val deptString = deptRepository.getDeptNameFromDeptCode(studentId.substring(5..6))
-
                     beforeUser.copy(
                         name = name.trim(),
                         nickname = nickname.trim(),
@@ -55,7 +52,7 @@ class UpdateStudentUserInfoUseCase @Inject constructor(
                         },
                         gender = gender,
                         studentNumber = studentId.trim().ifBlank { null },
-                        major = deptString
+                        major = major
                     )
                 }
             }

koin/src/main/java/in/koreatech/koin/ui/userinfo/UserInfoEditActivity.kt

@@ -61,7 +61,8 @@ class UserInfoEditActivity : KoinNavigationDrawerActivity() {
                         binding.userinfoeditedRadiobuttonGenderWoman.isChecked -> Gender.Woman
                         else -> null
                     },
-                    studentId = binding.userinfoeditedEdittextStudentId.textString
+                    studentId = binding.userinfoeditedEdittextStudentId.textString,
+                    major = userinfoeditedSpinnerMajor.selected.text.toString()
                 )
             }
         )

koin/src/main/java/in/koreatech/koin/ui/userinfo/viewmodel/UserInfoEditViewModel.kt

@@ -18,6 +18,7 @@ import `in`.koreatech.koin.domain.util.onSuccess
 import `in`.koreatech.koin.ui.userinfo.state.NicknameCheckState
 import `in`.koreatech.koin.ui.userinfo.state.NicknameState
 import kotlinx.coroutines.flow.SharingStarted
+import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.filter
 import kotlinx.coroutines.flow.flow
@@ -36,12 +37,6 @@ class UserInfoEditViewModel @Inject constructor(
     private val _user = MutableLiveData<User>()
     val user: LiveData<User> get() = _user
 
-    val depts = flow { emit(getDeptNamesUseCase()) }
-        .combine(user.asFlow()) { depts, user -> depts to user }
-        .filter{ it.second.isStudent }
-        .map { it.first to (it.second as User.Student).major }
-        .stateIn(viewModelScope, SharingStarted.WhileSubscribed(5000), listOf<String>() to null)
-
     private val _getDeptErrorMessage = MutableLiveData<String>()
     val getDeptErrorMessage: LiveData<String> get() = _getDeptErrorMessage
 
@@ -57,6 +52,12 @@ class UserInfoEditViewModel @Inject constructor(
     private val _userInfoEditedEvent = SingleLiveEvent<Unit>()
     val userInfoEditedEvent: LiveData<Unit> get() = _userInfoEditedEvent
 
+    val depts: StateFlow<Pair<List<String>, String?>> = flow { emit(getDeptNamesUseCase()) }
+        .combine(user.asFlow()) { depts, user -> depts to user }
+        .filter { it.second.isStudent }
+        .map { it.first to (it.second as User.Student).major }
+        .stateIn(viewModelScope, SharingStarted.WhileSubscribed(5000), listOf<String>() to null)
+
     fun getUserInfo() = viewModelScope.launchWithLoading {
         getUserInfoUseCase()
             .onSuccess { user ->
@@ -101,7 +102,8 @@ class UserInfoEditViewModel @Inject constructor(
         nickname: String,
         separatedPhoneNumber: List<String>?,
         gender: Gender?,
-        studentId: String
+        studentId: String,
+        major: String
     ) {
         if (isLoading.value == false) {
             viewModelScope.launchWithLoading {
@@ -113,6 +115,7 @@ class UserInfoEditViewModel @Inject constructor(
                         separatedPhoneNumber = separatedPhoneNumber,
                         gender = gender,
                         studentId = studentId,
+                        major = major,
                         checkedEmailValidation = nicknameState.value?.let {
                             it.nickname == nickname && it.isNicknameDuplicated == false
                         } ?: false