From 1e6eb5c4ed41d04e31c0c66907d09e87bc3dd29a Mon Sep 17 00:00:00 2001
From: Hafiz Rahman <hfzrhmn@gmail.com>
Date: Thu, 9 Jan 2025 18:17:43 +0700
Subject: [PATCH 1/9] Refactor result from bulk update to handled various
 cases.

---
 .../ui/orders/list/BulkUpdateOrderResult.kt   | 16 +++++
 .../ui/orders/list/OrderListRepository.kt     | 28 ++++----
 .../ui/orders/list/OrderListViewModel.kt      | 68 ++++++++++++++-----
 WooCommerce/src/main/res/values/strings.xml   |  3 +
 4 files changed, 83 insertions(+), 32 deletions(-)
 create mode 100644 WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/list/BulkUpdateOrderResult.kt

diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/list/BulkUpdateOrderResult.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/list/BulkUpdateOrderResult.kt
new file mode 100644
index 00000000000..cc4f1efe012
--- /dev/null
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/list/BulkUpdateOrderResult.kt
@@ -0,0 +1,16 @@
+package com.woocommerce.android.ui.orders.list
+
+sealed class BulkUpdateOrderResult {
+    data class PartialSuccess(
+        val successCount: Int,
+        val failureCount: Int
+    ) : BulkUpdateOrderResult()
+
+    data object AllSuccess : BulkUpdateOrderResult()
+
+    data object AllFailed : BulkUpdateOrderResult()
+
+    data object NoOrdersUpdated : BulkUpdateOrderResult()
+
+    data class Error(val exception: Exception) : BulkUpdateOrderResult()
+}
diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/list/OrderListRepository.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/list/OrderListRepository.kt
index 7f01a8b7449..ac06633a0bf 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/list/OrderListRepository.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/list/OrderListRepository.kt
@@ -40,8 +40,6 @@ class OrderListRepository @Inject constructor(
     companion object {
         private const val TAG = "OrderListRepository"
         private const val ORDER_STATUS_TRASH = "trash"
-        private const val BULK_UPDATE_ORDER_STATUS_ALL_FAILED = "Unable to update any orders."
-        private const val BULK_UPDATE_ORDER_NOTHING_UPDATED = "No orders were updated."
         private const val BULK_UPDATE_ORDER_NO_RESPONSE = "No response received."
     }
 
@@ -181,7 +179,7 @@ class OrderListRepository @Inject constructor(
         }
     }
 
