[REFACTOR] #141 : validate -> check로 네이밍 변경 및 통일

pknu-wap · Mar 3, 2024 · 9c542c0 · 9c542c0
1 parent a955f68
commit 9c542c0
Show file tree

Hide file tree

Showing 12 changed files with 22 additions and 21 deletions.
diff --git a/core/data/src/main/java/com/wap/wapp/core/data/repository/auth/AuthRepository.kt b/core/data/src/main/java/com/wap/wapp/core/data/repository/auth/AuthRepository.kt
@@ -7,5 +7,5 @@ interface AuthRepository {
 
     suspend fun isUserSignIn(): Result<Boolean>
 
-    suspend fun validateMemberCode(code: String): Result<Boolean>
+    suspend fun checkMemberCode(code: String): Result<Boolean>
 }
diff --git a/core/data/src/main/java/com/wap/wapp/core/data/repository/auth/AuthRepositoryImpl.kt b/core/data/src/main/java/com/wap/wapp/core/data/repository/auth/AuthRepositoryImpl.kt
@@ -12,6 +12,6 @@ class AuthRepositoryImpl @Inject constructor(
 
     override suspend fun isUserSignIn(): Result<Boolean> = authDataSource.isUserSignIn()
 
-    override suspend fun validateMemberCode(code: String): Result<Boolean> =
-        authDataSource.validateMemberCode(code)
+    override suspend fun checkMemberCode(code: String): Result<Boolean> =
+        authDataSource.checkMemberCode(code)
 }
diff --git a/core/data/src/main/java/com/wap/wapp/core/data/repository/management/ManagementRepository.kt b/core/data/src/main/java/com/wap/wapp/core/data/repository/management/ManagementRepository.kt
@@ -5,7 +5,7 @@ interface ManagementRepository {
 
     suspend fun postManager(userId: String): Result<Unit>
 
-    suspend fun getManagementCode(code: String): Result<Boolean>
+    suspend fun checkManagementCode(code: String): Result<Boolean>
 
     suspend fun deleteManager(userId: String): Result<Unit>
 }
