Fetch customer from API before applying filter to display name correctly

Author: kidinov

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/OrdersCommunicationViewModel.kt

@@ -1,6 +1,7 @@
 package com.woocommerce.android.ui.orders
 
 import androidx.lifecycle.SavedStateHandle
+import com.woocommerce.android.model.Order
 import com.woocommerce.android.viewmodel.MultiLiveEvent
 import com.woocommerce.android.viewmodel.ScopedViewModel
 import dagger.hilt.android.lifecycle.HiltViewModel
@@ -32,15 +33,15 @@ class OrdersCommunicationViewModel @Inject constructor(
         triggerEvent(CommunicationEvent.OrdersLoaded)
     }
 
-    fun applyCustomerFilter(customerId: Long) {
-        triggerEvent(CommunicationEvent.CustomerFilterRequested(customerId))
+    fun applyCustomerFilter(customer: Order.Customer) {
+        triggerEvent(CommunicationEvent.CustomerFilterRequested(customer))
     }
 
     sealed class CommunicationEvent : MultiLiveEvent.Event() {
         data class OrderTrashed(val orderId: Long) : CommunicationEvent()
         data object OrdersEmptyNotified : CommunicationEvent()
         data object OrdersLoadingNotified : CommunicationEvent()
         data object OrdersLoaded : CommunicationEvent()
-        data class CustomerFilterRequested(val customerId: Long) : CommunicationEvent()
+        data class CustomerFilterRequested(val customer: Order.Customer) : CommunicationEvent()
     }
 }

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/details/OrderDetailFragment.kt

@@ -886,9 +886,9 @@ class OrderDetailFragment :
     }
 
     private fun onViewCustomerOrdersClicked(order: Order) {
-        val customerId = order.customer?.customerId?.takeIf { it > 0 } ?: return
+        val customer = order.customer?.takeIf { (it.customerId ?: 0) > 0 } ?: return
 
-        communicationViewModel.applyCustomerFilter(customerId)
+        communicationViewModel.applyCustomerFilter(customer)
         if (!requireContext().isTwoPanesShouldBeUsed) {
             findNavController().popBackStack(R.id.orders, false)
         }

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/list/OrderListFragment.kt

@@ -20,6 +20,7 @@ import androidx.core.view.doOnPreDraw
 import androidx.core.view.isVisible
 import androidx.fragment.app.activityViewModels
 import androidx.fragment.app.viewModels
+import androidx.lifecycle.lifecycleScope
 import androidx.navigation.findNavController
 import androidx.navigation.fragment.NavHostFragment
 import androidx.navigation.fragment.findNavController
@@ -66,6 +67,7 @@ import com.woocommerce.android.ui.orders.OrdersCommunicationViewModel
 import com.woocommerce.android.ui.orders.creation.CodeScannerStatus
 import com.woocommerce.android.ui.orders.creation.GoogleBarcodeFormatMapper.BarcodeFormat
 import com.woocommerce.android.ui.orders.creation.OrderCreateEditViewModel
+import com.woocommerce.android.ui.orders.creation.customerlist.CustomerListRepository
 import com.woocommerce.android.ui.orders.details.OrderStatusSelectorDialog
 import com.woocommerce.android.ui.orders.filters.data.OrderFiltersRepository
 import com.woocommerce.android.ui.orders.filters.data.OrderListFilterCategory
@@ -78,6 +80,7 @@ import com.woocommerce.android.util.StringUtils
 import com.woocommerce.android.viewmodel.MultiLiveEvent
 import com.woocommerce.android.widgets.WCEmptyView.EmptyViewType
 import dagger.hilt.android.AndroidEntryPoint
+import kotlinx.coroutines.launch
 import org.wordpress.android.util.ToastUtils
 import javax.inject.Inject
 import org.wordpress.android.util.ActivityUtils as WPActivityUtils
@@ -117,6 +120,9 @@ class OrderListFragment :
     @Inject
     internal lateinit var orderFiltersRepository: OrderFiltersRepository
 
+    @Inject
+    internal lateinit var customerListRepository: CustomerListRepository
+
     private var tracker: SelectionTracker<Long>? = null
     private var actionMode: ActionMode? = null
     private val selectionPredicate = MutableMultipleSelectionPredicate<Long>(
@@ -691,7 +697,7 @@ class OrderListFragment :
                 }
 
                 is OrdersCommunicationViewModel.CommunicationEvent.CustomerFilterRequested -> {
-                    applyCustomerFilter(event.customerId)
+                    applyCustomerFilter(event.customer)
                 }
 
                 else -> event.isHandled = false
@@ -924,14 +930,22 @@ class OrderListFragment :
         }
     }
 
-    fun applyCustomerFilter(customerId: Long) {
+    fun applyCustomerFilter(customer: Order.Customer) {
         searchQuery = ""
-        orderFiltersRepository.setSelectedFilters(
-            OrderListFilterCategory.CUSTOMER,
-            listOf(customerId.toString())
-        )
-        viewModel.loadOrders()
-        uiMessageResolver.showSnack(R.string.order_list_customer_filter_applied)
+
+        viewLifecycleOwner.lifecycleScope.launch {
+            customer.customerId?.let { customerId ->
+                customerListRepository.fetchCustomerByRemoteId(customerId)
+
+                orderFiltersRepository.setSelectedFilters(
+                    OrderListFilterCategory.CUSTOMER,
+                    listOf(customerId.toString())
+                )
+            }
+
+            viewModel.loadOrders()
+            uiMessageResolver.showSnack(R.string.order_list_customer_filter_applied)
+        }
     }
 
     private fun showOrderFilters() {