-    suspend fun bulkUpdateOrderStatus(orderIds: List<Long>, newStatus: Order.Status): Result<Unit> {
+    suspend fun bulkUpdateOrderStatus(orderIds: List<Long>, newStatus: Order.Status): BulkUpdateOrderResult {
         val result = orderStore.batchUpdateOrdersStatus(
             site = selectedSite.get(),
             orderIds = orderIds,
@@ -190,25 +188,23 @@ class OrderListRepository @Inject constructor(
 
         return if (result.isError) {
             WooLog.e(ORDERS, "Error bulk updating order status: ${result.error.message}")
-            Result.failure(WooException(result.error))
+            BulkUpdateOrderResult.Error(WooException(result.error))
         } else {
             result.model?.let {
                 logBulkOrderUpdateResults(it)
 
-                // We want to return success if at least one order was updated.
-                // However, if:
-                // - there's no updated orders but there are failed orders, return failure
-                // - there's no updated orders and no failed orders, return failure
                 when {
-                    it.failedOrders.isNotEmpty() && it.updatedOrders.isEmpty() ->
-                        Result.failure(Exception(BULK_UPDATE_ORDER_STATUS_ALL_FAILED))
-
-                    it.failedOrders.isEmpty() && it.updatedOrders.isEmpty() ->
-                        Result.failure(Exception(BULK_UPDATE_ORDER_NOTHING_UPDATED))
-
-                    else -> Result.success(Unit)
+                    it.failedOrders.isNotEmpty() && it.updatedOrders.isEmpty() -> BulkUpdateOrderResult.AllFailed
+                    it.failedOrders.isEmpty() && it.updatedOrders.isEmpty() -> BulkUpdateOrderResult.NoOrdersUpdated
+                    it.failedOrders.isNotEmpty() && it.updatedOrders.isNotEmpty() ->
+                        BulkUpdateOrderResult.PartialSuccess(
+                            successCount = it.updatedOrders.size,
+                            failureCount = it.failedOrders.size
+                        )
+
+                    else -> BulkUpdateOrderResult.AllSuccess
                 }
-            } ?: Result.failure(Exception(BULK_UPDATE_ORDER_NO_RESPONSE))
+            } ?: BulkUpdateOrderResult.Error(Exception(BULK_UPDATE_ORDER_NO_RESPONSE))
         }
     }
 
diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/list/OrderListViewModel.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/list/OrderListViewModel.kt
index 7fe0797988e..d35138d82e0 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/list/OrderListViewModel.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/list/OrderListViewModel.kt
@@ -230,6 +230,7 @@ class OrderListViewModel @Inject constructor(
     fun isSelecting() = viewState.orderListState == ViewState.OrderListState.Selecting
 
     private var isQueueingBulkUpdateSuccessMessage = false
+    private var bulkUpdateSuccessMessage = ""
 
     init {
         lifecycleRegistry.currentState = Lifecycle.State.CREATED
@@ -484,7 +485,7 @@ class OrderListViewModel @Inject constructor(
         pagedListWrapper.data.distinct().observe(this) {
             if (isQueueingBulkUpdateSuccessMessage) {
                 isQueueingBulkUpdateSuccessMessage = false
-                triggerEvent(Event.ShowSnackbar(R.string.orderlist_bulk_update_status_updated))
+                triggerEvent(OrderListEvent.ShowSnackbarString(bulkUpdateSuccessMessage))
             }
         }
 
@@ -1002,21 +1003,7 @@ class OrderListViewModel @Inject constructor(
                         newStatus = newStatus
                     )
 
-                    if (result.isFailure) {
-                        viewState = viewState.copy(isBulkUpdating = false)
-                        trackBulkOrderUpdateFailure()
-                        triggerEvent(Event.ShowSnackbar(R.string.error_generic))
-                    } else {
-                        isQueueingBulkUpdateSuccessMessage = true
-                        ordersPagedListWrapper?.fetchFirstPage()
-
-                        analyticsTracker.track(
-                            AnalyticsEvent.ORDERS_LIST_BULK_UPDATE_SUCCESS,
-                            mapOf(
-                                AnalyticsTracker.KEY_PROPERTY to AnalyticsTracker.VALUE_STATUS,
-                            )
-                        )
-                    }
+                    handleBulkUpdateResult(result)
                 }
             }
         } else {
@@ -1026,6 +1013,55 @@ class OrderListViewModel @Inject constructor(
         exitSelectionMode()
     }
 
+    private fun handleBulkUpdateResult(result: BulkUpdateOrderResult) {
+        when (result) {
+            is BulkUpdateOrderResult.AllSuccess,
+            is BulkUpdateOrderResult.PartialSuccess -> {
+                isQueueingBulkUpdateSuccessMessage = true
+                bulkUpdateSuccessMessage = when (result) {
+                    is BulkUpdateOrderResult.AllSuccess -> resourceProvider.getString(
+                        R.string.orderlist_bulk_update_status_updated
+                    )
+
+                    is BulkUpdateOrderResult.PartialSuccess -> resourceProvider.getString(
+                        R.string.orderlist_bulk_update_result_partial_success,
+                        result.successCount,
+                        result.failureCount
+                    )
+
+                    else -> resourceProvider.getString(R.string.orderlist_bulk_update_status_updated)
+                }
+                ordersPagedListWrapper?.fetchFirstPage()
+                trackBulkOrderUpdateSuccess()
+            }
+
+            is BulkUpdateOrderResult.NoOrdersUpdated,
+            is BulkUpdateOrderResult.AllFailed,
+            is BulkUpdateOrderResult.Error -> {
+                viewState = viewState.copy(isBulkUpdating = false)
+                trackBulkOrderUpdateFailure()
+                val messageRes = when (result) {
+                    is BulkUpdateOrderResult.NoOrdersUpdated ->
+                        R.string.orderlist_bulk_update_result_no_orders_updated
+
+                    is BulkUpdateOrderResult.AllFailed -> R.string.orderlist_bulk_update_result_all_failed
+                    is BulkUpdateOrderResult.Error -> R.string.error_generic
+                    else -> R.string.error_generic
+                }
+                triggerEvent(Event.ShowSnackbar(messageRes))
+            }
+        }
+    }
+
+    private fun trackBulkOrderUpdateSuccess() {
+        analyticsTracker.track(
+            AnalyticsEvent.ORDERS_LIST_BULK_UPDATE_SUCCESS,
+            mapOf(
+                AnalyticsTracker.KEY_PROPERTY to AnalyticsTracker.VALUE_STATUS,
+            )
+        )
+    }
+
     private fun trackBulkOrderUpdateFailure() {
         analyticsTracker.track(
             AnalyticsEvent.ORDERS_LIST_BULK_UPDATE_FAILURE,
diff --git a/WooCommerce/src/main/res/values/strings.xml b/WooCommerce/src/main/res/values/strings.xml
index 8cc104203e8..1b2991e8a2a 100644
--- a/WooCommerce/src/main/res/values/strings.xml
+++ b/WooCommerce/src/main/res/values/strings.xml
@@ -619,6 +619,9 @@
     <string name="orderlist_selection_menu_update_status">Update status</string>
     <string name="orderlist_bulk_update_status_updated">Status updated!</string>
     <string name="orderlist_bulk_update_maximum_reached">Maximum selection count (%d) is reached.</string>
+    <string name="orderlist_bulk_update_result_no_orders_updated">No orders updated. Please try again.</string>
+    <string name="orderlist_bulk_update_result_all_failed">Failed to update orders. Please try again.</string>
+    <string name="orderlist_bulk_update_result_partial_success">(%d) orders updated, but (%d) orders failed to update. Please try again.</string>
 
     <!--
          Simple Payments

From f01116ee20ea1766e8f727b8f7567dda7b68b2ab Mon Sep 17 00:00:00 2001
From: Hafiz Rahman <hfzrhmn@gmail.com>
Date: Thu, 9 Jan 2025 18:54:41 +0700
Subject: [PATCH 2/9] Update unit tests

---
 .../ui/orders/OrderListViewModelTest.kt       | 36 +++++++++++++++++--
 1 file changed, 33 insertions(+), 3 deletions(-)

diff --git a/WooCommerce/src/test/kotlin/com/woocommerce/android/ui/orders/OrderListViewModelTest.kt b/WooCommerce/src/test/kotlin/com/woocommerce/android/ui/orders/OrderListViewModelTest.kt
index 64a39847a1c..5b0afcb6cae 100644
--- a/WooCommerce/src/test/kotlin/com/woocommerce/android/ui/orders/OrderListViewModelTest.kt
+++ b/WooCommerce/src/test/kotlin/com/woocommerce/android/ui/orders/OrderListViewModelTest.kt
@@ -29,6 +29,7 @@ import com.woocommerce.android.ui.orders.filters.domain.GetSelectedOrderFiltersC
 import com.woocommerce.android.ui.orders.filters.domain.GetWCOrderListDescriptorWithFilters
 import com.woocommerce.android.ui.orders.filters.domain.GetWCOrderListDescriptorWithFiltersAndSearchQuery
 import com.woocommerce.android.ui.orders.filters.domain.ShouldShowCreateTestOrderScreen
+import com.woocommerce.android.ui.orders.list.BulkUpdateOrderResult
 import com.woocommerce.android.ui.orders.list.FetchOrdersRepository
 import com.woocommerce.android.ui.orders.list.ObserveOrdersListLastUpdate
 import com.woocommerce.android.ui.orders.list.OrderListFragmentArgs
@@ -1057,6 +1058,9 @@ class OrderListViewModelTest : BaseUnitTest() {
     fun `given offline, when bulk update status requested, then show offline error and exit selection mode`() = testBlocking {
         whenever(networkStatus.isConnected()).thenReturn(false)
 
+        // First enter selection mode
+        viewModel.onSelectionChanged(2)
+        assertThat(viewModel.isSelecting()).isTrue()
         viewModel.onBulkOrderStatusChanged(listOf(1L, 2L), Order.Status.Completed)
 
         assertThat(viewModel.event.value).isInstanceOf(Event.ShowSnackbar::class.java)
@@ -1067,7 +1071,12 @@ class OrderListViewModelTest : BaseUnitTest() {
     @Test
     fun `when bulk update fails, then show error message and exit selection`() = testBlocking {
         whenever(networkStatus.isConnected()).thenReturn(true)
-        whenever(orderListRepository.bulkUpdateOrderStatus(any(), any())).thenReturn(Result.failure(Exception()))
+        whenever(orderListRepository.bulkUpdateOrderStatus(any(), any()))
+            .thenReturn(BulkUpdateOrderResult.Error(Exception()))
+
+        // First enter selection mode
+        viewModel.onSelectionChanged(1)
+        assertThat(viewModel.isSelecting()).isTrue()
 
         viewModel.onBulkOrderStatusChanged(listOf(1L), Order.Status.Completed)
 
@@ -1077,9 +1086,27 @@ class OrderListViewModelTest : BaseUnitTest() {
     }
 
     @Test
-    fun `when bulk update completes successfully, then exit selection mode`() = testBlocking {
+    fun `when bulk update results in no orders updated, then show message and exit selection mode`() = testBlocking {
+        whenever(networkStatus.isConnected()).thenReturn(true)
+        whenever(orderListRepository.bulkUpdateOrderStatus(any(), any()))
+            .thenReturn(BulkUpdateOrderResult.NoOrdersUpdated)
+
+        viewModel.onSelectionChanged(1)
+        assertThat(viewModel.isSelecting()).isTrue()
+
+        viewModel.onBulkOrderStatusChanged(listOf(1L), Order.Status.Completed)
+
+        assertThat(viewModel.event.value).isInstanceOf(Event.ShowSnackbar::class.java)
+        assertThat((viewModel.event.value as Event.ShowSnackbar).message)
+            .isEqualTo(R.string.orderlist_bulk_update_result_no_orders_updated)
+        assertThat(viewModel.isSelecting()).isFalse()
+    }
+
+    @Test
+    fun `when bulk update fails for all orders, then show message and exit selection mode`() = testBlocking {
         whenever(networkStatus.isConnected()).thenReturn(true)
-        whenever(orderListRepository.bulkUpdateOrderStatus(any(), any())).thenReturn(Result.success(Unit))
+        whenever(orderListRepository.bulkUpdateOrderStatus(any(), any()))
+            .thenReturn(BulkUpdateOrderResult.AllFailed)
 
         // First enter selection mode
         viewModel.onSelectionChanged(1)
@@ -1087,6 +1114,9 @@ class OrderListViewModelTest : BaseUnitTest() {
 
         viewModel.onBulkOrderStatusChanged(listOf(1L), Order.Status.Completed)
 
+        assertThat(viewModel.event.value).isInstanceOf(Event.ShowSnackbar::class.java)
+        assertThat((viewModel.event.value as Event.ShowSnackbar).message)
+            .isEqualTo(R.string.orderlist_bulk_update_result_all_failed)
         assertThat(viewModel.isSelecting()).isFalse()
     }
 

From f30b6180e6e6d68691b65a915a3994ef7120cfd8 Mon Sep 17 00:00:00 2001
From: Hafiz Rahman <hfzrhmn@gmail.com>
Date: Thu, 9 Jan 2025 19:25:50 +0700
Subject: [PATCH 3/9] Add full success and partial success unit tests.

---
 .../ui/orders/OrderListViewModelTest.kt       | 46 +++++++++++++++++++
 1 file changed, 46 insertions(+)

diff --git a/WooCommerce/src/test/kotlin/com/woocommerce/android/ui/orders/OrderListViewModelTest.kt b/WooCommerce/src/test/kotlin/com/woocommerce/android/ui/orders/OrderListViewModelTest.kt
index 5b0afcb6cae..24b72c2a4b8 100644
--- a/WooCommerce/src/test/kotlin/com/woocommerce/android/ui/orders/OrderListViewModelTest.kt
+++ b/WooCommerce/src/test/kotlin/com/woocommerce/android/ui/orders/OrderListViewModelTest.kt
@@ -1120,6 +1120,52 @@ class OrderListViewModelTest : BaseUnitTest() {
         assertThat(viewModel.isSelecting()).isFalse()
     }
 
+    @Test
+    fun `when bulk update fully succeeds, then refresh and exit selection mode`() = testBlocking {
+        // Given
+        whenever(networkStatus.isConnected()).thenReturn(true)
+        whenever(orderListRepository.bulkUpdateOrderStatus(any(), any()))
+            .thenReturn(BulkUpdateOrderResult.AllSuccess)
+
+        // First load order to initialize orderPagedListWrapper, then enter selection mode
+        viewModel.loadOrders()
+        viewModel.onSelectionChanged(2)
+        assertThat(viewModel.isSelecting()).isTrue()
+
+        // When
+        viewModel.onBulkOrderStatusChanged(listOf(1L, 2L), Order.Status.Completed)
+
+        // Then
+        assertThat(viewModel.isSelecting()).isFalse()
+
+        // Invoked once during loadOrders() and once during onBulkOrderStatusChanged()
+        verify(viewModel.ordersPagedListWrapper, times(2))?.fetchFirstPage()
+    }
+
+    @Test
+    fun `when bulk update partially succeeds, then refresh and exit selection mode`() = testBlocking {
+        // Given
+        val successCount = 3
+        val failureCount = 2
+        whenever(networkStatus.isConnected()).thenReturn(true)
+        whenever(orderListRepository.bulkUpdateOrderStatus(any(), any()))
+            .thenReturn(BulkUpdateOrderResult.PartialSuccess(successCount, failureCount))
+
+        // First load order to initialize orderPagedListWrapper, then enter selection mode
+        viewModel.loadOrders()
+        viewModel.onSelectionChanged(5)
+        assertThat(viewModel.isSelecting()).isTrue()
+
+        // When
+        viewModel.onBulkOrderStatusChanged(listOf(1L, 2L, 3L, 4L, 5L), Order.Status.Completed)
+
+        // Then
+        assertThat(viewModel.isSelecting()).isFalse()
+
+        // Invoked once during loadOrders() and once during onBulkOrderStatusChanged()
+        verify(viewModel.ordersPagedListWrapper, times(2))?.fetchFirstPage()
+    }
+
     @Test
     fun `when selection count reaches limit, then show error message`() {
         // when

From 01286fd0449a53e45b6fdadfed09ef70991fdd8d Mon Sep 17 00:00:00 2001
From: Hafiz Rahman <hfzrhmn@gmail.com>
Date: Fri, 10 Jan 2025 13:52:48 +0700
Subject: [PATCH 4/9] Update logging for better clarity and separation with
 subsequent update.

---
 .../woocommerce/android/ui/orders/list/OrderListRepository.kt    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/list/OrderListRepository.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/list/OrderListRepository.kt
index ac06633a0bf..81be64b3871 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/list/OrderListRepository.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/list/OrderListRepository.kt
@@ -209,6 +209,7 @@ class OrderListRepository @Inject constructor(
     }
 
     private fun logBulkOrderUpdateResults(model: WCOrderStore.UpdateOrdersStatusResult) {
+        WooLog.i(ORDERS, "Bulk update order status completed.")
         if (model.updatedOrders.isNotEmpty()) {
             WooLog.i(ORDERS, "Successfully updated ${model.updatedOrders.size} orders")
         }

From 1ab82d50733c4e2425daa593dec1d60a5ef4aa67 Mon Sep 17 00:00:00 2001
From: Hafiz Rahman <hfzrhmn@gmail.com>
Date: Fri, 10 Jan 2025 16:47:07 +0700
Subject: [PATCH 5/9] Reword message to not wrap number inside parenthesis.

---
 WooCommerce/src/main/res/values/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/WooCommerce/src/main/res/values/strings.xml b/WooCommerce/src/main/res/values/strings.xml
index 1b2991e8a2a..b77647384f3 100644
--- a/WooCommerce/src/main/res/values/strings.xml
+++ b/WooCommerce/src/main/res/values/strings.xml
@@ -621,7 +621,7 @@
     <string name="orderlist_bulk_update_maximum_reached">Maximum selection count (%d) is reached.</string>
     <string name="orderlist_bulk_update_result_no_orders_updated">No orders updated. Please try again.</string>
     <string name="orderlist_bulk_update_result_all_failed">Failed to update orders. Please try again.</string>
-    <string name="orderlist_bulk_update_result_partial_success">(%d) orders updated, but (%d) orders failed to update. Please try again.</string>
+    <string name="orderlist_bulk_update_result_partial_success">%d order(s) updated, and %d order(s) failed to update. Please try again.</string>
 
     <!--
          Simple Payments

From 212b43436653c2b5e2ada5147e1ebbbf984de463 Mon Sep 17 00:00:00 2001
From: Hafiz Rahman <hfzrhmn@gmail.com>
Date: Tue, 21 Jan 2025 12:32:08 +0700
Subject: [PATCH 6/9] Update unit test with a way to check event during full
 success mode.

---
 .../android/ui/orders/OrderListViewModelTest.kt          | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/WooCommerce/src/test/kotlin/com/woocommerce/android/ui/orders/OrderListViewModelTest.kt b/WooCommerce/src/test/kotlin/com/woocommerce/android/ui/orders/OrderListViewModelTest.kt
index 24b72c2a4b8..62f302333c6 100644
--- a/WooCommerce/src/test/kotlin/com/woocommerce/android/ui/orders/OrderListViewModelTest.kt
+++ b/WooCommerce/src/test/kotlin/com/woocommerce/android/ui/orders/OrderListViewModelTest.kt
@@ -1,6 +1,7 @@
 package com.woocommerce.android.ui.orders
 
 import androidx.lifecycle.MutableLiveData
+import androidx.paging.PagedList
 import com.google.android.material.snackbar.Snackbar
 import com.woocommerce.android.AppPrefsWrapper
 import com.woocommerce.android.FeedbackPrefs
@@ -1126,6 +1127,8 @@ class OrderListViewModelTest : BaseUnitTest() {
         whenever(networkStatus.isConnected()).thenReturn(true)
         whenever(orderListRepository.bulkUpdateOrderStatus(any(), any()))
             .thenReturn(BulkUpdateOrderResult.AllSuccess)
+        val pagedListData = MutableLiveData<PagedList<OrderListItemUIType>>(mock())
+        whenever(pagedListWrapper.data).thenReturn(pagedListData)
 
         // First load order to initialize orderPagedListWrapper, then enter selection mode
         viewModel.loadOrders()
@@ -1134,9 +1137,15 @@ class OrderListViewModelTest : BaseUnitTest() {
 
         // When
         viewModel.onBulkOrderStatusChanged(listOf(1L, 2L), Order.Status.Completed)
+        // Sending a different instance of PagedList to trigger the Snackbar
+        pagedListData.value = mock()
 
         // Then
         assertThat(viewModel.isSelecting()).isFalse()
+        val expectedEvent = OrderListEvent.ShowSnackbarString(
+            resourceProvider.getString(R.string.orderlist_bulk_update_status_updated)
+        )
+        assertThat(viewModel.event.value).isEqualTo(expectedEvent)
 
         // Invoked once during loadOrders() and once during onBulkOrderStatusChanged()
         verify(viewModel.ordersPagedListWrapper, times(2))?.fetchFirstPage()

From a19ddb6eae9aacf74e59f8e97aa5557ddb46997f Mon Sep 17 00:00:00 2001
From: Hafiz Rahman <hfzrhmn@gmail.com>
Date: Tue, 21 Jan 2025 12:35:27 +0700
Subject: [PATCH 7/9] Refactor to simplify logic to handle success/partial
 success case.

---
 .../ui/orders/list/OrderListViewModel.kt      | 52 ++++++++++---------
 1 file changed, 27 insertions(+), 25 deletions(-)

diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/list/OrderListViewModel.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/list/OrderListViewModel.kt
index d35138d82e0..959408d6f1c 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/list/OrderListViewModel.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/list/OrderListViewModel.kt
@@ -11,6 +11,7 @@ import androidx.lifecycle.LifecycleRegistry
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MediatorLiveData
 import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.Observer
 import androidx.lifecycle.SavedStateHandle
 import androidx.lifecycle.asLiveData
 import androidx.lifecycle.viewModelScope
@@ -31,6 +32,7 @@ import com.woocommerce.android.analytics.IsScreenLargerThanCompactValue
 import com.woocommerce.android.analytics.deviceTypeToAnalyticsString
 import com.woocommerce.android.extensions.NotificationReceivedEvent
 import com.woocommerce.android.extensions.WindowSizeClass
+import com.woocommerce.android.extensions.drop
 import com.woocommerce.android.extensions.filter
 import com.woocommerce.android.extensions.filterNotNull
 import com.woocommerce.android.extensions.runWithContext
@@ -87,7 +89,6 @@ import org.wordpress.android.fluxc.store.ListStore.ListErrorType.PARSE_ERROR
 import org.wordpress.android.fluxc.store.ListStore.ListErrorType.TIMEOUT_ERROR
 import org.wordpress.android.fluxc.store.WCOrderStore
 import org.wordpress.android.fluxc.store.WCOrderStore.OnOrderSummariesFetched
-import org.wordpress.android.mediapicker.util.distinct
 import java.util.Locale
 import javax.inject.Inject
 import kotlin.time.Duration.Companion.seconds
@@ -229,9 +230,6 @@ class OrderListViewModel @Inject constructor(
 
     fun isSelecting() = viewState.orderListState == ViewState.OrderListState.Selecting
 
-    private var isQueueingBulkUpdateSuccessMessage = false
-    private var bulkUpdateSuccessMessage = ""
-
     init {
         lifecycleRegistry.currentState = Lifecycle.State.CREATED
         lifecycleRegistry.currentState = Lifecycle.State.STARTED
@@ -481,14 +479,6 @@ class OrderListViewModel @Inject constructor(
             _isLoadingMore.value = it
         }
 
-        // Observe status changes in the data
-        pagedListWrapper.data.distinct().observe(this) {
-            if (isQueueingBulkUpdateSuccessMessage) {
-                isQueueingBulkUpdateSuccessMessage = false
-                triggerEvent(OrderListEvent.ShowSnackbarString(bulkUpdateSuccessMessage))
-            }
-        }
-
         pagedListWrapper.listError
             .filter { !dismissListErrors }
             .filterNotNull()
@@ -924,6 +914,7 @@ class OrderListViewModel @Inject constructor(
                 viewState = viewState.copy(selectionCount = count)
                 showMaximumBulkSelectionNotice()
             }
+
             count > 0 && !isSelecting() -> enterSelectionMode(count)
             count > 0 -> viewState = viewState.copy(selectionCount = count)
         }
@@ -1017,20 +1008,31 @@ class OrderListViewModel @Inject constructor(
         when (result) {
             is BulkUpdateOrderResult.AllSuccess,
             is BulkUpdateOrderResult.PartialSuccess -> {
-                isQueueingBulkUpdateSuccessMessage = true
-                bulkUpdateSuccessMessage = when (result) {
-                    is BulkUpdateOrderResult.AllSuccess -> resourceProvider.getString(
-                        R.string.orderlist_bulk_update_status_updated
-                    )
-
-                    is BulkUpdateOrderResult.PartialSuccess -> resourceProvider.getString(
-                        R.string.orderlist_bulk_update_result_partial_success,
-                        result.successCount,
-                        result.failureCount
-                    )
+                // Prepare to show a success message after the list has been updated
+                val observable = ordersPagedListWrapper?.data?.drop(1)
+                observable?.observe(
+                    this,
+                    object : Observer<PagedOrdersList> {
+                        override fun onChanged(value: PagedOrdersList) {
+                            val message = when (result) {
+                                is BulkUpdateOrderResult.AllSuccess -> resourceProvider.getString(
+                                    R.string.orderlist_bulk_update_status_updated
+                                )
+
+                                is BulkUpdateOrderResult.PartialSuccess -> resourceProvider.getString(
+                                    R.string.orderlist_bulk_update_result_partial_success,
+                                    result.successCount,
+                                    result.failureCount
+                                )
+
+                                else -> resourceProvider.getString(R.string.orderlist_bulk_update_status_updated)
+                            }
+                            triggerEvent(OrderListEvent.ShowSnackbarString(message))
+                            observable.removeObserver(this)
+                        }
+                    }
+                )
 
-                    else -> resourceProvider.getString(R.string.orderlist_bulk_update_status_updated)
-                }
                 ordersPagedListWrapper?.fetchFirstPage()
                 trackBulkOrderUpdateSuccess()
             }

From 55776f0bf5033eecc6f76a2f42c86c9fda69e12a Mon Sep 17 00:00:00 2001
From: Hafiz Rahman <hfzrhmn@gmail.com>
Date: Tue, 21 Jan 2025 12:37:51 +0700
Subject: [PATCH 8/9] Remove extranous assertions.

---
 .../android/ui/orders/OrderListViewModelTest.kt            | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/WooCommerce/src/test/kotlin/com/woocommerce/android/ui/orders/OrderListViewModelTest.kt b/WooCommerce/src/test/kotlin/com/woocommerce/android/ui/orders/OrderListViewModelTest.kt
index 62f302333c6..c37d21aade1 100644
--- a/WooCommerce/src/test/kotlin/com/woocommerce/android/ui/orders/OrderListViewModelTest.kt
+++ b/WooCommerce/src/test/kotlin/com/woocommerce/android/ui/orders/OrderListViewModelTest.kt
@@ -1014,7 +1014,6 @@ class OrderListViewModelTest : BaseUnitTest() {
     fun `when selection count changes to 0, then exit selection mode`() = testBlocking {
         // First enter selection mode
         viewModel.onSelectionChanged(2)
-        assertThat(viewModel.isSelecting()).isTrue()
 
         // Then exit
         viewModel.onSelectionChanged(0)
@@ -1061,7 +1060,6 @@ class OrderListViewModelTest : BaseUnitTest() {
 
         // First enter selection mode
         viewModel.onSelectionChanged(2)
-        assertThat(viewModel.isSelecting()).isTrue()
         viewModel.onBulkOrderStatusChanged(listOf(1L, 2L), Order.Status.Completed)
 
         assertThat(viewModel.event.value).isInstanceOf(Event.ShowSnackbar::class.java)
@@ -1077,7 +1075,6 @@ class OrderListViewModelTest : BaseUnitTest() {
 
         // First enter selection mode
         viewModel.onSelectionChanged(1)
-        assertThat(viewModel.isSelecting()).isTrue()
 
         viewModel.onBulkOrderStatusChanged(listOf(1L), Order.Status.Completed)
 
@@ -1093,7 +1090,6 @@ class OrderListViewModelTest : BaseUnitTest() {
             .thenReturn(BulkUpdateOrderResult.NoOrdersUpdated)
 
         viewModel.onSelectionChanged(1)
-        assertThat(viewModel.isSelecting()).isTrue()
 
         viewModel.onBulkOrderStatusChanged(listOf(1L), Order.Status.Completed)
 
@@ -1111,7 +1107,6 @@ class OrderListViewModelTest : BaseUnitTest() {
 
         // First enter selection mode
         viewModel.onSelectionChanged(1)
-        assertThat(viewModel.isSelecting()).isTrue()
 
         viewModel.onBulkOrderStatusChanged(listOf(1L), Order.Status.Completed)
 
@@ -1133,7 +1128,6 @@ class OrderListViewModelTest : BaseUnitTest() {
         // First load order to initialize orderPagedListWrapper, then enter selection mode
         viewModel.loadOrders()
         viewModel.onSelectionChanged(2)
-        assertThat(viewModel.isSelecting()).isTrue()
 
         // When
         viewModel.onBulkOrderStatusChanged(listOf(1L, 2L), Order.Status.Completed)
@@ -1163,7 +1157,6 @@ class OrderListViewModelTest : BaseUnitTest() {
         // First load order to initialize orderPagedListWrapper, then enter selection mode
         viewModel.loadOrders()
         viewModel.onSelectionChanged(5)
-        assertThat(viewModel.isSelecting()).isTrue()
 
         // When
         viewModel.onBulkOrderStatusChanged(listOf(1L, 2L, 3L, 4L, 5L), Order.Status.Completed)

From f043c9c81c8ebc7a0dbf743df88a1ea08f9d7d9c Mon Sep 17 00:00:00 2001
From: Hafiz Rahman <hfzrhmn@gmail.com>
Date: Tue, 21 Jan 2025 12:44:46 +0700
Subject: [PATCH 9/9] Update release notes.

---
 RELEASE-NOTES.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
index b65701dfd73..2d85ee859bf 100644
--- a/RELEASE-NOTES.txt
+++ b/RELEASE-NOTES.txt
@@ -8,6 +8,7 @@
 - [*] Puerto Rico is now available in the list of countries that are supported by in-person payments [https://github.com/woocommerce/woocommerce-android/pull/13200]
 - [Internal] [*] XMLRPC is not needed now for Jetpack Connection during an Account Mismatch flow [https://github.com/woocommerce/woocommerce-android/pull/13308]
 - [*] Removed the outdated feedback survey for shipping labels [https://github.com/woocommerce/woocommerce-android/pull/13319]
+- [*] Bulk update order status now shows improved result messages, including for partial success. [https://github.com/woocommerce/woocommerce-android/pull/13275]
 
 21.4
 -----