Merge branch 'ACP2E-2897' of https://github.com/adobe-commerce-tier-4/magento2ce into T4-PR-03-18-2024

Author: thiaramus

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

@@ -157,7 +157,8 @@ private function addItemToCart(Quote $cart, Data\CartItem $cartItem, int $cartIt
                 $cartItemPosition
             );
         } else {
-            $product = $this->productReader->getProductBySku($sku);
+            $productBySku = $this->productReader->getProductBySku($sku);
+            $product = isset($productBySku) ? clone $productBySku : null;
             if (!$product || !$product->isSaleable() || !$product->isAvailable()) {
                 $errors[] = $this->error->create(
                     __('Could not find a product with SKU "%sku"', ['sku' => $sku])->render(),

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

@@ -105,6 +105,64 @@ public function testAddProductWithOptionsResponse()
         );
     }
 
+    #[
+        DataFixture(GuestCart::class, as: 'quote'),
+        DataFixture(QuoteIdMask::class, ['cart_id' => '$quote.id$'], 'quoteIdMask'),
+        DataFixture(
+            Product::class,
+            [
+                'sku' => 'simple1',
+                'options' => [
+                    [
+                        'title' => 'option1',
+                        'type' => ProductCustomOptionInterface::OPTION_TYPE_FIELD,
+                    ]
+                ]
+            ],
+            'product1'
+        ),
+        DataFixture(Indexer::class, as: 'indexer')
+    ]
+    public function testAddSameProductWithDifferentOptionValues()
+    {
+        $uidEncoder = Bootstrap::getObjectManager()->create(Uid::class);
+
+        $cartId = DataFixtureStorageManager::getStorage()->get('quoteIdMask')->getMaskedId();
+        $product = DataFixtureStorageManager::getStorage()->get('product1');
+        /* @var \Magento\Catalog\Api\Data\ProductInterface $product */
+        $sku = $product->getSku();
+        $option = $product->getOptions();
+        $optionUid = $uidEncoder->encode(
+            'custom-option' . '/' . $option[0]->getData()['option_id']
+        );
+
+        // Assert if product options for item added to the cart
+        // are present in mutation response after product with selected option was added
+        $mutation = $this->getAddProductWithDifferentOptionValuesMutation(
+            $cartId,
+            $sku,
+            $optionUid
+        );
+        $response = $this->graphQlMutation($mutation);
+
+        $this->assertArrayHasKey('items', $response['addProductsToCart']['cart']);
+        $this->assertCount(2, $response['addProductsToCart']['cart']['items']);
+        $this->assertArrayHasKey('customizable_options', $response['addProductsToCart']['cart']['items'][0]);
+
+        $this->assertEquals(
+            $response['addProductsToCart']['cart']['items'],
+            $this->getExpectedResponseForDifferentOptionValues($optionUid, $sku)
+        );
+
+        // Assert if product options for item in the cart are present in the response
+        $query = $this->getCartQueryForDifferentOptionValues($cartId);
+        $response = $this->graphQlQuery($query);
+        $this->assertEquals(
+            $this->getExpectedResponseForDifferentOptionValues($optionUid, $sku),
+            $response['cart']['items']
+        );
+    }
+
     #[
         DataFixture(GuestCart::class, as: 'quote'),
         DataFixture(QuoteIdMask::class, ['cart_id' => '$quote.id$'], 'quoteIdMask'),
@@ -268,7 +326,67 @@ private function getAddProductWithOptionMutation(string $cartId, string $sku, st
             }
         }
     }
-} 
+}
+QRY;
+    }
+
+    /**
+     * Returns mutation for the test with different option values
+     *
+     * @param string $cartId
+     * @param string $sku
+     * @param string $optionUid
+     * @return string
+     */
+    private function getAddProductWithDifferentOptionValuesMutation(
+        string $cartId,
+        string $sku,
+        string $optionUid
+    ): string {
+        return <<<QRY
+mutation {
+    addProductsToCart(
+        cartId: "{$cartId}"
+        cartItems: [
+            {
+                quantity:1
+                sku: "{$sku}"
+                entered_options: [{
+                    uid:"{$optionUid}",
+                    value:"value1"
+                }]
+            }
+            {
+                quantity:1
+                sku: "{$sku}"
+                entered_options: [{
+                    uid:"{$optionUid}",
+                    value:"value2"
+                }]
+            }
+        ]
+    ) {
+        cart {
+        id
+            items {
+                quantity
+                product {
+                    sku
+                }
+                ... on SimpleCartItem {
+                    customizable_options {
+                        customizable_option_uid
+                        label
+                        values {
+                            customizable_option_value_uid
+                            value
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
 QRY;
     }
 
@@ -307,6 +425,39 @@ private function getCartQuery(string $cartId): string
 QRY;
     }
 
+    /**
+     * Returns query to get cart with information about item and associated product with different option values
+     *
+     * @param string $cartId
+     * @return string
+     */
+    private function getCartQueryForDifferentOptionValues(string $cartId): string
+    {
+        return <<<QRY
+query {
+    cart(cart_id: "{$cartId}")
+    {
+        items {
+            quantity
+            product {
+                sku
+            }
+            ... on SimpleCartItem {
+                customizable_options {
+                    customizable_option_uid
+                    label
+                    values {
+                        customizable_option_value_uid
+                        value
+                    }
+                }
+            }
+        }
+    }
+}
+QRY;
+    }
+
     /**
      * Formats and returns expected response
      *
@@ -406,4 +557,49 @@ private function getExpectedResponse(string $selectedOptionUid, array $productOp
             ]
         ];
     }
+
+    /**
+     * Returns formatted response for test with different option values
+     *
+     * @param string $selectedOptionUid
+     * @param array $productOptions
+     * @return array
+     */
+    private function getExpectedResponseForDifferentOptionValues(string $optionUid, string $sku): array
+    {
+        return [
+            0 => [
+                "quantity" => 1,
+                "product" => ["sku" => "{$sku}"],
+                "customizable_options" => [
+                    0 => [
+                        "customizable_option_uid" => "{$optionUid}",
+                        "label" => "option1",
+                        "values" => [
+                            0 => [
+                                "customizable_option_value_uid" => "{$optionUid}",
+                                "value" => "value1"
+                            ]
+                        ]
+                    ]
+                ]
+            ],
+            1 => [
+                "quantity" => 1,
+                "product" => ["sku" => "{$sku}"],
+                "customizable_options" => [
+                    0 => [
+                        "customizable_option_uid" => "{$optionUid}",
+                        "label" => "option1",
+                        "values" => [
+                            0 => [
+                                "customizable_option_value_uid" => "{$optionUid}",
+                                "value" => "value2"
+                            ]
+                        ]
+                    ]
+                ]
+            ],
+        ];
+    }
 }