Merge remote-tracking branch 'magento-l3/ACP2E-1975' into JUN062023_PR_sarmistha

Author: glo23503

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

@@ -62,6 +62,7 @@ public function loadProducts(array $skus, int $storeId): void
         $this->productCollection->addFieldToFilter(ProductInterface::SKU, ['in' => $skus]);
         $this->productCollection->joinAttribute('status', 'catalog_product/status', 'entity_id', null, 'inner');
         $this->productCollection->joinAttribute('visibility', 'catalog_product/visibility', 'entity_id', null, 'inner');
+        $this->productCollection->addOptionsToResult();
         $this->productCollection->load();
         foreach ($this->productCollection->getItems() as $productItem) {
             $this->productsBySku[$productItem->getData(ProductInterface::SKU)] = $productItem;

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

@@ -0,0 +1,129 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\GraphQl\Quote;
+
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\TestCase\GraphQlAbstract;
+
+/**
+ * Test GraphQL can add product with customizable option to cart
+ */
+class AddProductWithCustomizableOptionToCartTest extends GraphQlAbstract
+{
+    /**
+     * @var GetCustomOptionsWithUIDForQueryBySku
+     */
+    private $getCustomOptionsWithIDV2ForQueryBySku;
+
+    /**
+     * @var GetMaskedQuoteIdByReservedOrderId
+     */
+    private $getMaskedQuoteIdByReservedOrderId;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp(): void
+    {
+        $objectManager = Bootstrap::getObjectManager();
+        $this->getMaskedQuoteIdByReservedOrderId = $objectManager->get(GetMaskedQuoteIdByReservedOrderId::class);
+        $this->getCustomOptionsWithIDV2ForQueryBySku = $objectManager->get(
+            GetCustomOptionsWithUIDForQueryBySku::class
+        );
+    }
+
+    /**
+     * Test adding a simple product to the shopping cart with all supported
+     * customizable options assigned
+     *
+     * @magentoApiDataFixture Magento/Catalog/_files/product_simple_with_options.php
+     * @magentoApiDataFixture Magento/Checkout/_files/active_quote.php
+     */
+    public function testAddSimpleProductWithOptions()
+    {
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_order_1');
+
+        $sku = 'simple';
+        $qty = 1;
+
+        $itemOptions = $this->getCustomOptionsWithIDV2ForQueryBySku->execute($sku);
+
+        /* The type field is only required for assertions, it should not be present in query */
+        foreach ($itemOptions['entered_options'] as &$enteredOption) {
+            if (isset($enteredOption['type'])) {
+                unset($enteredOption['type']);
+            }
+        }
+
+        $productOptionsQuery = preg_replace(
+            '/"([^"]+)"\s*:\s*/',
+            '$1:',
+            json_encode($itemOptions)
+        );
+
+        $query = $this->getAddToCartMutation($maskedQuoteId, $qty, $sku, trim($productOptionsQuery, '{}'));
+        $response = $this->graphQlMutation($query);
+        self::assertArrayHasKey('items', $response['addProductsToCart']['cart']);
+        self::assertCount($qty, $response['addProductsToCart']['cart']['items']);
+        self::assertNotEmpty($response['addProductsToCart']['cart']['items'][0]['customizable_options']);
+    }
+
+    /**
+     * Returns GraphQl query string
+     *
+     * @param string $maskedQuoteId
+     * @param int $qty
+     * @param string $sku
+     * @param string $customizableOptions
+     * @return string
+     */
+    private function getAddToCartMutation(
+        string $maskedQuoteId,
+        int    $qty,
+        string $sku,
+        string $customizableOptions = ''
+    ): string {
+        return <<<MUTATION
+mutation {
+    addProductsToCart(
+        cartId: "{$maskedQuoteId}",
+        cartItems: [
+            {
+                sku: "{$sku}"
+                quantity: {$qty}
+                {$customizableOptions}
+            }
+        ]
+    ) {
+      cart {
+        items {
+          product {
+            name
+            sku
+          }
+          ... on SimpleCartItem {
+            customizable_options {
+              label
+              customizable_option_uid
+              values {
+                value
+                customizable_option_value_uid
+              }
+            }
+          }
+        }
+      }
+      user_errors {
+        code
+        message
+      }
+    }
+}
+MUTATION;
+    }
+}