Merge pull request #74 from TeamBridge-Project/feature/#72-유효성_검사_의존성_주입

Feature/#72 유효성 검사 의존성 주입

build.gradle

@@ -4,7 +4,6 @@ buildscript {
         compose_version = '1.2.0-alpha04'
         accompanist_version = '0.24.4-alpha'
         nav_version = "2.4.1"
-        dagger_version = "2.41"
         hilt_version = "2.41"
         coroutines_version = "1.6.0"
         retrofit_version = "2.9.0"

domain/build.gradle

@@ -1,6 +1,8 @@
 plugins {
     id 'com.android.library'
     id 'org.jetbrains.kotlin.android'
+    id 'kotlin-kapt'
+    id 'dagger.hilt.android.plugin'
 }
 
 android {
@@ -30,6 +32,7 @@ android {
 }
 
 dependencies {
+    kapt "com.google.dagger:hilt-android-compiler:$hilt_version"
     implementation "com.google.dagger:hilt-android:$hilt_version"
     implementation 'androidx.core:core-ktx:1.7.0'
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutines_version"

domain/src/main/java/com/example/domain/common/SignUpValidation.kt → domain/src/main/java/com/example/domain/common/SignUpValidator.kt

@@ -1,6 +1,6 @@
 package com.example.domain.common
 
-interface SignUpValidation {
+interface SignUpValidator {
     fun isEmailValidity(email: String) : Boolean
 
     fun isPasswordValidity(password: String) : Boolean

domain/src/main/java/com/example/domain/common/impl/SignUpValidationImpl.kt → domain/src/main/java/com/example/domain/common/impl/SignUpValidatorImpl.kt

@@ -1,11 +1,9 @@
 package com.example.domain.common.impl
 
-import com.example.domain.common.SignUpValidation
+import com.example.domain.common.SignUpValidator
 import javax.inject.Inject
-import javax.inject.Singleton
 
-@Singleton
-internal class SignUpValidationImpl @Inject constructor() : SignUpValidation{
+internal class SignUpValidatorImpl @Inject constructor() : SignUpValidator{
     override fun isEmailValidity(email: String): Boolean {
         return email.matches("""^[0-9a-zA-Z]([-_.]?[0-9a-zA-Z])*@[0-9a-zA-Z]([-_.]?[0-9a-zA-Z])*.[.][a-zA-Z]{2,3}$""".toRegex())
     }

domain/src/main/java/com/example/domain/di/DomainModule.kt

@@ -0,0 +1,21 @@
+package com.example.domain.di
+
+import com.example.domain.common.SignUpValidator
+import com.example.domain.common.impl.SignUpValidatorImpl
+import dagger.Binds
+import dagger.Module
+import dagger.hilt.InstallIn
+import dagger.hilt.components.SingletonComponent
+import javax.inject.Singleton
+
+@Module
+@InstallIn(SingletonComponent::class)
+internal interface DomainModule {
+
+    @Binds
+    @Singleton
+    fun bindSignUpValidator(
+        validator: SignUpValidatorImpl
+    ): SignUpValidator
+
+}

presentation/src/main/java/com/example/presentation/signup/SignUpActivity.kt

@@ -137,10 +137,10 @@ fun SignUpScreen(
             SignUpState.PasswordFailed -> {
                 Toast.makeText(activity, "패스워드 형식이 틀렸습니다.", Toast.LENGTH_SHORT).show()
             }
-            SignUpState.NickName -> {
+            SignUpState.NickNameFailed -> {
                 Toast.makeText(activity, "닉네임 형식이 틀렸습니다.", Toast.LENGTH_SHORT).show()
             }
-            SignUpState.Date -> {
+            SignUpState.DateFailed -> {
                 Toast.makeText(activity, "생일 형식이 틀렸습니다.", Toast.LENGTH_SHORT).show()
             }
             else -> {}

presentation/src/main/java/com/example/presentation/signup/SignUpState.kt

@@ -6,6 +6,6 @@ sealed class SignUpState{
     object Loading : SignUpState()
     object EmailFailed : SignUpState()
     object PasswordFailed : SignUpState()
-    object NickName : SignUpState()
-    object Date : SignUpState()
+    object NickNameFailed : SignUpState()
+    object DateFailed : SignUpState()
 }

presentation/src/main/java/com/example/presentation/signup/SignUpViewModel.kt

@@ -4,6 +4,7 @@ import android.app.Activity
 import android.content.Intent
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
+import com.example.domain.common.SignUpValidator
 import com.example.domain.model.SignUpModel
 import com.example.domain.usecase.SignUpUseCase
 import com.example.local.datastore.DataStoreManager
@@ -20,7 +21,8 @@ import javax.inject.Inject
 @HiltViewModel
 class SignUpViewModel @Inject constructor(
     private val signUpUseCase: SignUpUseCase,
-    private val dataStore: DataStoreManager
+    private val dataStore: DataStoreManager,
+    private val signUpValidator: SignUpValidator
 ) : ViewModel() {
 
     private val _uiState = MutableStateFlow<SignUpState>(SignUpState.SignUpNeeded)
@@ -37,14 +39,14 @@ class SignUpViewModel @Inject constructor(
     ) {
         _uiState.value = SignUpState.Loading
 
-        if (!email.matches("""^[0-9a-zA-Z]([-_.]?[0-9a-zA-Z])*@[0-9a-zA-Z]([-_.]?[0-9a-zA-Z])*.[.][a-zA-Z]{2,3}$""".toRegex())) {
+        if (!signUpValidator.isEmailValidity(email)) {
             _uiState.value = SignUpState.EmailFailed
-        } else if(!password.matches("^(?=.*[A-Za-z])(?=.*[0-9])(?=.*[$@$!%*#?&.])[A-Za-z[0-9]$@$!%*#?&.]{8,20}$".toRegex())) {
+        } else if(!signUpValidator.isPasswordValidity(password)) {
             _uiState.value = SignUpState.PasswordFailed
-        } else if(!nickname.matches("^[가-힣a-zA-Z0-9]{2,6}$".toRegex())) {
-            _uiState.value = SignUpState.NickName
-        } else if(!date.matches("^(19[0-9][0-9]|20\\d{2})-(0[0-9]|1[0-2])-(0[1-9]|[1-2][0-9]|3[0-1])$".toRegex())) {
-            _uiState.value = SignUpState.Date
+        } else if(!signUpValidator.isNickNameValidity(nickname)) {
+            _uiState.value = SignUpState.NickNameFailed
+        } else if(!signUpValidator.isDateValidity(date)) {
+            _uiState.value = SignUpState.DateFailed
         } else {
             val charGender = when (gender) {
                 "남" -> "m"