ACP2E-368: Issue when adding multiple items in addProductsToCart graphQL mutation

Author: bubasuma

app/code/Magento/Quote/Model/Cart/AddProductsToCart.php

@@ -246,7 +246,7 @@ private function prepareErrorOutput(Quote $cart, array $errors = []): AddProduct
      */
     private function addQuoteItem(Quote $quote, Item $quoteItem): void
     {
-        if ($quoteItem->getOriginalItem() && $quoteItem->getOriginalItem()->getId()) {
+        if ($quoteItem->getOriginalItem()) {
             $quote->deleteItem($quoteItem->getOriginalItem());
             $quoteItem->unsOriginalItem();
         }

app/code/Magento/Quote/Model/Quote/Item/Compare.php

@@ -68,6 +68,10 @@ protected function getOptionValues($value)
      */
     public function compare(Item $target, Item $compared)
     {
+        if ($target === $compared) {
+            return true;
+        }
+
         if ($target->getProductId() != $compared->getProductId()) {
             return false;
         }

dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/AddSimpleProductToCartSingleMutationTest.php

@@ -7,6 +7,9 @@
 
 namespace Magento\GraphQl\Quote;
 
+use Magento\Quote\Model\QuoteIdToMaskedQuoteIdInterface;
+use Magento\TestFramework\Fixture\DataFixtureStorage;
+use Magento\TestFramework\Fixture\DataFixtureStorageManager;
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\TestFramework\TestCase\GraphQlAbstract;
 
@@ -30,6 +33,16 @@ class AddSimpleProductToCartSingleMutationTest extends GraphQlAbstract
      */
     private $getCartItemOptionsFromUID;
 
+    /**
+     * @var QuoteIdToMaskedQuoteIdInterface
+     */
+    private $quoteIdToMaskedQuoteIdInterface;
+
+    /**
+     * @var DataFixtureStorage
+     */
+    private $fixtures;
+
     /**
      * @inheritdoc
      */
@@ -41,6 +54,8 @@ protected function setUp(): void
         $this->getCustomOptionsWithIDV2ForQueryBySku = $objectManager->get(
             GetCustomOptionsWithUIDForQueryBySku::class
         );
+        $this->quoteIdToMaskedQuoteIdInterface = $objectManager->get(QuoteIdToMaskedQuoteIdInterface::class);
+        $this->fixtures = $objectManager->get(DataFixtureStorageManager::class)->getStorage();
     }
 
     /**
@@ -81,7 +96,7 @@ public function testAddSimpleProductWithOptions()
         $customizableOptionsOutput =
             $response['addProductsToCart']['cart']['items'][0]['customizable_options'];
 
-        foreach ($customizableOptionsOutput as $key => $customizableOptionOutput) {
+        foreach ($customizableOptionsOutput as $customizableOptionOutput) {
             $customizableOptionOutputValues = [];
             foreach ($customizableOptionOutput['values'] as $customizableOptionOutputValue) {
                 $customizableOptionOutputValues[] =  $customizableOptionOutputValue['value'];
@@ -220,6 +235,51 @@ public function testAddProductNotAssignedToWebsite(string $reservedOrderId, stri
         self::assertEquals('PRODUCT_NOT_FOUND', $response['addProductsToCart']['user_errors'][0]['code']);
     }
 
+    /**
+     * @magentoApiDataFixture Magento\Catalog\Test\Fixture\Product as:product1
+     * @magentoApiDataFixture Magento\Catalog\Test\Fixture\Product as:product2
+     * @magentoApiDataFixture Magento\Quote\Test\Fixture\GuestCart as:cart
+     */
+    public function testAddMultipleProductsToEmptyCart(): void
+    {
+        $product1 = $this->fixtures->get('product1');
+        $product2 = $this->fixtures->get('product2');
+        $cart = $this->fixtures->get('cart');
+        $maskedQuoteId = $this->quoteIdToMaskedQuoteIdInterface->execute((int) $cart->getId());
+        $query = $this->getAddMultipleProductsToCartAndReturnCartTotalsMutation(
+            $maskedQuoteId,
+            [
+                [
+                    'sku' => $product1->getSku(),
+                    'quantity' => 2
+                ],
+                [
+                    'sku' => $product2->getSku(),
+                    'quantity' => 3
+                ]
+            ]
+        );
+        $response = $this->graphQlMutation($query);
+        $result = $response['addProductsToCart'];
+        self::assertEmpty($result['user_errors']);
+        self::assertNotEmpty($result['cart']['items']);
+
+        $cartItem = $result['cart']['items'][0];
+        self::assertEquals($product1->getSku(), $cartItem['product']['sku']);
+        self::assertEquals(2, $cartItem['quantity']);
+        self::assertEquals(10, $cartItem['prices']['price']['value']);
+        self::assertEquals(20, $cartItem['prices']['row_total']['value']);
+
+        $cartItem = $result['cart']['items'][1];
+        self::assertEquals($product2->getSku(), $cartItem['product']['sku']);
+        self::assertEquals(3, $cartItem['quantity']);
+        self::assertEquals(10, $cartItem['prices']['price']['value']);
+        self::assertEquals(30, $cartItem['prices']['row_total']['value']);
+
+        $cartTotals = $result['cart']['prices'];
+        self::assertEquals(50, $cartTotals['grand_total']['value']);
+    }
+
     /**
      * @return array
      */
@@ -317,6 +377,61 @@ private function getAddToCartMutation(
         }
     }
 }
+MUTATION;
+    }
+
+    /**
+     * Returns GraphQl mutation for addProductsToCart with cart totals
+     *
+     * @param string $maskedQuoteId
+     * @param array $cartItems
+     * @return string
+     */
+    private function getAddMultipleProductsToCartAndReturnCartTotalsMutation(
+        string $maskedQuoteId,
+        array $cartItems
+    ): string {
+        $cartItemsQuery = preg_replace(
+            '/"([^"]+)"\s*:\s*/',
+            '$1:',
+            json_encode($cartItems)
+        );
+        return  <<<MUTATION
+mutation {
+    addProductsToCart(
+        cartId: "{$maskedQuoteId}",
+        cartItems: $cartItemsQuery
+    ) {
+        cart {
+            items {
+              product {
+                sku
+              }
+              quantity
+              prices {
+                price {
+                  value
+                  currency
+                }
+                row_total {
+                  value
+                  currency
+                }
+              }
+            }
+            prices {
+              grand_total {
+                value
+                currency
+              }
+            }
+        },
+        user_errors {
+            code
+            message
+        }
+    }
+}
 MUTATION;
     }
 }