[Fix] 회원가입 학번 입력 로직 수정

data/src/main/java/in/koreatech/koin/data/repository/DeptRepositoryImpl.kt

@@ -9,7 +9,7 @@ import javax.inject.Inject
 class DeptRepositoryImpl @Inject constructor(
     private val deptRemoteDataSource: DeptRemoteDataSource,
     private val deptLocalDataSource: DeptLocalDataSource
-) : DeptRepository{
+) : DeptRepository {
     override suspend fun getDeptNameFromDeptCode(deptCode: String): String {
         return try {
             val deptResponse = deptRemoteDataSource.getDeptFromDeptCode(deptCode)
@@ -28,4 +28,14 @@ class DeptRepositoryImpl @Inject constructor(
             )
         }
     }
+
+    override suspend fun getDeptNames(): List<String> {
+        return try {
+            deptRemoteDataSource.getAllDepts().map {
+                it.name
+            }
+        } catch (t: Throwable) {
+            deptLocalDataSource.getDeptNames()
+        }
+    }
 }

data/src/main/java/in/koreatech/koin/data/source/local/DeptLocalDataSource.kt

@@ -22,4 +22,17 @@ class DeptLocalDataSource @Inject constructor(
             else -> throw IllegalArgumentException()
         }
     )
+
+    fun getDeptNames() = with(context) {
+        listOf(
+            getString(R.string.major_architectural_engineering),
+            getString(R.string.major_employment_service_policy),
+            getString(R.string.major_mechanical_engineering),
+            getString(R.string.major_architectural_engineering),
+            getString(R.string.major_architectural_engineering),
+            getString(R.string.major_architectural_engineering),
+            getString(R.string.major_architectural_engineering),
+            getString(R.string.major_architectural_engineering),
+        )
+    }
 }

data/src/main/res/values/strings.xml

@@ -4,6 +4,8 @@
     <string name="error_internal_server_error">서버 오류가 발생했습니다.</string>
     <string name="error_network_connection">네트워크 연결을 확인해 주세요.</string>
     <string name="error_network_unknown">알 수 없는 오류가 발생했습니다.</string>
+    <string name="error_login_incorrect">아이디 또는 비밀번호가 올바르지 않습니다.</string>
+    <string name="error_network">서버 오류가 발생했습니다.</string>
 
     <!-- Forgot password error-->
     <string name="error_forgotpassword_no_user">가입되지 않은 아이디입니다.</string>
@@ -43,6 +45,7 @@
     <string name="bus_name_shuttle">셔틀버스</string>
     <string name="bus_name_school_shuttle">학교셔틀</string>
     <string name="city_bus_number_format">%1$d번 버스</string>
+
     <!-- dept -->
     <string name="dept_mechanical_engineering">기계공학부</string>
     <string name="dept_mechatronics_engineering">메카트로닉스공학부</string>
@@ -56,8 +59,19 @@
     <string name="dept_hrd">HRD</string>
     <string name="dept_department_of_future_technology">융합</string>
     <string name="dept_liberal_arts">교양학부</string>
-    <string name="error_login_incorrect">아이디 또는 비밀번호가 올바르지 않습니다.</string>
-    <string name="error_network">서버 오류가 발생했습니다.</string>
+
+    <!--major-->
+    <string name="major_architectural_engineering">건축공학부</string>
+    <string name="major_employment_service_policy">고용서비스정책학과</string>
+    <string name="major_mechanical_engineering">기계공학부</string>
+    <string name="major_industrial_design">디자인공학부</string>
+    <string name="major_mechatronics_engineering">메카트로닉스공학부</string>
+    <string name="major_industrial_management">산업경영학부</string>
+    <string name="major_electrical_electronics_and_communication_engineering">전기전자통신공학부</string>
+    <string name="major_computer_science_and_engineering">컴퓨터공학부</string>
+    <string name="major_chemical_engineering">화학생명공학부</string>
+    <string name="major_energy_meterials_chemical_engineering">에너지신소재화학공학부</string>
+
     <!-- dining -->
     <string name="dining_breakfast">아침</string>
     <string name="dining_lunch">점심</string>

domain/src/main/java/in/koreatech/koin/domain/model/user/Dept.kt

@@ -1,7 +1,7 @@
 package `in`.koreatech.koin.domain.model.user
 
 data class Dept(
-    private val name: String,
-    private val curriculumUrl: String,
-    private val codes: List<String>
+    val name: String,
+    val curriculumUrl: String,
+    val codes: List<String>
 )

domain/src/main/java/in/koreatech/koin/domain/repository/DeptRepository.kt

@@ -5,4 +5,5 @@ import `in`.koreatech.koin.domain.model.user.Dept
 interface DeptRepository {
     suspend fun getDeptNameFromDeptCode(deptCode: String): String
     suspend fun getDepts(): List<Dept>
+    suspend fun getDeptNames(): List<String>
 }

