[Refactor] 앱잼 전 세미나 코드 리팩토링 #22
There are no files selected for viewing
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
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
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,11 @@ | ||
| package com.sopt.now.compose | ||
|
|
||
| import android.app.Application | ||
| import dagger.hilt.android.HiltAndroidApp | ||
|
|
||
| @HiltAndroidApp | ||
| class App : Application() { | ||
| override fun onCreate() { | ||
| super.onCreate() | ||
| } | ||
| } |
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
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
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,22 @@ | ||
| package com.sopt.now.compose.repository | ||
|
|
||
| import com.sopt.now.compose.data.model.ResponseUserDto | ||
| import com.sopt.now.compose.data.network.FollowerService | ||
| import kotlinx.coroutines.Dispatchers | ||
| import kotlinx.coroutines.withContext | ||
| import retrofit2.Response | ||
| import javax.inject.Inject | ||
| import javax.inject.Singleton | ||
|
|
||
| @Singleton | ||
| class FollowerRepository @Inject constructor( | ||
| private val followerService: FollowerService, | ||
|
Comment on lines
+12
to
+13
There was a problem hiding this comment. 굿굿 좋아요! 다만 아직 클린아키텍처가 적용되어 있지 않은 것 같아서 domain 레이어를 추가했을 때 코드가 어떻게 수정될 지 한번 생각해보면 좋을 것 같아요!! |
||
| ) { | ||
| suspend fun getUserList(page: Int): Result<Response<ResponseUserDto>> { | ||
| return withContext(Dispatchers.IO) { | ||
| runCatching { | ||
| followerService.getUserList(page).execute() | ||
| } | ||
| } | ||
| } | ||
| } | ||
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
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
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,59 +1,66 @@ | ||
| package com.sopt.now.compose.ui.home | ||
|
|
||
| import androidx.lifecycle.MutableLiveData | ||
| import androidx.lifecycle.ViewModel | ||
| import androidx.lifecycle.viewModelScope | ||
| import com.sopt.now.compose.data.model.Profile | ||
| import com.sopt.now.compose.data.model.UserDataDto | ||
| import com.sopt.now.compose.repository.FollowerRepository | ||
| import dagger.hilt.android.lifecycle.HiltViewModel | ||
| import kotlinx.coroutines.flow.MutableStateFlow | ||
| import kotlinx.coroutines.flow.asStateFlow | ||
| import kotlinx.coroutines.launch | ||
| import javax.inject.Inject | ||
|
|
||
| @HiltViewModel | ||
| class HomeViewModel @Inject constructor( | ||
| private val followerRepository: FollowerRepository, | ||
| ) : ViewModel() { | ||
|
|
||
| private val _followerState = MutableStateFlow<List<UserDataDto>>(emptyList()) | ||
| val followerState = _followerState.asStateFlow() | ||
|
|
||
| private var _eventNetworkError = MutableLiveData(false) | ||
|
|
||
| private var _isNetworkErrorShown = MutableLiveData(false) | ||
|
Comment on lines
+23
to
+25
There was a problem hiding this comment. 혹시 두 변수들이 어디서 쓰이고 있는 건가용..? 이 뷰모델에서 true 혹은 false로 바꿔주고 그 이후에 사용되는 부분을 못 찾아서요!! There was a problem hiding this comment. fetchFollowerList에서 네트워크 오류 발생시 쓰이는데, 사실 삭제해도 될 것 같아욥!!! |
||
|
|
||
| private val friendList = mutableListOf<Profile>() | ||
|
|
||
| init { | ||
| fetchFollowerList() | ||
| } | ||
|
|
||
| private fun fetchFollowerList() { | ||
| viewModelScope.launch { | ||
| followerRepository.getUserList(0) | ||
| .onSuccess { response -> | ||
| response.body()?.data?.let { data -> | ||
| _followerState.value = data | ||
| mapFollowersToFriendList(data) | ||
| _eventNetworkError.value = false | ||
| _isNetworkErrorShown.value = false | ||
| } ?: run { | ||
| _eventNetworkError.value = true | ||
| } | ||
| } | ||
| .onFailure { exception -> | ||
| _eventNetworkError.value = true | ||
| } | ||
| } | ||
| } | ||
|
|
||
| fun onNetworkErrorShown() { | ||
| _isNetworkErrorShown.value = true | ||
| } | ||
|
|
||
| private fun mapFollowersToFriendList(followers: List<UserDataDto>) { | ||
| friendList.clear() | ||
| friendList.addAll(followers.map { follower -> | ||
| Profile( | ||
| profileImage = follower.avatar, | ||
| name = "${follower.firstName} ${follower.lastName}", | ||
| description = follower.email | ||
| ) | ||
| }) | ||
| } | ||
| } | ||
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.
현재 레포지토리 모듈과 서비스 모듈을 같은 파일에 넣어둔 것 같은데,
서로 다른 기능을 하는 모듈이면 다른 파일로 분류하는 게 좋을 것 같아요!
지금은 함수가 하나씩 존재하지만 여러 개의 함수가 있다면 헷갈릴 수 있으니까요!