29251 test web-api test fix

Author: cpartica

app/code/Magento/ConfigurableProductGraphQl/Model/Cart/BuyRequest/SuperAttributeDataProvider.php

@@ -8,6 +8,8 @@
 namespace Magento\ConfigurableProductGraphQl\Model\Cart\BuyRequest;
 
 use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\CatalogInventory\Api\StockStateInterface;
+use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\GraphQl\Exception\GraphQlInputException;
 use Magento\Framework\GraphQl\Exception\GraphQlNoSuchEntityException;
@@ -16,6 +18,7 @@
 use Magento\Catalog\Api\ProductRepositoryInterface;
 use Magento\ConfigurableProductGraphQl\Model\Options\Collection as OptionCollection;
 use Magento\Framework\EntityManager\MetadataPool;
+use Magento\Quote\Model\Quote;
 
 /**
  * DataProvider for building super attribute options in buy requests
@@ -42,41 +45,67 @@ class SuperAttributeDataProvider implements BuyRequestDataProviderInterface
      */
     private $metadataPool;
 
+    /**
+     * @var StockStateInterface
+     */
+    private $stockState;
+
     /**
      * @param ArrayManager $arrayManager
      * @param ProductRepositoryInterface $productRepository
      * @param OptionCollection $optionCollection
      * @param MetadataPool $metadataPool
+     * @param StockStateInterface $stockState
      */
     public function __construct(
         ArrayManager $arrayManager,
         ProductRepositoryInterface $productRepository,
         OptionCollection $optionCollection,
-        MetadataPool $metadataPool
+        MetadataPool $metadataPool,
+        StockStateInterface $stockState
     ) {
         $this->arrayManager = $arrayManager;
         $this->productRepository = $productRepository;
         $this->optionCollection = $optionCollection;
         $this->metadataPool = $metadataPool;
+        $this->stockState = $stockState;
     }
 
     /**
      * @inheritdoc
      */
     public function execute(array $cartItemData): array
     {
+
         $parentSku = $this->arrayManager->get('parent_sku', $cartItemData);
         if ($parentSku === null) {
             return [];
         }
         $sku = $this->arrayManager->get('data/sku', $cartItemData);
-
+        $qty = $this->arrayManager->get('data/quantity', $cartItemData);
+        $cart = $this->arrayManager->get('model', $cartItemData);
+        if (!$cart instanceof Quote) {
+            throw new LocalizedException(__('"model" value should be specified'));
+        }
         try {
             $parentProduct = $this->productRepository->get($parentSku);
             $product = $this->productRepository->get($sku);
         } catch (NoSuchEntityException $e) {
             throw new GraphQlNoSuchEntityException(__('Could not find specified product.'));
         }
+
+
+        // Child stock check has to be performed a catalog by default would not show/check it
+        $childProduct = $this->productRepository->get($sku, false, null, true);
+
+        $result = $this->stockState->checkQuoteItemQty($childProduct->getId(), $qty, $qty, $qty, $cart->getStoreId());
+
+        if ($result->getHasError() ) {
+            throw new LocalizedException(
+                __($result->getMessage())
+            );
+        }
+
         $configurableProductLinks = $parentProduct->getExtensionAttributes()->getConfigurableProductLinks();
         if (!in_array($product->getId(), $configurableProductLinks)) {
             throw new GraphQlInputException(__('Could not find specified product.'));
@@ -95,6 +124,12 @@ public function execute(array $cartItemData): array
                 }
             }
         }
+        // Some options might be disabled and/or available when parent and child sku are provided
+        if (empty($superAttributesData)) {
+            throw new LocalizedException(
+                __('The product with SKU %sku is out of stock.', ['sku' => $parentSku])
+            );
+        }
         return ['super_attribute' => $superAttributesData];
     }
 }

app/code/Magento/QuoteGraphQl/Model/Cart/AddSimpleProductToCart.php

@@ -9,13 +9,11 @@
 
 use Exception;
 use Magento\Catalog\Api\ProductRepositoryInterface;
