Merge pull request #9803 from woocommerce/issue/9784-update-quantity-on-scan

Update quantity when scanning products already in order

Author: iamgabrielma

WooCommerce/Classes/ViewRelated/Orders/Order Creation/EditableOrderViewModel.swift

@@ -1322,16 +1322,23 @@ extension EditableOrderViewModel {
         stores.dispatch(action)
     }
 
-    /// Validates if the given product ID  is a product or a productVariation, and updates the Order with the correspondent item
-    ///
-    private func updateOrderWithProductID(_ productID: Int64) {
-        if let productVariation = allProductVariations.first(where: { $0.productVariationID == productID }) {
-            orderSynchronizer.setProduct.send(.init(product: .variation(productVariation), quantity: 1))
-        } else if let product = allProducts.first(where: { $0.productID == productID }) {
-            orderSynchronizer.setProduct.send(.init(product: .product(product), quantity: 1))
-        } else {
-            DDLogError("⛔️ID \(productID) not found")
+    /// Updates the Order with the given product
+    ///
+    func updateOrderWithProductID(_ productID: Int64) {
+        guard currentOrderItems.contains(where: { $0.productOrVariationID == productID }) else {
+            // If it's not part of the current order, send the correct productType to the synchronizer
+            if let productVariation = retrieveVariation(for: productID) {
+                orderSynchronizer.setProduct.send(.init(product: .variation(productVariation), quantity: 1))
+            } else if let product = allProducts.first(where: { $0.productID == productID }) {
+                orderSynchronizer.setProduct.send(.init(product: .product(product), quantity: 1))
+            } else {
+                DDLogError("⛔️ID \(productID) not found")
+            }
+            return
         }
+        // Increase quantity if exists
+        let match = productRows.first(where: { $0.productOrVariationID == productID })
+        match?.incrementQuantity()
     }
 }
 
@@ -1395,6 +1402,14 @@ private extension EditableOrderViewModel {
         }
         return variation
     }
+
+    func retrieveVariation(for id: Int64) -> ProductVariation? {
+        guard let variation = allProductVariations.first(where: { $0.productVariationID == id }) else {
+            let product = allProducts.first(where: { $0.productID == id })
+            return product?.toProductVariation()
+        }
+        return variation
+    }
 }
 
 private extension EditableOrderViewModel {

WooCommerce/WooCommerceTests/ViewRelated/Orders/Order Creation/EditableOrderViewModelTests.swift

@@ -1770,6 +1770,44 @@ final class EditableOrderViewModelTests: XCTestCase {
         XCTAssertEqual(orderItem.variationID, variationID)
         XCTAssertEqual(orderItem.quantity, 1)
     }
+
+    func test_order_with_no_products_when_updateOrderWithProduct_is_invoked_then_product_is_added() {
+        // Given
+        let product = Product.fake().copy(siteID: sampleSiteID, productID: sampleProductID, purchasable: true)
+        storageManager.insertSampleProduct(readOnlyProduct: product)
+        let viewModel = EditableOrderViewModel(siteID: sampleSiteID, storageManager: storageManager)
+
+        // Confidence check
+        let orderItem = viewModel.currentOrderItems.first
+        XCTAssertNil(orderItem)
+
+        // When
+        viewModel.updateOrderWithProductID(sampleProductID)
+
+        // Then
+        XCTAssertEqual(viewModel.currentOrderItems.count, 1)
+        XCTAssertEqual(viewModel.currentOrderItems.first?.quantity, 1)
+        XCTAssertEqual(viewModel.productRows[safe: 0]?.quantity, 1)
+    }
+
+    func test_order_with_products_when_updateOrderWithProduct_is_invoked_then_product_quantity_is_updated() {
+        // Given
+        let product = Product.fake().copy(siteID: sampleSiteID, productID: sampleProductID, purchasable: true)
+        storageManager.insertSampleProduct(readOnlyProduct: product)
+        let viewModel = EditableOrderViewModel(siteID: sampleSiteID, storageManager: storageManager, initialProductID: sampleProductID)
+
+        // Confidence check
+        let orderItem = viewModel.currentOrderItems.first
+        XCTAssertEqual(orderItem?.quantity, 1)
+
+        // When
+        viewModel.updateOrderWithProductID(sampleProductID)
+
+        // Then
+        XCTAssertEqual(viewModel.currentOrderItems.count, 1)
+        XCTAssertEqual(viewModel.currentOrderItems.first?.quantity, 2)
+        XCTAssertEqual(viewModel.productRows[safe: 0]?.quantity, 2)
+    }
 }
 
 private extension MockStorageManager {