domain/src/main/java/in/koreatech/koin/domain/usecase/dept/GetDeptNamesUseCase.kt

@@ -0,0 +1,12 @@
+package `in`.koreatech.koin.domain.usecase.dept
+
+import `in`.koreatech.koin.domain.repository.DeptRepository
+import javax.inject.Inject
+
+class GetDeptNamesUseCase @Inject constructor(
+    private val deptRepository: DeptRepository,
+) {
+    suspend operator fun invoke(): List<String> {
+        return deptRepository.getDeptNames()
+    }
+}

gradle/libs.versions.toml

@@ -51,6 +51,7 @@ hiltComposeVersion="1.0.0"
 markermanVersion="2.3.0"
 coilVersion = "1.2.0"
 napier = "2.6.1"
+powerSpinner = "1.2.7"
 
 [libraries]
 androidx-activity-ktx = { module = "androidx.activity:activity-ktx", version.ref = "activityKtxVersion" }
@@ -138,6 +139,9 @@ markerman-roundedImageView={module= "com.makeramen:roundedimageview", version.re
 coil ={module = "io.coil-kt:coil", version.ref ="coilVersion"}
 coil-svg = {module = "io.coil-kt:coil-svg", version.ref ="coilVersion"}
 
+powerSpinner = {module = "com.github.skydoves:powerspinner", version.ref = "powerSpinner"}
+
+
 [plugins]
 android-application = { id = "com.android.application", version.ref = "androidGradleVersion" }
 kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlinVersion" }

koin/build.gradle

@@ -130,4 +130,5 @@ dependencies {
     implementation(libs.coil)
 
     implementation(libs.napier)
+    implementation(libs.powerSpinner)
 }

koin/src/main/java/in/koreatech/koin/ui/signup/SignUpWithDetailInfoActivity.kt

@@ -2,12 +2,14 @@ package `in`.koreatech.koin.ui.signup
 
 import android.content.Intent
 import android.os.Bundle
+import android.util.Log
 import android.view.MotionEvent
 import androidx.activity.viewModels
 import androidx.core.widget.addTextChangedListener
 import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.flowWithLifecycle
 import androidx.lifecycle.lifecycleScope
+import androidx.lifecycle.repeatOnLifecycle
 import dagger.hilt.android.AndroidEntryPoint
 import `in`.koreatech.koin.R
 import `in`.koreatech.koin.core.activity.ActivityBase
@@ -23,7 +25,6 @@ import `in`.koreatech.koin.ui.signup.SignupActivity.Companion.SIGN_UP_PASSWORD
 import `in`.koreatech.koin.ui.signup.viewmodel.SignupViewModel
 import `in`.koreatech.koin.util.SnackbarUtil
 import `in`.koreatech.koin.util.ext.hideKeyboard
-import `in`.koreatech.koin.util.ext.observeLiveData
 import `in`.koreatech.koin.util.ext.textString
 import `in`.koreatech.koin.util.ext.withLoading
 import kotlinx.coroutines.launch
@@ -50,31 +51,35 @@ class SignupWithDetailInfoActivity : ActivityBase() {
         getUserDataFromSignupActivity()
         checkNickname()
         continueSignup()
-        addTextChangedListenerWithNicknameAndDept()
-        autoInputMajor()
-    }
+        initSpinner()
+//        addTextChangedListenerWithNicknameAndDept()
+//        autoInputMajor()
+
 
-    private fun autoInputMajor() {
-        binding.signupUserEdittextMajor.apply {
-            isEnabled = false
-            hint = context.getString(R.string.user_info_id_hint)
-        }
     }
 
+//    private fun autoInputMajor() {
+//        binding.signupUserEdittextMajor.apply {
+//            isEnabled = false
+//            hint = context.getString(R.string.user_info_id_hint)
+//        }
+//    }
+
     private fun addTextChangedListenerWithNicknameAndDept() {
         binding.signupUserEdittextNickName.addTextChangedListener {
             if (signupViewModel.isCheckedNickname) signupViewModel.isCheckedNickname = false
         }
 
-        binding.signupUserEdittextStudentId.addTextChangedListener {
-            if (signupViewModel.isPerformDept) signupViewModel.isPerformDept = false
-            signupViewModel.getDept(it.toString())
-        }
+//        binding.signupUserEdittextStudentId.addTextChangedListener {
+//            if (signupViewModel.isPerformDept) signupViewModel.isPerformDept = false
+//            signupViewModel.getDept(it.toString())
+//        }
     }
 
     private fun continueSignup() {
         with(binding) {
             signupSendVerificationButton.setOnClickListener {
+                Log.d("dhk", "Submited major: ${spinnerSignupUserMajor.text}")
                 signupViewModel.continueDetailSignup(
                     portalAccount = signupViewModel.portalEmail,
                     gender = when {
@@ -87,7 +92,7 @@ class SignupWithDetailInfoActivity : ActivityBase() {
                         signupUserRadiobuttonStudent.isChecked -> Graduated.Student
                         else -> null
                     },
-                    major = signupUserEdittextMajor.text.toString(),
+                    major = spinnerSignupUserMajor.text.toString(),
                     name = signupUserEdittextName.text.toString().trim(),
                     nickName = signupUserEdittextNickName.text.toString().trim(),
                     password = signupViewModel.password.trim(),
@@ -104,6 +109,16 @@ class SignupWithDetailInfoActivity : ActivityBase() {
         }
     }
 
+    private fun initSpinner() = with(binding.spinnerSignupUserMajor) {
+        lifecycleOwner = this@SignupWithDetailInfoActivity
+
+
+        setOnSpinnerItemSelectedListener<String> { oldIndex, oldItem, newIndex, newItem ->
+            Log.d("dhk", "major select from $oldItem to $newItem")
+        }
+    }
+
+
     private fun checkNickname() {
         binding.signupUserButtonNicknameCheck.setOnClickListener {
             if (binding.signupUserEdittextNickName.text.toString() != "") {
@@ -130,19 +145,19 @@ class SignupWithDetailInfoActivity : ActivityBase() {
                 when (state) {
                     SignupContinuationState.InitName -> SnackbarUtil.makeShortSnackbar(binding.root, getString(R.string.signup_init_name))
 
-                    SignupContinuationState.InitPhoneNumber -> SnackbarUtil.makeShortSnackbar(binding.root,getString(R.string.signup_init_phone_number))
+                    SignupContinuationState.InitPhoneNumber -> SnackbarUtil.makeShortSnackbar(binding.root, getString(R.string.signup_init_phone_number))
 
                     SignupContinuationState.InitStudentId -> SnackbarUtil.makeShortSnackbar(binding.root, getString(R.string.signup_init_student_id))
 
-                    SignupContinuationState.CheckNickName -> SnackbarUtil.makeShortSnackbar(binding.root,getString(R.string.signup_check_nickname))
+                    SignupContinuationState.CheckNickName -> SnackbarUtil.makeShortSnackbar(binding.root, getString(R.string.signup_check_nickname))
 
-                    SignupContinuationState.CheckGender -> SnackbarUtil.makeShortSnackbar(binding.root,getString(R.string.signup_check_gender))
+                    SignupContinuationState.CheckGender -> SnackbarUtil.makeShortSnackbar(binding.root, getString(R.string.signup_check_gender))
 
                     SignupContinuationState.CheckGraduate -> SnackbarUtil.makeShortSnackbar(binding.root, getString(R.string.signup_check_graduate))
 
                     SignupContinuationState.CheckDept -> SnackbarUtil.makeShortSnackbar(binding.root, getString(R.string.user_info_no_major))
 
-                    SignupContinuationState.NicknameDuplicated -> SnackbarUtil.makeShortSnackbar(binding.root,getString(R.string.error_nickname_duplicated))
+                    SignupContinuationState.NicknameDuplicated -> SnackbarUtil.makeShortSnackbar(binding.root, getString(R.string.error_nickname_duplicated))
 
                     SignupContinuationState.AvailableNickname -> SnackbarUtil.makeShortSnackbar(binding.root, getString(R.string.signup_nickname_available))
 
@@ -164,13 +179,12 @@ class SignupWithDetailInfoActivity : ActivityBase() {
             }
         }
 
-        observeLiveData(dept) {
-            binding.signupUserEdittextMajor.setText(it)
-            binding.signupUserEdittextMajorError.text = ""
-        }
-
-        observeLiveData(getDeptErrorMessage) {
-            binding.signupUserEdittextMajorError.text = it
+        lifecycleScope.launch {
+            repeatOnLifecycle(Lifecycle.State.STARTED) {
+                signupViewModel.depts.collect { deptNames ->
+                    binding.spinnerSignupUserMajor.setItems(deptNames)
+                }
+            }
         }
     }
 

koin/src/main/java/in/koreatech/koin/ui/signup/viewmodel/SignupViewModel.kt

@@ -1,22 +1,23 @@
 package `in`.koreatech.koin.ui.signup.viewmodel
 
-import androidx.lifecycle.LiveData
-import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.viewModelScope
 import dagger.hilt.android.lifecycle.HiltViewModel
 import `in`.koreatech.koin.core.viewmodel.BaseViewModel
-import `in`.koreatech.koin.core.viewmodel.SingleLiveEvent
 import `in`.koreatech.koin.domain.model.user.Gender
 import `in`.koreatech.koin.domain.model.user.Graduated
 import `in`.koreatech.koin.domain.state.signup.SignupContinuationState
-import `in`.koreatech.koin.domain.usecase.dept.GetDeptNameFromStudentIdUseCase
+import `in`.koreatech.koin.domain.usecase.dept.GetDeptNamesUseCase
 import `in`.koreatech.koin.domain.usecase.signup.CheckEmailValidationUseCase
 import `in`.koreatech.koin.domain.usecase.signup.SignupCheckingUseCase
 import `in`.koreatech.koin.domain.usecase.signup.SignupRequestEmailVerificationUseCase
 import `in`.koreatech.koin.domain.usecase.user.CheckNicknameValidationUseCase
 import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.flow.SharedFlow
+import kotlinx.coroutines.flow.SharingStarted
+import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.asSharedFlow
+import kotlinx.coroutines.flow.flow
+import kotlinx.coroutines.flow.stateIn
 import kotlinx.coroutines.launch
 import javax.inject.Inject
 
@@ -26,21 +27,25 @@ class SignupViewModel @Inject constructor(
     private val signupRequestEmailVerificationUseCase: SignupRequestEmailVerificationUseCase,
     private val checkNicknameValidationUseCase: CheckNicknameValidationUseCase,
     private val checkEmailValidationUseCase: CheckEmailValidationUseCase,
-    private val deptNameFromStudentIdUseCase: GetDeptNameFromStudentIdUseCase,
+    private val getDeptNamesUseCase: GetDeptNamesUseCase,
 ) : BaseViewModel() {
     var portalEmail: String = ""
     var password: String = ""
     var isCheckedNickname: Boolean = false
-    var isPerformDept: Boolean = false
+//    var isPerformDept: Boolean = false
 
     private val _signupContinuationState = MutableSharedFlow<SignupContinuationState>()
     val signupContinuationState: SharedFlow<SignupContinuationState> = _signupContinuationState.asSharedFlow()
 
-    private val _dept = MutableLiveData<String>()
-    val dept: LiveData<String> get() = _dept
+//    학부 선택을 Spinner 로 구현하도록 변경되며 주석처리
+//    private val _dept = MutableLiveData<String>()
+//    val dept: LiveData<String> get() = _dept
 
-    private val _getDeptErrorMessage = MutableLiveData<String>()
-    val getDeptErrorMessage: LiveData<String> get() = _getDeptErrorMessage
+    val depts: StateFlow<List<String>> = flow { emit(getDeptNamesUseCase()) }
+        .stateIn(viewModelScope, SharingStarted.WhileSubscribed(5000), listOf())
+
+//    private val _getDeptErrorMessage = MutableLiveData<String>()
+//    val getDeptErrorMessage: LiveData<String> get() = _getDeptErrorMessage
 
     fun setAccount(portalEmail: String, password: String) {
         this.portalEmail = portalEmail
@@ -54,9 +59,9 @@ class SignupViewModel @Inject constructor(
         isAgreedPrivacyTerms: Boolean,
         isAgreedKoinTerms: Boolean,
     ) {
-
         viewModelScope.launch {
-            signupCheckingUseCase(portalAccount, password, passwordConfirm, isAgreedPrivacyTerms, isAgreedKoinTerms
+            signupCheckingUseCase(
+                portalAccount, password, passwordConfirm, isAgreedPrivacyTerms, isAgreedKoinTerms
             ).let {
                 _signupContinuationState.emit(it)
             }
@@ -78,16 +83,7 @@ class SignupViewModel @Inject constructor(
         if (isLoading.value == false) {
             viewModelScope.launch {
                 signupRequestEmailVerificationUseCase(
-                    portalAccount,
-                    gender,
-                    isGraduated,
-                    major,
-                    name,
-                    nickName,
-                    password,
-                    phoneNumber,
-                    studentNumber,
-                    isCheckNickname
+                    portalAccount, gender, isGraduated, major, name, nickName, password, phoneNumber, studentNumber, isCheckNickname
                 ).onSuccess {
                     _signupContinuationState.emit(it)
                 }.onFailure {
@@ -128,7 +124,9 @@ class SignupViewModel @Inject constructor(
         }
     }
 
-    fun getDept(studentId: String) = viewModelScope.launchIgnoreCancellation {
+    /* 학부 선택을 Spinner 로 구현하도록 변경되며 주석처리
+     * TODO:: Spinner 자동 입력되도록 변경
+     fun getDept(studentId: String) = viewModelScope.launchIgnoreCancellation {
         deptNameFromStudentIdUseCase(studentId).let { (deptName, error) ->
             deptName?.let {
                 _dept.value = it
@@ -137,4 +135,5 @@ class SignupViewModel @Inject constructor(
             error?.let { _getDeptErrorMessage.value = error.message }
         }
     }
+    */
 }