Store Order.Customer object in repository for display name extraction

Author: kidinov

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

@@ -367,13 +367,17 @@ class OrderFilterCategoriesViewModel @Inject constructor(
 
     private suspend fun getCustomerDisplayValueFrom(customerId: Long?): String =
         customerId?.let { id ->
-            orderFilterRepository.customerFilterDisplayName
-                ?: customerStore.getCustomerByRemoteId(selectedSite.get(), id)
-                    ?.let { customer ->
-                        (customer.firstName + " " + customer.lastName)
-                            .ifBlank { customer.email }
-                            .ifBlank { customer.username }
-                    } ?: resourceProvider.getString(
+            orderFilterRepository.customerFilterCustomer?.let { customer ->
+                buildString {
+                    val fullName = "${customer.firstName.orEmpty()} ${customer.lastName.orEmpty()}".trim()
+                    append(fullName.ifBlank { customer.email ?: customer.username.orEmpty() })
+                }
+            } ?: customerStore.getCustomerByRemoteId(selectedSite.get(), id)
+                ?.let { customer ->
+                    (customer.firstName + " " + customer.lastName)
+                        .ifBlank { customer.email }
+                        .ifBlank { customer.username }
+                } ?: resourceProvider.getString(
                 R.string.orderfilters_selected_filter_fallback_display_value,
                 id
             )

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/filters/data/OrderFiltersRepository.kt

@@ -2,6 +2,7 @@ package com.woocommerce.android.ui.orders.filters.data
 
 import com.woocommerce.android.AppPrefsWrapper
 import com.woocommerce.android.di.AppCoroutineScope
+import com.woocommerce.android.model.Order
 import com.woocommerce.android.tools.SelectedSite
 import com.woocommerce.android.ui.orders.filters.data.OrderListFilterCategory.CUSTOMER
 import com.woocommerce.android.ui.orders.filters.data.OrderListFilterCategory.PRODUCT
@@ -22,15 +23,15 @@ class OrderFiltersRepository @Inject constructor(
 
     var customerFilter: Long? = null
 
-    var customerFilterDisplayName: String? = null
+    var customerFilterCustomer: Order.Customer? = null
 
     init {
         selectedSite.observe()
             .distinctUntilChanged { old, new -> old?.id == new?.id }
             .onEach {
                 productFilter = null
                 customerFilter = null
-                customerFilterDisplayName = null
+                customerFilterCustomer = null
             }.launchIn(appCoroutineScope)
     }
 

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

@@ -927,13 +927,8 @@ class OrderListFragment :
         searchQuery = ""
         val customerId = customer.customerId ?: return
 
-        val displayName = buildString {
-            val fullName = "${customer.firstName.orEmpty()} ${customer.lastName.orEmpty()}".trim()
-            append(fullName.ifBlank { customer.email ?: customer.username.orEmpty() })
-        }
-
         orderFiltersRepository.customerFilter = customerId
-        orderFiltersRepository.customerFilterDisplayName = displayName
+        orderFiltersRepository.customerFilterCustomer = customer
         viewModel.loadOrders()
 
         uiMessageResolver.showSnack(R.string.order_list_customer_filter_applied)