Refactor usecase

Author: Rawa

android/app/src/main/kotlin/net/mullvad/mullvadvpn/usecase/customlists/CustomListsRelayItemUseCase.kt

@@ -1,14 +1,8 @@
 package net.mullvad.mullvadvpn.usecase.customlists
 
 import kotlinx.coroutines.flow.combine
-import net.mullvad.mullvadvpn.lib.model.Constraint
-import net.mullvad.mullvadvpn.lib.model.Ownership
-import net.mullvad.mullvadvpn.lib.model.Providers
-import net.mullvad.mullvadvpn.lib.model.RelayItem
-import net.mullvad.mullvadvpn.relaylist.filterOnOwnershipAndProvider
 import net.mullvad.mullvadvpn.relaylist.toRelayItemCustomList
 import net.mullvad.mullvadvpn.repository.CustomListsRepository
-import net.mullvad.mullvadvpn.repository.RelayListFilterRepository
 import net.mullvad.mullvadvpn.repository.RelayListRepository
 
 class CustomListsRelayItemUseCase(
@@ -23,23 +17,3 @@ class CustomListsRelayItemUseCase(
             customLists?.map { it.toRelayItemCustomList(relayList) } ?: emptyList()
         }
 }
-
-class FilterCustomListsRelayItemUseCase(
-    private val customListsRelayItemUseCase: CustomListsRelayItemUseCase,
-    private val relayListFilterRepository: RelayListFilterRepository
-) {
-
-    operator fun invoke() =
-        combine(
-            customListsRelayItemUseCase(),
-            relayListFilterRepository.selectedOwnership,
-            relayListFilterRepository.selectedProviders,
-        ) { customLists, selectedOwnership, selectedProviders ->
-            customLists.filterOnOwnershipAndProvider(selectedOwnership, selectedProviders)
-        }
-
-    private fun List<RelayItem.CustomList>.filterOnOwnershipAndProvider(
-        ownership: Constraint<Ownership>,
-        providers: Constraint<Providers>
-    ) = mapNotNull { it.filterOnOwnershipAndProvider(ownership, providers) }
-}

android/app/src/main/kotlin/net/mullvad/mullvadvpn/usecase/customlists/FilterCustomListsRelayItemUseCase.kt

@@ -0,0 +1,30 @@
+package net.mullvad.mullvadvpn.usecase.customlists
+
+import kotlinx.coroutines.flow.combine
+import net.mullvad.mullvadvpn.lib.model.Constraint
+import net.mullvad.mullvadvpn.lib.model.Ownership
+import net.mullvad.mullvadvpn.lib.model.Providers
+import net.mullvad.mullvadvpn.lib.model.RelayItem
+import net.mullvad.mullvadvpn.relaylist.filterOnOwnershipAndProvider
+import net.mullvad.mullvadvpn.repository.RelayListFilterRepository
+import kotlin.collections.mapNotNull
+
+class FilterCustomListsRelayItemUseCase(
+    private val customListsRelayItemUseCase: CustomListsRelayItemUseCase,
+    private val relayListFilterRepository: RelayListFilterRepository
+) {
+
+    operator fun invoke() =
+        combine(
+            customListsRelayItemUseCase(),
+            relayListFilterRepository.selectedOwnership,
+            relayListFilterRepository.selectedProviders,
+        ) { customLists, selectedOwnership, selectedProviders ->
+            customLists.filterOnOwnershipAndProvider(selectedOwnership, selectedProviders)
+        }
+
+    private fun List<RelayItem.CustomList>.filterOnOwnershipAndProvider(
+        ownership: Constraint<Ownership>,
+        providers: Constraint<Providers>
+    ) = mapNotNull { it.filterOnOwnershipAndProvider(ownership, providers) }
+}