diff --git a/...ta/src/main/java/com/wap/wapp/core/data/repository/management/ManagementRepositoryImpl.kt b/...ta/src/main/java/com/wap/wapp/core/data/repository/management/ManagementRepositoryImpl.kt
@@ -12,8 +12,8 @@ class ManagementRepositoryImpl @Inject constructor(
     override suspend fun postManager(userId: String): Result<Unit> =
         managementDataSource.postManager(userId)
 
-    override suspend fun getManagementCode(code: String): Result<Boolean> =
-        managementDataSource.getManagementCode(code)
+    override suspend fun checkManagementCode(code: String): Result<Boolean> =
+        managementDataSource.checkManagementCode(code)
 
     override suspend fun deleteManager(userId: String): Result<Unit> =
         managementDataSource.deleteManager(userId)

diff --git a/...case/auth/ValidateWapMemberCodeUseCase.kt → ...in/usecase/auth/CheckMemberCodeUseCase.kt b/...case/auth/ValidateWapMemberCodeUseCase.kt → ...in/usecase/auth/CheckMemberCodeUseCase.kt
@@ -1,13 +1,14 @@
 package com.wap.wapp.core.domain.usecase.auth
 
+import com.wap.wapp.core.data.repository.auth.AuthRepository
 import com.wap.wapp.core.domain.model.CodeValidation
 import javax.inject.Inject
 
-class ValidateWapMemberCodeUseCase @Inject constructor(
-    private val signUpRepository: SignUpRepository,
+class CheckMemberCodeUseCase @Inject constructor(
+    private val authRepository: AuthRepository,
 ) {
     suspend operator fun invoke(code: String): Result<CodeValidation> = runCatching {
-        signUpRepository.validationWapCode(code).fold(
+        authRepository.checkMemberCode(code).fold(
             onSuccess = { isValid ->
                 if (isValid) {
                     return@fold CodeValidation.VALID

diff --git a/...nagement/ValidateManagementCodeUseCase.kt → .../management/CheckManagementCodeUseCase.kt b/...nagement/ValidateManagementCodeUseCase.kt → .../management/CheckManagementCodeUseCase.kt
@@ -7,12 +7,12 @@ import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
-class ValidateManagementCodeUseCase @Inject constructor(
+class CheckManagementCodeUseCase @Inject constructor(
     private val managementRepository: ManagementRepository,
     private val userRepository: UserRepository,
 ) {
     suspend operator fun invoke(code: String): Result<CodeValidation> = runCatching {
-        managementRepository.getManagementCode(code)
+        managementRepository.checkManagementCode(code)
             .onSuccess { isValid ->
                 if (isValid.not()) { // 코드가 틀렸을 경우
                     return@runCatching CodeValidation.INVALID

diff --git a/core/network/src/main/java/com/wap/wapp/core/network/source/auth/AuthDataSource.kt b/core/network/src/main/java/com/wap/wapp/core/network/source/auth/AuthDataSource.kt
@@ -7,5 +7,5 @@ interface AuthDataSource {
 
     suspend fun isUserSignIn(): Result<Boolean>
 
-    suspend fun validateMemberCode(code: String): Result<Boolean>
+    suspend fun checkMemberCode(code: String): Result<Boolean>
 }
diff --git a/core/network/src/main/java/com/wap/wapp/core/network/source/auth/AuthDataSourceImpl.kt b/core/network/src/main/java/com/wap/wapp/core/network/source/auth/AuthDataSourceImpl.kt
@@ -49,7 +49,7 @@ class AuthDataSourceImpl @Inject constructor(
         }
     }
 
-    override suspend fun validateMemberCode(code: String): Result<Boolean> = runCatching {
+    override suspend fun checkMemberCode(code: String): Result<Boolean> = runCatching {
         val result = firebaseFirestore.collection(CODES_COLLECTION)
             .whereEqualTo("user", code)
             .get()

diff --git a/...network/src/main/java/com/wap/wapp/core/network/source/management/ManagementDataSource.kt b/...network/src/main/java/com/wap/wapp/core/network/source/management/ManagementDataSource.kt
@@ -5,7 +5,7 @@ interface ManagementDataSource {
 
     suspend fun postManager(userId: String): Result<Unit>
 
-    suspend fun getManagementCode(code: String): Result<Boolean>
+    suspend fun checkManagementCode(code: String): Result<Boolean>
 
     suspend fun deleteManager(userId: String): Result<Unit>
 }
diff --git a/...ork/src/main/java/com/wap/wapp/core/network/source/management/ManagementDataSourceImpl.kt b/...ork/src/main/java/com/wap/wapp/core/network/source/management/ManagementDataSourceImpl.kt
@@ -29,7 +29,7 @@ class ManagementDataSourceImpl @Inject constructor(
             .await()
     }
 
-    override suspend fun getManagementCode(code: String): Result<Boolean> = runCatching {
+    override suspend fun checkManagementCode(code: String): Result<Boolean> = runCatching {
         val result = firebaseFirestore.collection(CODES_COLLECTION)
             .whereEqualTo("management", code)
             .get()

diff --git a/feature/auth/src/main/java/com/wap/wapp/feature/auth/signup/SignUpViewModel.kt b/feature/auth/src/main/java/com/wap/wapp/feature/auth/signup/SignUpViewModel.kt
@@ -3,7 +3,7 @@ package com.wap.wapp.feature.auth.signup
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.wap.wapp.core.domain.model.CodeValidation
-import com.wap.wapp.core.domain.usecase.auth.ValidateWapMemberCodeUseCase
+import com.wap.wapp.core.domain.usecase.auth.CheckMemberCodeUseCase
 import com.wap.wapp.core.domain.usecase.user.PostUserProfileUseCase
 import com.wap.wapp.feature.auth.R
 import dagger.hilt.android.lifecycle.HiltViewModel
@@ -19,7 +19,7 @@ import javax.inject.Inject
 @HiltViewModel
 class SignUpViewModel @Inject constructor(
     private val postUserProfileUseCase: PostUserProfileUseCase,
-    private val validateWapMemberCodeUseCase: ValidateWapMemberCodeUseCase,
+    private val checkMemberCodeUseCase: CheckMemberCodeUseCase,
 ) : ViewModel() {
     private val _signUpEventFlow = MutableSharedFlow<SignUpEvent>()
     val signUpEventFlow: SharedFlow<SignUpEvent> = _signUpEventFlow.asSharedFlow()
@@ -58,7 +58,7 @@ class SignUpViewModel @Inject constructor(
     }
 
     fun validateMemberCode() = viewModelScope.launch {
-        validateWapMemberCodeUseCase(_memberCode.value).onSuccess {
+        checkMemberCodeUseCase(_memberCode.value).onSuccess {
             when (it) {
                 CodeValidation.VALID ->
                     _signUpEventFlow.emit(SignUpEvent.ValidateMemberCodeSuccess)

diff --git a/...src/main/java/com/wap/wapp/feature/management/validation/ManagementValidationViewModel.kt b/...src/main/java/com/wap/wapp/feature/management/validation/ManagementValidationViewModel.kt
@@ -3,7 +3,7 @@ package com.wap.wapp.feature.management.validation
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.wap.wapp.core.domain.model.CodeValidation
-import com.wap.wapp.core.domain.usecase.management.ValidateManagementCodeUseCase
+import com.wap.wapp.core.domain.usecase.management.CheckManagementCodeUseCase
 import com.wap.wapp.feature.management.R
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.flow.MutableStateFlow
@@ -13,7 +13,7 @@ import javax.inject.Inject
 
 @HiltViewModel
 class ManagementValidationViewModel @Inject constructor(
-    private val validateManagementCodeUseCase: ValidateManagementCodeUseCase,
+    private val checkManagementCodeUseCase: CheckManagementCodeUseCase,
 ) : ViewModel() {
     private val _managementCodeUiState: MutableStateFlow<ManagementCodeUiState> =
         MutableStateFlow(ManagementCodeUiState.Init)
@@ -32,7 +32,7 @@ class ManagementValidationViewModel @Inject constructor(
 
     fun validateManagementCode() {
         viewModelScope.launch {
-            validateManagementCodeUseCase(_managementCode.value)
+            checkManagementCodeUseCase(_managementCode.value)
                 .onSuccess {
                     when (it) {
                         CodeValidation.VALID -> {