Feat/seminar7 basic #9
There are no files selected for viewing
This file contains hidden or 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
This file contains hidden or 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,11 @@ | ||
| package org.sopt.dosopttemplate.data.dataclass | ||
|
|
||
| object UserInfo { | ||
| var userInfoList = User( | ||
| nick = "", | ||
| self_description = "", | ||
| id = "", | ||
| pw = "", | ||
| mbti = "", | ||
| ) | ||
| } | ||
|
Contributor
Author
There was a problem hiding this comment. 매핑함수를 공부한지 얼마 안돼서
Member
There was a problem hiding this comment. 제가쓴 mapping함수랑 클린아키텍쳐나 ob들이 사용했던 map함수의 목적이 달라서,, |
||
This file contains hidden or 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
This file contains hidden or 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 |
|---|---|---|
|
|
@@ -6,6 +6,7 @@ import org.sopt.dosopttemplate.data.dto.request.RequestUserDataDto | |
| import org.sopt.dosopttemplate.data.dto.response.ResponseLoginDto | ||
| import retrofit2.Call | ||
| import org.sopt.dosopttemplate.data.dto.response.ResponseUserDataDto | ||
| import retrofit2.Response | ||
| import retrofit2.http.Body | ||
| import retrofit2.http.GET | ||
| import retrofit2.http.POST | ||
|
|
@@ -14,17 +15,17 @@ import retrofit2.http.Path | |
| interface AuthService { | ||
|
|
||
| @POST("api/v1/members/sign-in") | ||
| fun postLogin( | ||
| @Body request: RequestLoginDto, | ||
| ): Response<ResponseLoginDto> | ||
|
|
||
| @POST("api/v1/members") | ||
| fun postSignUp( | ||
| @Body request: RequestSignUpDto, | ||
| ): Response<Unit> | ||
|
|
||
| @GET("api/v1/members/{memberId}") | ||
| fun getUserInfo( | ||
| @Path("memberId") memberId: Int | ||
| ): Response<ResponseUserDataDto> | ||
|
Contributor
There was a problem hiding this comment. 코루틴이 아직 적용이 안되었는데 다음에 적용해봅시다!
Contributor
Author
There was a problem hiding this comment. 이제는 적용 제대로 됐죠....????? 이번 커밋에 뷰모델 안 가져와있던거 제대로 가져와서 아마 된거 같은데.....된거 맞겠....죠?!?!???
Contributor
There was a problem hiding this comment. suspend가 안붙었는데 적용 안한거 같은데
Contributor
Author
There was a problem hiding this comment. 어라 이거 진짜 엄청 삽질하면서 다 바꾸고 커밋 다 올렸는데??????안스가 또????? 집가서 함 확인해봐야겠네영...
Contributor
Author
There was a problem hiding this comment. 확인해봤는데 일단 안스에서는 다 누락없이 푸시하고 깃헙에도 올라간거 같은데 이 코리 창에서는 변경된 부분이 안보이네요...! 저번엔 됐었던거 같은데... 🤔🤔 혹시 깃헙 pr 올린 뒤에 커밋 올리면 이미 이전에 코리한 코드창에는 반영이 안되던가요...?일단 0ed0212 요 커밋을 봐주시죠~~!~! 코루틴 이렇게하면 이번엔 진짜로 적용된거 맞죠...???! |
||
| } | ||
This file contains hidden or 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
This file contains hidden or 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,9 @@ | ||
| package org.sopt.dosopttemplate.presentation.login | ||
|
|
||
| import org.sopt.dosopttemplate.data.dto.response.ResponseLoginDto | ||
|
|
||
| sealed class LoginState { | ||
| data class Success(val userId: ResponseLoginDto) : LoginState() | ||
| object Loading: LoginState() | ||
| object Error : LoginState() | ||
| } |
This file contains hidden or 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,75 @@ | ||
| package org.sopt.dosopttemplate.presentation.login | ||
|
|
||
| import androidx.lifecycle.LiveData | ||
| import androidx.lifecycle.MutableLiveData | ||
| import androidx.lifecycle.ViewModel | ||
| import androidx.lifecycle.viewModelScope | ||
| import kotlinx.coroutines.flow.MutableStateFlow | ||
| import kotlinx.coroutines.flow.StateFlow | ||
| import kotlinx.coroutines.flow.asStateFlow | ||
| import kotlinx.coroutines.launch | ||
| import org.sopt.dosopttemplate.data.dataclass.UserInfo | ||
| import org.sopt.dosopttemplate.data.dto.request.RequestLoginDto | ||
| import org.sopt.dosopttemplate.module.ApiFactory | ||
| import org.sopt.dosopttemplate.module.AuthService | ||
|
|
||
| class LoginViewModel() : ViewModel() { | ||
| private val _loginSuccess: MutableLiveData<Boolean> = MutableLiveData() | ||
| var loginSuccess: LiveData<Boolean> = _loginSuccess | ||
|
|
||
| private val _loginState = MutableStateFlow<LoginState>(LoginState.Loading) | ||
| val loginState: StateFlow<LoginState> = _loginState.asStateFlow() | ||
|
||
|
|
||
|
|
||
| fun checkLoginAvailableFromServer(id: String, password: String) { | ||
|
||
| viewModelScope.launch { | ||
| val loginService = ApiFactory.create<AuthService>() | ||
| kotlin.runCatching { | ||
| loginService.postLogin(RequestLoginDto(id, password)) | ||
| }.onSuccess { | ||
| val body = it.body() | ||
| if (it.body() != null) { | ||
| _loginState.value = LoginState.Success(body!!) | ||
| UserInfo.userInfoList.id = id | ||
| UserInfo.userInfoList.pw = password | ||
|
|
||
| } else { | ||
| _loginState.value = LoginState.Error | ||
| } | ||
| }.onFailure { | ||
| _loginState.value = LoginState.Error | ||
| } | ||
|
|
||
| ///* | ||
| // ServicePool.authService.postLogin(RequestLoginDto(id, password)) | ||
| // .enqueue(object : Callback<ResponseLoginDto> { | ||
| // override fun onResponse( | ||
| // call: Call<ResponseLoginDto>, | ||
| // response: Response<ResponseLoginDto>, | ||
| // ) { | ||
| // if (response.isSuccessful) { | ||
| // val data: ResponseLoginDto = requireNotNull(response.body()!!) | ||
| // | ||
| // | ||
| // val userId: Int = data.id | ||
| // loginSuccess.value = true | ||
| // toast("로그인 성공") | ||
| // val intent = Intent(context, MainHomeActivity::class.java) | ||
| // intent.putExtra("id", userId) | ||
| // | ||
| // | ||
| // startActivity(intent) | ||
| // } else { | ||
|
Comment on lines
+43
to
+62
|
||
| // toast("아이디와 패스워드가 일치 하지 않습니다.") | ||
| // } | ||
| // } | ||
| // | ||
| // override fun onFailure(call: Call<ResponseLoginDto>, t: Throwable) { | ||
| // toast("서버 에러 발생") | ||
| // } | ||
| // }) | ||
| //*/ | ||
|
|
||
| } | ||
| } | ||
| } | ||
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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.
디폴트 값으로 ""를 준 이유를 한 번 생각해보시면 좋을 것 같아요!
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.
디폴드 값을 주긴줘야되는데 디폴트값으로 넣을만한 값을 딱히 모르겠어서 ""로 퉁친건데 보통 일반적으로 사용되는 디폴드값이 있을까요??
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.
왜 꼭 디폴트 값을 주어야 할지 nonNull을 주면 안되는지 생각해보면 좋을 것 같아서요 답은 프로젝트의 성격에 따라 다릅니다 string의 기본값은 ""을 대부분 사용해요