[Feat] 7주차 필수과제 #13
+292
−128
There are no files selected for viewing
|
There was a problem hiding this comment.
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,36 @@ | ||
| package org.sopt.and.presentation.ui.auth.screen | ||
|
|
||
| import org.sopt.and.presentation.util.base.UiEvent | ||
| import org.sopt.and.presentation.util.base.UiSideEffect | ||
| import org.sopt.and.presentation.util.base.UiState | ||
|
|
||
| class AuthContract { | ||
| data class AuthUiState( | ||
|
There was a problem hiding this comment.
|
||
| val signInState: SignInState = SignInState.Idle, | ||
| val signInUsername: String = "", | ||
| val signInPassword: String = "", | ||
| val signUpState: SignUpState = SignUpState.Idle, | ||
| val signUpUsername: String = "", | ||
| val signUpPassword: String = "", | ||
| val signUpHobby: String = "", | ||
| ) : UiState | ||
|
|
||
| sealed class AuthEvent : UiEvent { | ||
| data class UpdateSignInUsername(val signInUsername: String) : AuthEvent() | ||
| data class UpdateSignInPassword(val signInPassword: String) : AuthEvent() | ||
|
Comment on lines
+19
to
+20
There was a problem hiding this comment. 1번에 대해서 말씀드리자면, 와 같이 하나의 함수에서 처리할 수 있는 것 불필요한 객체를 참조한다고 여겨져서 혹시 Event에 사용 목적이 따로있으신가요 There was a problem hiding this comment. 값이 바뀔 때 다른 무언가 처리를 한다거나 해야한다면 이벤트를 쓰는 것도 좋다고 생각하는데 아직은 잘 안보여서요 |
||
| data class OnSignInClicked(val signInState: SignInState) : AuthEvent() | ||
| data object ResetSignInState : AuthEvent() | ||
| data class UpdateSignUpUsername(val signUpUsername: String) : AuthEvent() | ||
| data class UpdateSignUpPassword(val signUpPassword: String) : AuthEvent() | ||
| data class UpdateSignUpHobby(val signUpHobby: String) : AuthEvent() | ||
| data class OnSignUpClicked(val signUpState: SignUpState) : AuthEvent() | ||
| data object ResetSignUpState : AuthEvent() | ||
| } | ||
|
|
||
| sealed interface AuthSideEffect : UiSideEffect { | ||
| data object NavigateToSignIn : AuthSideEffect | ||
| data object NavigateToSignUp : AuthSideEffect | ||
| data object NavigateToMain : AuthSideEffect | ||
| data class ShowToast(val message: String) : AuthSideEffect | ||
| } | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,73 +1,115 @@ | ||
| package org.sopt.and.presentation.ui.auth.screen | ||
|
|
||
| import androidx.lifecycle.viewModelScope | ||
| import dagger.hilt.android.lifecycle.HiltViewModel | ||
| import kotlinx.coroutines.launch | ||
| import org.sopt.and.domain.model.User | ||
| import org.sopt.and.domain.repository.AuthRepository | ||
| import org.sopt.and.domain.repository.TokenRepository | ||
| import org.sopt.and.presentation.util.base.BaseViewModel | ||
| import javax.inject.Inject | ||
|
|
||
| @HiltViewModel | ||
| class AuthViewModel @Inject constructor( | ||
| private val tokenRepository: TokenRepository, | ||
| private val authRepository: AuthRepository, | ||
| ) : BaseViewModel<AuthContract.AuthUiState, AuthContract.AuthSideEffect, AuthContract.AuthEvent>() { | ||
| override fun createInitialState(): AuthContract.AuthUiState = AuthContract.AuthUiState() | ||
|
|
||
| override suspend fun handleEvent(event: AuthContract.AuthEvent) { | ||
| when (event) { | ||
| is AuthContract.AuthEvent.UpdateSignInUsername -> setState { | ||
| copy(signInUsername = event.signInUsername) | ||
| } | ||
| is AuthContract.AuthEvent.UpdateSignInPassword -> setState { | ||
| copy(signInPassword = event.signInPassword) | ||
| } | ||
| is AuthContract.AuthEvent.OnSignInClicked -> setState { | ||
| copy(signInState = event.signInState) | ||
| } | ||
| is AuthContract.AuthEvent.ResetSignInState -> setState { | ||
| copy(signInState = SignInState.Idle) | ||
| } | ||
| is AuthContract.AuthEvent.UpdateSignUpUsername -> setState { | ||
| copy(signUpUsername = event.signUpUsername) | ||
| } | ||
| is AuthContract.AuthEvent.UpdateSignUpPassword -> setState { | ||
| copy(signUpPassword = event.signUpPassword) | ||
| } | ||
|
Comment on lines
+33
to
+38
There was a problem hiding this comment.
|
||
| is AuthContract.AuthEvent.UpdateSignUpHobby -> setState { | ||
| copy(signUpHobby = event.signUpHobby) | ||
| } | ||
| is AuthContract.AuthEvent.OnSignUpClicked -> setState { | ||
| copy(signUpState = event.signUpState) | ||
| } | ||
| is AuthContract.AuthEvent.ResetSignUpState -> setState { | ||
| copy(signUpState = SignUpState.Idle) | ||
| } | ||
| } | ||
| } | ||
|
|
||
| fun updateSignInUsername(input: String) { | ||
| viewModelScope.launch { | ||
|
There was a problem hiding this comment. viewModelScope로 감싼 이유가 있나요? |
||
| setEvent(AuthContract.AuthEvent.UpdateSignInUsername(signInUsername = input)) | ||
| } | ||
| } | ||
|
|
||
| fun updateSignInPassword(input: String) { | ||
| viewModelScope.launch { | ||
| setEvent(AuthContract.AuthEvent.UpdateSignInPassword(signInPassword = input)) | ||
| } | ||
| } | ||
|
|
||
| fun validateSignIn() { | ||
| viewModelScope.launch { | ||
| setEvent(AuthContract.AuthEvent.OnSignInClicked(signInState = SignInState.Loading)) | ||
| authRepository.login(username = currentState.signInUsername, password = currentState.signInPassword).fold( | ||
| onSuccess = { token -> | ||
| tokenRepository.setToken(token.token) | ||
| setEvent(AuthContract.AuthEvent.OnSignInClicked(signInState = SignInState.Success(result = token))) | ||
| }, | ||
| onFailure = { | ||
| setEvent(AuthContract.AuthEvent.OnSignInClicked(signInState = SignInState.Failure(errorMessage = it.localizedMessage?: ""))) | ||
| } | ||
| ) | ||
| } | ||
| } | ||
|
|
||
| fun updateSignUpUsername(input: String) { | ||
| viewModelScope.launch { | ||
| setEvent(AuthContract.AuthEvent.UpdateSignUpUsername(signUpUsername = input)) | ||
| } | ||
| } | ||
|
|
||
| fun updateSignUpPassword(input: String) { | ||
| viewModelScope.launch { | ||
| setEvent(AuthContract.AuthEvent.UpdateSignUpPassword(signUpPassword = input)) | ||
| } | ||
| } | ||
|
|
||
| fun updateSignUpHobby(input: String) { | ||
| viewModelScope.launch { | ||
| setEvent(AuthContract.AuthEvent.UpdateSignUpHobby(signUpHobby = input)) | ||
| } | ||
| } | ||
|
|
||
| fun validateSignUp() { | ||
| viewModelScope.launch { | ||
| setEvent(AuthContract.AuthEvent.OnSignUpClicked(signUpState = SignUpState.Loading)) | ||
| authRepository.registerUser( | ||
| user = User( | ||
| username = currentState.signUpUsername, | ||
| password = currentState.signUpPassword, | ||
| hobby = currentState.signUpHobby | ||
| ) | ||
| ).fold( | ||
| onSuccess = { userNo -> | ||
| setEvent(AuthContract.AuthEvent.OnSignUpClicked(signUpState = SignUpState.Success(userNo))) | ||
| }, | ||
| onFailure = { | ||
| setEvent(AuthContract.AuthEvent.OnSignUpClicked(signUpState = SignUpState.Failure(it.localizedMessage ?: ""))) | ||
| } | ||
| ) | ||
| } | ||
| } | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
저는 State, Event, SideEffect, 뿐만 아니라 SignIn, SignUp까지 다 분리하는 것이 좋다(?) 라고 생각하고 구현을 했었는데, 재원이 오빠도 그렇고 민재오빠도 이렇게 구현한 걸 보고 더 가독성이 좋고, 한눈에 보기 편하다는 생각이 들었어요! 주요 기능에 따라 이렇게 묶어둔 것 보고 리팩토링 때 이렇게 적용해보고자 해요 ㅎ 감삼둥