Merge pull request #14981 from woocommerce/woomob-1692-woo-poslocal-catalog-update-and-remove-products-from-db-in

kidinov · web-flow · commit b8da934b9b2c · 2025-11-18T12:56:52.000+01:00
[Woo POS][Local Catalog] When reconciling items in cart, delete products from Local Catalog DB as well
diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
@@ -4,7 +4,7 @@
 
 23.8
 -----
-
+- [Internal][Woo POS] Improve detection and handling of deleted products during checkout [https://github.com/woocommerce/woocommerce-android/pull/14981]
 
 23.7
 -----
diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/home/cart/WooPosCartItemsUpdater.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/home/cart/WooPosCartItemsUpdater.kt
@@ -1,17 +1,22 @@
 package com.woocommerce.android.ui.woopos.home.cart
 
 import com.automattic.android.tracks.crashlogging.CrashLogging
+import com.woocommerce.android.tools.SelectedSite
 import com.woocommerce.android.ui.woopos.common.data.WooPosProductsCache
 import com.woocommerce.android.ui.woopos.common.data.models.WooPosProductModel
 import com.woocommerce.android.ui.woopos.common.util.WooPosLogWrapper
 import com.woocommerce.android.ui.woopos.home.ParentToChildrenEvent
 import com.woocommerce.android.ui.woopos.home.cart.WooPosCartItemViewState.Coupon.CouponValidationState
 import com.woocommerce.android.ui.woopos.util.format.WooPosFormatPrice
+import org.wordpress.android.fluxc.model.LocalOrRemoteId
+import org.wordpress.android.fluxc.store.pos.localcatalog.WooPosLocalCatalogStore
 import javax.inject.Inject
 
 class WooPosCartItemsUpdater @Inject constructor(
     private val formatPrice: WooPosFormatPrice,
     private val productsCache: WooPosProductsCache,
+    private val localCatalogStore: WooPosLocalCatalogStore,
+    private val selectedSite: SelectedSite,
     private val wooPosLogWrapper: WooPosLogWrapper,
     private val crashLogger: CrashLogging,
 ) {
@@ -84,7 +89,7 @@ class WooPosCartItemsUpdater @Inject constructor(
                 newItem.productDoesNotExist != item.productDoesNotExist
 
             if (itemChanged) {
-                deleteProductFromCache(newItem.id)
+                deleteProductFromCache(newItem)
             }
 
             changed = itemChanged
@@ -134,8 +139,32 @@ class WooPosCartItemsUpdater @Inject constructor(
         }
     }
 
-    private suspend fun deleteProductFromCache(productId: Long) {
-        productsCache.deleteProduct(productId)
+    private suspend fun deleteProductFromCache(item: WooPosCartItemViewState.Product) {
+        when (item) {
+            is WooPosCartItemViewState.Product.Simple -> {
+                productsCache.deleteProduct(item.id)
+                selectedSite.getOrNull()?.let { site ->
+                    val siteId = LocalOrRemoteId.LocalId(site.id)
+                    val remoteId = LocalOrRemoteId.RemoteId(item.id)
+                    localCatalogStore.deleteProducts(siteId, listOf(remoteId))
+                        .onFailure { error ->
+                            wooPosLogWrapper.e("Failed to delete product from Local Catalog DB: ${error.message}")
+                        }
+                }
+            }
+            is WooPosCartItemViewState.Product.Variation -> {
+                productsCache.deleteProduct(item.id)
+                selectedSite.getOrNull()?.let { site ->
+                    val siteId = LocalOrRemoteId.LocalId(site.id)
+                    val productId = LocalOrRemoteId.RemoteId(item.id)
+                    val variationId = LocalOrRemoteId.RemoteId(item.variationId)
+                    localCatalogStore.deleteVariations(siteId, listOf(productId to variationId))
+                        .onFailure { error ->
+                            wooPosLogWrapper.e("Failed to delete variation from Local Catalog DB: ${error.message}")
+                        }
+                }
+            }
+        }
     }
 
     private fun getProductKey(item: WooPosCartItemViewState.Product): String {
diff --git a/WooCommerce/src/test/kotlin/com/woocommerce/android/ui/woopos/home/cart/WooPosCartItemsUpdaterTest.kt b/WooCommerce/src/test/kotlin/com/woocommerce/android/ui/woopos/home/cart/WooPosCartItemsUpdaterTest.kt
@@ -2,6 +2,7 @@ package com.woocommerce.android.ui.woopos.home.cart
 
 import androidx.arch.core.executor.testing.InstantTaskExecutorRule
 import com.automattic.android.tracks.crashlogging.CrashLogging
+import com.woocommerce.android.tools.SelectedSite
 import com.woocommerce.android.ui.woopos.common.data.WooPosProductsCache
 import com.woocommerce.android.ui.woopos.common.data.models.WooPosProductModel
 import com.woocommerce.android.ui.woopos.common.util.WooPosLogWrapper
@@ -21,6 +22,8 @@ import org.mockito.kotlin.mock
 import org.mockito.kotlin.never
 import org.mockito.kotlin.verify
 import org.mockito.kotlin.whenever
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.store.pos.localcatalog.WooPosLocalCatalogStore
 import java.math.BigDecimal
 import kotlin.test.Test
 
@@ -39,15 +42,23 @@ class WooPosCartItemsUpdaterTest {
         onBlocking { invoke(argThat { this == BigDecimal("5.0") }) }.thenReturn("5.0$")
     }
     private val productsCache: WooPosProductsCache = mock()
+    private val localCatalogStore: WooPosLocalCatalogStore = mock {
+        onBlocking { deleteProducts(any(), any()) }.thenReturn(Result.success(Unit))
+        onBlocking { deleteVariations(any(), any()) }.thenReturn(Result.success(Unit))
+    }
+    private val selectedSite: SelectedSite = mock {
+        onBlocking { getOrNull() }.thenReturn(SiteModel().apply { id = 1 })
+    }
     private val crashLogger: CrashLogging = mock()
     private val logger: WooPosLogWrapper = mock()
 
     private val updater = WooPosCartItemsUpdater(
         formatPrice = formatPrice,
         productsCache = productsCache,
+        localCatalogStore = localCatalogStore,
+        selectedSite = selectedSite,
         wooPosLogWrapper = logger,
         crashLogger = crashLogger,
-
     )
 
     @Test
@@ -303,6 +314,62 @@ class WooPosCartItemsUpdaterTest {
         verify(productsCache).deleteProduct(1L)
     }
 
+    @Test
+    fun `given simple product not existing, when deleted, then also deletes from Local Catalog DB`() = runTest {
+        // GIVEN
+        val simpleProduct = WooPosCartItemViewState.Product.Simple(
+            itemNumber = 1,
+            id = 1L,
+            name = "Product Name",
+            price = "9.0$",
+            imageUrl = "url",
+            description = null
+        )
+        val itemsInCart = listOf(simpleProduct)
+
+        // WHEN
+        updater.invoke(itemsInCart, emptyList(), emptyList())
+
+        // THEN
+        verify(productsCache).deleteProduct(1L)
+        verify(localCatalogStore).deleteProducts(
+            argThat { siteId -> siteId.value == 1 },
+            argThat { productIds ->
+                productIds.size == 1 && productIds[0].value == 1L
+            }
+        )
+    }
+
+    @Test
+    fun `given variation product not existing, when deleted, then deletes only variation from Local Catalog DB`() =
+        runTest {
+            // GIVEN
+            val variationProduct = WooPosCartItemViewState.Product.Variation(
+                itemNumber = 1,
+                id = 1L,
+                variationId = 2L,
+                name = "Variation Name",
+                price = "9.0$",
+                imageUrl = "url",
+                description = null
+            )
+            val itemsInCart = listOf(variationProduct)
+
+            // WHEN
+            updater.invoke(itemsInCart, emptyList(), emptyList())
+
+            // THEN
+            verify(productsCache).deleteProduct(1L)
+            verify(localCatalogStore).deleteVariations(
+                argThat { siteId -> siteId.value == 1 },
+                argThat { variations ->
+                    variations.size == 1 &&
+                        variations[0].first.value == 1L &&
+                        variations[0].second.value == 2L
+                }
+            )
+        }
+
     @Test
     fun `given product updated, when called, then cache is updated correctly`() = runTest {
         // GIVEN
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/store/pos/localcatalog/WooPosLocalCatalogStore.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/store/pos/localcatalog/WooPosLocalCatalogStore.kt
@@ -275,6 +275,31 @@ class WooPosLocalCatalogStore @Inject constructor(
     ): Result<Unit> =
         runCatching { posProductDao.deleteAllProductsForSite(siteId) }
 
+    suspend fun deleteProducts(
+        siteId: LocalOrRemoteId.LocalId,
+        productIds: List<LocalOrRemoteId.RemoteId>
+    ): Result<Unit> =
+        runCatching {
+            database.executeInTransaction {
+                productIds.forEach { remoteId ->
+                    posProductDao.deleteProduct(siteId, remoteId)
+                    posVariationsDao.deleteVariationsForProduct(siteId, remoteId)
+                }
+            }
+        }
+
+    suspend fun deleteVariations(
+        siteId: LocalOrRemoteId.LocalId,
+        variations: List<Pair<LocalOrRemoteId.RemoteId, LocalOrRemoteId.RemoteId>>
+    ): Result<Unit> =
+        runCatching {
+            database.executeInTransaction {
+                variations.forEach { (productId, variationId) ->
+                    posVariationsDao.deleteVariation(siteId, productId, variationId)
+                }
+            }
+        }
+
     suspend fun upsertVariations(variations: List<WooPosVariationEntity>): Result<Unit> =
         runCatching { posVariationsDao.upsertVariations(variations) }
 

-Original file line number
+Diff line change
 .8
 -----
+-
 +- [Internal][Woo POS] Improve detection and handling of deleted products during checkout [https://github.com/woocommerce/woocommerce-android/pull/14981]
 .7
 -----