[FIX/#68] 마이투두 뷰모델 플로우 수정

Team-Going · Jan 10, 2024 · 4e1fffa · 4e1fffa
1 parent ac8424c
commit 4e1fffa
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 12 deletions.
diff --git a/presentation/src/main/java/com/going/presentation/todo/mytodo/MyTodoViewModel.kt b/presentation/src/main/java/com/going/presentation/todo/mytodo/MyTodoViewModel.kt
@@ -4,6 +4,7 @@ import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.going.domain.entity.response.TodoModel
 import com.going.domain.repository.TodoRepository
+import com.going.presentation.todo.ourtodo.OurTodoViewModel
 import com.going.ui.extension.UiState
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.flow.MutableStateFlow
@@ -19,23 +20,39 @@ class MyTodoViewModel @Inject constructor(
     private val _totalUncompletedTodoCount = MutableStateFlow<Int>(0)
     val totalUncompletedTodoCount: StateFlow<Int> = _totalUncompletedTodoCount
 
-    private val _todoListState = MutableStateFlow<UiState<List<TodoModel>>>(UiState.Empty)
-    val todoListState: StateFlow<UiState<List<TodoModel>>> = _todoListState
+    private val _todoUncompleteListState = MutableStateFlow<UiState<List<TodoModel>>>(UiState.Empty)
+    val todoUncompleteListState: StateFlow<UiState<List<TodoModel>>> = _todoUncompleteListState
+
+    private val _todoCompleteListState = MutableStateFlow<UiState<List<TodoModel>>>(UiState.Empty)
+    val todoCompleteListState: StateFlow<UiState<List<TodoModel>>> = _todoCompleteListState
 
     fun decreaseTodoCount() {
         _totalUncompletedTodoCount.value = _totalUncompletedTodoCount.value - 1
     }
 
-    fun getTodoListFromServer(tripId: Long, category: String, progress: String) {
-        _todoListState.value = UiState.Loading
+    fun getUncompleteTodoListFromServer(tripId: Long, category: String, progress: String) {
+        _todoUncompleteListState.value = UiState.Loading
         viewModelScope.launch {
             todoRepository.getTodoList(tripId, category, progress)
                 .onSuccess { response ->
-                    _todoListState.value = UiState.Success(response)
+                    _todoUncompleteListState.value = UiState.Success(response)
                     _totalUncompletedTodoCount.value = response.size
                 }
                 .onFailure {
-                    _todoListState.value = UiState.Failure(it.message.orEmpty())
+                    _todoUncompleteListState.value = UiState.Failure(it.message.orEmpty())
+                }
+        }
+    }
+
+    fun getCompleteTodoListFromServer(tripId: Long, category: String, progress: String) {
+        _todoCompleteListState.value = UiState.Loading
+        viewModelScope.launch {
+            todoRepository.getTodoList(tripId, category, progress)
+                .onSuccess { response ->
+                    _todoCompleteListState.value = UiState.Success(response)
+                }
+                .onFailure {
+                    _todoCompleteListState.value = UiState.Failure(it.message.orEmpty())
                 }
         }
     }

diff --git a/...ation/src/main/java/com/going/presentation/todo/mytodo/todolist/MyTodoCompleteFragment.kt b/...ation/src/main/java/com/going/presentation/todo/mytodo/todolist/MyTodoCompleteFragment.kt
@@ -56,11 +56,11 @@ class MyTodoCompleteFragment() :
     private fun setTodoList() {
         // 추후 tripId 설정
         val tripId: Long = 1
-        viewModel.getTodoListFromServer(tripId, MY_TODO, COMPLETE)
+        viewModel.getCompleteTodoListFromServer(tripId, MY_TODO, COMPLETE)
     }
 
     private fun observeTodoListState() {
-        viewModel.todoListState.flowWithLifecycle(lifecycle).onEach { state ->
+        viewModel.todoCompleteListState.flowWithLifecycle(lifecycle).onEach { state ->
             when (state) {
                 is UiState.Success -> adapter.setItemList(state.data)
 

diff --git a/...ion/src/main/java/com/going/presentation/todo/mytodo/todolist/MyTodoUncompleteFragment.kt b/...ion/src/main/java/com/going/presentation/todo/mytodo/todolist/MyTodoUncompleteFragment.kt
@@ -58,11 +58,11 @@ class MyTodoUncompleteFragment() :
     private fun setTodoList() {
         // 추후 tripId 설정
         val tripId: Long = 1
-        viewModel.getTodoListFromServer(tripId, MY_TODO, UNCOMPLETE)
+        viewModel.getUncompleteTodoListFromServer(tripId, MY_TODO, UNCOMPLETE)
     }
 
     private fun observeTodoListState() {
-        viewModel.todoListState.flowWithLifecycle(lifecycle).onEach { state ->
+        viewModel.todoUncompleteListState.flowWithLifecycle(lifecycle).onEach { state ->
             when (state) {
                 is UiState.Success -> adapter.setItemList(state.data)
 

diff --git a/...ion/src/main/java/com/going/presentation/todo/ourtodo/todolist/OurTodoCompleteFragment.kt b/...ion/src/main/java/com/going/presentation/todo/ourtodo/todolist/OurTodoCompleteFragment.kt
@@ -57,7 +57,7 @@ class OurTodoCompleteFragment() :
     }
 
     private fun observeTodoListState() {
-        viewModel.todoListState.flowWithLifecycle(lifecycle).onEach { state ->
+        viewModel.todoCompleteListState.flowWithLifecycle(lifecycle).onEach { state ->
             when (state) {
                 is UiState.Success -> adapter.submitList(state.data)
 

diff --git a/...n/src/main/java/com/going/presentation/todo/ourtodo/todolist/OurTodoUncompleteFragment.kt b/...n/src/main/java/com/going/presentation/todo/ourtodo/todolist/OurTodoUncompleteFragment.kt
@@ -57,7 +57,7 @@ class OurTodoUncompleteFragment() :
     }
 
     private fun observeTodoListState() {
-        viewModel.todoListState.flowWithLifecycle(lifecycle).onEach { state ->
+        viewModel.todoUncompleteListState.flowWithLifecycle(lifecycle).onEach { state ->
             when (state) {
                 is UiState.Success -> adapter.submitList(state.data)