-use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\GraphQl\Exception\GraphQlInputException;
 use Magento\Framework\GraphQl\Exception\GraphQlNoSuchEntityException;
 use Magento\Quote\Model\Quote;
 use Magento\QuoteGraphQl\Model\Cart\BuyRequest\BuyRequestBuilder;
-use Magento\CatalogInventory\Api\StockStateInterface;
 
 /**
  * Add simple product to cart
@@ -32,24 +30,16 @@ class AddSimpleProductToCart
      */
     private $buyRequestBuilder;
 
-    /**
-     * @var StockStateInterface
-     */
-    private $stockState;
-
     /**
      * @param ProductRepositoryInterface $productRepository
      * @param BuyRequestBuilder $buyRequestBuilder
-     * @param StockStateInterface $stockState
      */
     public function __construct(
         ProductRepositoryInterface $productRepository,
-        BuyRequestBuilder $buyRequestBuilder,
-        StockStateInterface $stockState
+        BuyRequestBuilder $buyRequestBuilder
     ) {
         $this->productRepository = $productRepository;
         $this->buyRequestBuilder = $buyRequestBuilder;
-        $this->stockState = $stockState;
     }
 
     /**
@@ -62,41 +52,17 @@ public function __construct(
      */
     public function execute(Quote $cart, array $cartItemData): void
     {
+        $cartItemData['model'] = $cart;
         $sku = $this->extractSku($cartItemData);
-        $childSku = $this->extractChildSku($cartItemData);
-        $childSkuQty = $this->extractChildSkuQuantity($cartItemData);
+
         try {
             $product = $this->productRepository->get($sku, false, null, true);
         } catch (NoSuchEntityException $e) {
             throw new GraphQlNoSuchEntityException(__('Could not find a product with SKU "%sku"', ['sku' => $sku]));
         }
 
-        if ($childSku) {
-            $childProduct = $this->productRepository->get($childSku, false, null, true);
-
-            $result = $this->stockState->checkQuoteItemQty(
-                $childProduct->getId(), $childSkuQty, $childSkuQty, $childSkuQty, $cart->getStoreId()
-            );
-
-            if ($result->getHasError() ) {
-                throw new GraphQlInputException(
-                    __(
-                        'Could not add the product with SKU %sku to the shopping cart: %message',
-                        ['sku' => $childSku, 'message' => __($result->getMessage())]
-                    )
-                );
-            }
-        }
-
         try {
-           $buyRequest = $this->buyRequestBuilder->build($cartItemData);
-           // Some options might be disabled and not available
-           if (empty($buyRequest['super_attribute'])) {
-               throw new LocalizedException(
-                   __('The product with SKU %sku is out of stock.', ['sku' => $childSku])
-               );
-           }
-           $result = $cart->addProduct($product, $this->buyRequestBuilder->build($cartItemData));
+            $result = $cart->addProduct($product, $this->buyRequestBuilder->build($cartItemData));
         } catch (Exception $e) {
             throw new GraphQlInputException(
                 __(
@@ -134,33 +100,4 @@ private function extractSku(array $cartItemData): string
         }
         return (string)$cartItemData['data']['sku'];
     }
-
-    /**
-     * Extract option child SKU from cart item data
-     *
-     * @param array $cartItemData
-     * @return string
-     * @throws GraphQlInputException
-     */
-    private function extractChildSku(array $cartItemData): ?string
-    {
-        if (isset($cartItemData['data']['sku'])) {
-            return (string)$cartItemData['data']['sku'];
-        }
-    }
-
-    /**
-     * Extract option child SKU from cart item data
-     *
-     * @param array $cartItemData
-     * @return string
-     * @throws GraphQlInputException
-     */
-    private function extractChildSkuQuantity(array $cartItemData): ?string
-    {
-        if (empty($cartItemData['data']['quantity'])) {
-            throw new GraphQlInputException(__('Missed "quantity" in cart item data'));
-        }
-        return (string)$cartItemData['data']['quantity'];
-    }
 }