Skip to content

[REFACTOR/#151] Auth 모듈 통신 관련 UseCase 패턴으로 교체 #152

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Nov 13, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 23 additions & 0 deletions app/src/main/java/co/orange/ddanzi/di/module/UseCaseModule.kt
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
package co.orange.ddanzi.di.module

import co.orange.domain.repository.AuthRepository
import co.orange.domain.repository.UserRepository
import co.orange.domain.usecase.AuthChangeTokenUseCase
import dagger.Module
import dagger.Provides
import dagger.hilt.InstallIn
import dagger.hilt.components.SingletonComponent
import javax.inject.Singleton

@Module
@InstallIn(SingletonComponent::class)
class UseCaseModule {
@Singleton

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

UseCase를 특별하게 Singleton으로 만든 이유가 있을까?.?
UseCase는 보통 상태를 가지지 않는 단일 책임 비즈니스 로직이고
이미 repository 단에서 single톤이기에 특별한 이유가 없다면 사용 안해도 될거같슴다

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

오호 ... 하나의 기능 구현이라면 싱글톤이 아닌게 오히려 덜꼬일 것 같기는 하네요 !

@Provides

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yello 때는 별 뜻없이 provide를 사용하긴 했는데 외부 라이브러리 주입이 아니라면 bind로 주입하는걸 추천합니댜,
repository나 dataSource도

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

관련해서도 잔뜩 알아보고 오겠습니당

fun provideAuthChangeTokenUseCase(
authRepository: AuthRepository,
userRepository: UserRepository
): AuthChangeTokenUseCase {
return AuthChangeTokenUseCase(authRepository, userRepository)
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,8 @@ class AuthRepositoryImpl
).data.toModel()
}

override suspend fun postOauthDataToGetToken(request: AuthRequestModel): Result<AuthTokenModel> =
runCatching {
override suspend fun postOauthDataToGetToken(request: AuthRequestModel): AuthTokenModel =
authDataSource.postOauthDataToGetToken(request.toDto()).data.toModel()
}

override suspend fun postToSignUp(
accesstoken: String,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import co.orange.domain.entity.response.SignUpModel
interface AuthRepository {
suspend fun postReissueTokens(request: ReissueRequestModel): Result<ReissueTokenModel>

suspend fun postOauthDataToGetToken(request: AuthRequestModel): Result<AuthTokenModel>
suspend fun postOauthDataToGetToken(request: AuthRequestModel): AuthTokenModel

suspend fun postToSignUp(
accesstoken: String,
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
package co.orange.domain.usecase

import co.orange.domain.entity.request.AuthRequestModel
import co.orange.domain.repository.AuthRepository
import co.orange.domain.repository.UserRepository

class AuthChangeTokenUseCase(
private val authRepository: AuthRepository,
private val userRepository: UserRepository
) {
suspend operator fun invoke(accessToken: String, fcmToken: String) = runCatching {
val authTokenModel = authRepository.postOauthDataToGetToken(
AuthRequestModel(
accessToken,
KAKAO,
userRepository.getDeviceToken(),
ANDROID,
fcmToken,
),
)
userRepository.setTokens(authTokenModel.accesstoken, authTokenModel.refreshtoken)
userRepository.setUserStatus(authTokenModel.status)
return@runCatching authTokenModel.status
}

companion object {
const val KAKAO = "KAKAO"
const val ANDROID = "ANDROID"
}
}
23 changes: 4 additions & 19 deletions feature/auth/src/main/java/co/orange/auth/login/LoginViewModel.kt
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import co.orange.core.state.UiState
import co.orange.domain.entity.request.AuthRequestModel
import co.orange.domain.repository.AuthRepository
import co.orange.domain.repository.UserRepository
import co.orange.domain.usecase.AuthChangeTokenUseCase
import com.google.firebase.messaging.FirebaseMessaging
import com.kakao.sdk.auth.model.OAuthToken
import com.kakao.sdk.common.model.ClientError
Expand All @@ -24,8 +25,7 @@ import javax.inject.Inject
class LoginViewModel
@Inject
constructor(
private val authRepository: AuthRepository,
private val userRepository: UserRepository,
private val authChangeTokenUseCase: AuthChangeTokenUseCase,
) : ViewModel() {
private val _isAppLoginAvailable = MutableStateFlow(true)
val isAppLoginAvailable: StateFlow<Boolean> = _isAppLoginAvailable
Expand Down Expand Up @@ -83,28 +83,13 @@ class LoginViewModel
fcmToken: String,
) {
viewModelScope.launch {
authRepository.postOauthDataToGetToken(
AuthRequestModel(
accessToken,
KAKAO,
userRepository.getDeviceToken(),
ANDROID,
fcmToken,
),
)
authChangeTokenUseCase(accessToken, fcmToken)
.onSuccess {
userRepository.setTokens(it.accesstoken, it.refreshtoken)
userRepository.setUserStatus(it.status)
_changeTokenState.value = UiState.Success(it.status)
_changeTokenState.value = UiState.Success(it)
}
.onFailure {
_changeTokenState.value = UiState.Failure(it.message.orEmpty())
}
}
}

companion object {
const val KAKAO = "KAKAO"
const val ANDROID = "ANDROID"
}
}
Loading