[AN/USER] feat: 학생 인증 화면 구현 (#370)

android/festago/app/build.gradle.kts

@@ -137,6 +137,9 @@ dependencies {
     // Encrypted SharedPreference
     implementation("androidx.security:security-crypto-ktx:1.1.0-alpha06")
 
+    // turbine
+    testImplementation("app.cash.turbine:turbine:1.0.0")
+
     // domain
     implementation(project(":domain"))
 }

android/festago/app/src/main/AndroidManifest.xml

@@ -18,7 +18,7 @@
         android:usesCleartextTraffic="true"
         tools:targetApi="31">
         <activity
-            android:name=".presentation.ui.studentsverification.StudentVerificationActivity"
+            android:name=".presentation.ui.studentverification.StudentVerificationActivity"
             android:exported="false" />
         <activity
             android:name=".presentation.ui.signin.SignInActivity"
@@ -58,7 +58,7 @@
         </activity>
         <activity
             android:name=".presentation.ui.tickethistory.TicketHistoryActivity"
-            android:exported="false"></activity>
+            android:exported="false" />
     </application>
 
 </manifest>

android/festago/app/src/main/java/com/festago/festago/data/repository/StudentVerificationDefaultRepository.kt

@@ -0,0 +1,20 @@
+package com.festago.festago.data.repository
+
+import com.festago.festago.data.service.StudentVerificationRetrofitService
+import com.festago.festago.model.StudentVerificationCode
+import com.festago.festago.repository.StudentVerificationRepository
+
+class StudentVerificationDefaultRepository(
+    private val studentVerificationRetrofitService: StudentVerificationRetrofitService,
+) : StudentVerificationRepository {
+
+    override suspend fun sendVerificationCode(userName: String, schoolId: Long): Result<Unit> {
+        // TODO: API 연동 작업 필요
+        return Result.success(Unit)
+    }
+
+    override suspend fun requestVerificationCodeConfirm(code: StudentVerificationCode): Result<Unit> {
+        // TODO: API 연동 작업 필요
+        return Result.success(Unit)
+    }
+}

android/festago/app/src/main/java/com/festago/festago/data/service/StudentsVerificationRetrofitService.kt → android/festago/app/src/main/java/com/festago/festago/data/service/StudentVerificationRetrofitService.kt

@@ -5,7 +5,7 @@ import retrofit2.Response
 import retrofit2.http.Body
 import retrofit2.http.POST
 
-interface StudentsVerificationRetrofitService {
+interface StudentVerificationRetrofitService {
     @POST("/students/send-verification")
     suspend fun sendVerificationCode(
         @Body sendVerificationRequest: SendVerificationRequest,

android/festago/app/src/main/java/com/festago/festago/di/AuthServiceContainer.kt

@@ -1,7 +1,7 @@
 package com.festago.festago.di
 
 import com.festago.festago.data.retrofit.AuthInterceptor
-import com.festago.festago.data.service.StudentsVerificationRetrofitService
+import com.festago.festago.data.service.StudentVerificationRetrofitService
 import com.festago.festago.data.service.TicketRetrofitService
 import com.festago.festago.data.service.UserRetrofitService
 import com.jakewharton.retrofit2.converter.kotlinx.serialization.asConverterFactory
@@ -31,7 +31,7 @@ class AuthServiceContainer(baseUrl: String, tokenContainer: TokenContainer) {
         authRetrofit.create(UserRetrofitService::class.java)
     }
 
-    val studentsVerificationRetrofitService: StudentsVerificationRetrofitService by lazy {
-        authRetrofit.create(StudentsVerificationRetrofitService::class.java)
+    val studentVerificationRetrofitService: StudentVerificationRetrofitService by lazy {
+        authRetrofit.create(StudentVerificationRetrofitService::class.java)
     }
 }

android/festago/app/src/main/java/com/festago/festago/di/RepositoryContainer.kt

@@ -4,14 +4,14 @@ import com.festago.festago.data.repository.AuthDefaultRepository
 import com.festago.festago.data.repository.FestivalDefaultRepository
 import com.festago.festago.data.repository.ReservationTicketDefaultRepository
 import com.festago.festago.data.repository.SchoolDefaultRepository
-import com.festago.festago.data.repository.StudentsVerificationDefaultRepository
+import com.festago.festago.data.repository.StudentVerificationDefaultRepository
 import com.festago.festago.data.repository.TicketDefaultRepository
 import com.festago.festago.data.repository.UserDefaultRepository
 import com.festago.festago.repository.AuthRepository
 import com.festago.festago.repository.FestivalRepository
 import com.festago.festago.repository.ReservationTicketRepository
 import com.festago.festago.repository.SchoolRepository
-import com.festago.festago.repository.StudentsVerificationRepository
+import com.festago.festago.repository.StudentVerificationRepository
 import com.festago.festago.repository.TicketRepository
 import com.festago.festago.repository.UserRepository
 
@@ -45,9 +45,9 @@ class RepositoryContainer(
             reservationTicketRetrofitService = normalServiceContainer.reservationTicketRetrofitService,
         )
 
-    val studentsVerificationRepository: StudentsVerificationRepository
-        get() = StudentsVerificationDefaultRepository(
-            studentsVerificationRetrofitService = authServiceContainer.studentsVerificationRetrofitService,
+    val studentVerificationRepository: StudentVerificationRepository
+        get() = StudentVerificationDefaultRepository(
+            studentVerificationRetrofitService = authServiceContainer.studentVerificationRetrofitService,
         )
 
     val schoolRepository: SchoolRepository

android/festago/app/src/main/java/com/festago/festago/presentation/ui/ViewModelFactory.kt

@@ -8,7 +8,7 @@ import com.festago.festago.presentation.ui.home.festivallist.FestivalListViewMod
 import com.festago.festago.presentation.ui.home.mypage.MyPageViewModel
 import com.festago.festago.presentation.ui.home.ticketlist.TicketListViewModel
 import com.festago.festago.presentation.ui.signin.SignInViewModel
-import com.festago.festago.presentation.ui.studentsverification.StudentsVerificationViewModel
+import com.festago.festago.presentation.ui.studentverification.StudentVerificationViewModel
 import com.festago.festago.presentation.ui.ticketentry.TicketEntryViewModel
 import com.festago.festago.presentation.ui.tickethistory.TicketHistoryViewModel
 import com.festago.festago.presentation.ui.ticketreserve.TicketReserveViewModel
@@ -64,9 +64,9 @@ val FestagoViewModelFactory: ViewModelProvider.Factory = object : ViewModelProvi
                 analyticsHelper = analysisContainer.analyticsHelper,
             )
 
-            modelClass.isAssignableFrom(StudentsVerificationViewModel::class.java) -> StudentsVerificationViewModel(
+            modelClass.isAssignableFrom(StudentVerificationViewModel::class.java) -> StudentVerificationViewModel(
                 schoolRepository = repositoryContainer.schoolRepository,
-                studentsVerificationRepository = repositoryContainer.studentsVerificationRepository,
+                studentVerificationRepository = repositoryContainer.studentVerificationRepository,
                 analyticsHelper = analysisContainer.analyticsHelper,
             )
 

android/festago/app/src/main/java/com/festago/festago/presentation/ui/home/mypage/MyPageFragment.kt

@@ -12,7 +12,7 @@ import com.festago.festago.databinding.FragmentMyPageBinding
 import com.festago.festago.presentation.ui.FestagoViewModelFactory
 import com.festago.festago.presentation.ui.home.HomeActivity
 import com.festago.festago.presentation.ui.signin.SignInActivity
-import com.festago.festago.presentation.ui.studentsverification.StudentVerificationActivity
+import com.festago.festago.presentation.ui.studentverification.StudentVerificationActivity
 import com.festago.festago.presentation.ui.tickethistory.TicketHistoryActivity
 
 class MyPageFragment : Fragment(R.layout.fragment_my_page) {

android/festago/app/src/main/java/com/festago/festago/presentation/ui/studentsverification/StudentVerificationActivity.kt → android/festago/app/src/main/java/com/festago/festago/presentation/ui/studentverification/StudentVerificationActivity.kt

@@ -1,35 +1,33 @@
-package com.festago.festago.presentation.ui.studentsverification
+package com.festago.festago.presentation.ui.studentverification
 
 import android.content.Context
 import android.content.Intent
 import android.os.Bundle
 import androidx.activity.viewModels
 import androidx.appcompat.app.AppCompatActivity
-import androidx.lifecycle.Lifecycle
-import androidx.lifecycle.lifecycleScope
-import androidx.lifecycle.repeatOnLifecycle
 import com.festago.festago.R
 import com.festago.festago.databinding.ActivityStudentVerificationBinding
 import com.festago.festago.presentation.ui.FestagoViewModelFactory
-import kotlinx.coroutines.launch
+import com.festago.festago.presentation.util.repeatOnStarted
 import java.time.LocalTime
 import java.time.format.DateTimeFormatter
 
 class StudentVerificationActivity : AppCompatActivity() {
 
-    private lateinit var binding: ActivityStudentVerificationBinding
+    private val binding: ActivityStudentVerificationBinding by lazy {
+        ActivityStudentVerificationBinding.inflate(layoutInflater)
+    }
 
-    private val vm: StudentsVerificationViewModel by viewModels { FestagoViewModelFactory }
+    private val vm: StudentVerificationViewModel by viewModels { FestagoViewModelFactory }
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         initBinding()
-        initObserving()
         initView()
+        initObserve()
     }
 
     private fun initBinding() {
-        binding = ActivityStudentVerificationBinding.inflate(layoutInflater)
         setContentView(binding.root)
         binding.lifecycleOwner = this
         binding.vm = vm
@@ -47,20 +45,27 @@ class StudentVerificationActivity : AppCompatActivity() {
         }
     }
 
-    private fun initObserving() {
-        lifecycleScope.launch {
-            repeatOnLifecycle(Lifecycle.State.STARTED) {
-                vm.uiState.collect { uiState ->
-                    binding.uiState = uiState
-                    when (uiState) {
-                        is StudentVerificationUiState.Success -> handleSuccess(uiState)
-                        is StudentVerificationUiState.Loading, StudentVerificationUiState.Error -> {}
-                    }
-                }
+    private fun initObserve() {
+        repeatOnStarted {
+            vm.uiState.collect { uiState ->
+                handleUiState(uiState)
+            }
+        }
+        repeatOnStarted {
+            vm.event.collect { event ->
+                handleEvent(event)
             }
         }
     }
 
+    private fun handleUiState(uiState: StudentVerificationUiState) {
+        binding.uiState = uiState
+        when (uiState) {
+            is StudentVerificationUiState.Success -> handleSuccess(uiState)
+            is StudentVerificationUiState.Loading, StudentVerificationUiState.Error -> Unit
+        }
+    }
+
     private fun handleSuccess(uiState: StudentVerificationUiState.Success) {
         binding.tvSchoolEmail.text =
             getString(R.string.student_verification_tv_email_format, uiState.schoolEmail)
@@ -73,9 +78,18 @@ class StudentVerificationActivity : AppCompatActivity() {
         binding.btnVerificationConfirm.isEnabled = uiState.isValidateCode
     }
 
+    private fun handleEvent(event: StudentVerificationEvent) {
+        when (event) {
+            is StudentVerificationEvent.VerificationSuccess -> Unit
+            is StudentVerificationEvent.VerificationFailure -> Unit
+            is StudentVerificationEvent.CodeTimeOut -> Unit
+        }
+    }
+
     companion object {
 
         private const val KEY_SCHOOL_ID = "KEY_SCHOOL_ID"
+
         fun getIntent(context: Context, schoolId: Long): Intent {
             return Intent(context, StudentVerificationActivity::class.java).apply {
                 putExtra(KEY_SCHOOL_ID, schoolId)

android/festago/app/src/main/java/com/festago/festago/presentation/ui/studentverification/StudentVerificationEvent.kt

@@ -0,0 +1,7 @@
+package com.festago.festago.presentation.ui.studentverification
+
+sealed interface StudentVerificationEvent {
+    object CodeTimeOut : StudentVerificationEvent
+    object VerificationFailure : StudentVerificationEvent
+    object VerificationSuccess : StudentVerificationEvent
+}

android/festago/app/src/main/java/com/festago/festago/presentation/ui/studentsverification/StudentVerificationUiState.kt → android/festago/app/src/main/java/com/festago/festago/presentation/ui/studentverification/StudentVerificationUiState.kt

@@ -1,4 +1,4 @@
-package com.festago.festago.presentation.ui.studentsverification
+package com.festago.festago.presentation.ui.studentverification
 
 sealed interface StudentVerificationUiState {
     object Loading : StudentVerificationUiState