Merge pull request #247 from TeamPINGLE/fix-reissue

[fix] 토큰 재발급 이슈 해결
TeamPINGLE · Mar 10, 2024 · 7b9727c · 7b9727c
2 parents 4e63014 + dab9dae
commit 7b9727c
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 25 deletions.
diff --git a/app/src/main/java/org/sopt/pingle/presentation/ui/main/home/HomeFragment.kt b/app/src/main/java/org/sopt/pingle/presentation/ui/main/home/HomeFragment.kt
@@ -12,6 +12,8 @@ import androidx.fragment.app.activityViewModels
 import androidx.lifecycle.flowWithLifecycle
 import androidx.lifecycle.lifecycleScope
 import dagger.hilt.android.AndroidEntryPoint
+import kotlinx.coroutines.flow.combine
+import kotlinx.coroutines.flow.distinctUntilChanged
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
 import org.sopt.pingle.R
@@ -134,6 +136,20 @@ class HomeFragment : BindingFragment<FragmentHomeBinding>(R.layout.fragment_home
     }
 
     private fun collectData() {
+        combine(
+            homeViewModel.category.flowWithLifecycle(viewLifecycleOwner.lifecycle).distinctUntilChanged(),
+            homeViewModel.searchWord.flowWithLifecycle(viewLifecycleOwner.lifecycle).distinctUntilChanged(),
+            homeViewModel.mainListOrderType.flowWithLifecycle(viewLifecycleOwner.lifecycle).distinctUntilChanged(),
+            homeViewModel.homeViewType.flowWithLifecycle(viewLifecycleOwner.lifecycle).distinctUntilChanged()
+        ) { _, _, _, homeViewType ->
+            homeViewType
+        }.onEach { homeViewType ->
+            when (homeViewType) {
+                HomeViewType.MAIN_LIST -> homeViewModel.getMainListPingleList()
+                HomeViewType.MAP -> homeViewModel.getPinListWithoutFilter()
+            }
+        }.launchIn(viewLifecycleOwner.lifecycleScope)
+
         homeViewModel.homeViewType.flowWithLifecycle(viewLifecycleOwner.lifecycle).onEach {
             with(binding) {
                 vpHome.setCurrentItem(homeViewModel.homeViewType.value.index, false)

diff --git a/app/src/main/java/org/sopt/pingle/presentation/ui/main/home/mainlist/MainListFragment.kt b/app/src/main/java/org/sopt/pingle/presentation/ui/main/home/mainlist/MainListFragment.kt
@@ -7,8 +7,6 @@ import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.flowWithLifecycle
 import androidx.lifecycle.lifecycleScope
 import dagger.hilt.android.AndroidEntryPoint
-import kotlinx.coroutines.flow.combine
-import kotlinx.coroutines.flow.distinctUntilChanged
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
 import org.sopt.pingle.R
@@ -122,18 +120,6 @@ class MainListFragment : BindingFragment<FragmentMainListBinding>(R.layout.fragm
     }
 
     private fun collectData() {
-        combine(
-            homeViewModel.searchWord.flowWithLifecycle(viewLifecycleOwner.lifecycle)
-                .distinctUntilChanged(),
-            homeViewModel.category.flowWithLifecycle(viewLifecycleOwner.lifecycle)
-                .distinctUntilChanged(),
-            homeViewModel.mainListOrderType.flowWithLifecycle(viewLifecycleOwner.lifecycle)
-                .distinctUntilChanged()
-        ) { _, _, _ ->
-        }.onEach {
-            homeViewModel.getMainListPingleList()
-        }.launchIn(viewLifecycleOwner.lifecycleScope)
-
         homeViewModel.mainListPingleListState.flowWithLifecycle(
             viewLifecycleOwner.lifecycle,
             Lifecycle.State.CREATED

diff --git a/app/src/main/java/org/sopt/pingle/presentation/ui/main/home/map/MapFragment.kt b/app/src/main/java/org/sopt/pingle/presentation/ui/main/home/map/MapFragment.kt
@@ -24,7 +24,6 @@ import com.naver.maps.map.OnMapReadyCallback
 import com.naver.maps.map.overlay.OverlayImage
 import com.naver.maps.map.util.FusedLocationSource
 import dagger.hilt.android.AndroidEntryPoint
-import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.distinctUntilChanged
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
@@ -194,16 +193,6 @@ class MapFragment : BindingFragment<FragmentMapBinding>(R.layout.fragment_map),
     }
 
     private fun collectData() {
-        combine(
-            homeViewModel.category.flowWithLifecycle(viewLifecycleOwner.lifecycle)
-                .distinctUntilChanged(),
-            homeViewModel.searchWord.flowWithLifecycle(viewLifecycleOwner.lifecycle)
-                .distinctUntilChanged()
-        ) { _, _ ->
-        }.onEach {
-            homeViewModel.getPinListWithoutFilter()
-        }.launchIn(viewLifecycleOwner.lifecycleScope)
-
         homeViewModel.markerModelData.flowWithLifecycle(viewLifecycleOwner.lifecycle)
             .onEach { markerModelData ->
                 (markerModelData.first == DEFAULT_SELECTED_MARKER_POSITION).let { isMarkerUnselected ->