Merge remote-tracking branch 'magento-l3/ACP2E-175' into L3_PR_21-10-19

Author: veloraven

app/code/Magento/CatalogGraphQl/Plugin/AvailableProductsFilter.php

@@ -0,0 +1,68 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\CatalogGraphQl\Plugin;
+
+use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Catalog\Model\Product\Attribute\Source\Status as ProductStatus;
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\GraphQl\Model\Query\ContextFactoryInterface;
+
+class AvailableProductsFilter
+{
+    /**
+     * @var ContextFactoryInterface
+     */
+    private $contextFactory;
+
+    /**
+     * @param ContextFactoryInterface $contextFactory
+     */
+    public function __construct(ContextFactoryInterface $contextFactory)
+    {
+        $this->contextFactory = $contextFactory;
+    }
+
+    /**
+     * Check that product is available.
+     *
+     * @param ProductRepositoryInterface $subject
+     * @param ProductInterface $result
+     * @param string $sku
+     * @param bool $editMode
+     * @param int|null $storeId
+     * @param bool $forceReload
+     * @return ProductInterface
+     * @throws NoSuchEntityException
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function afterGet(
+        ProductRepositoryInterface $subject,
+        ProductInterface $result,
+        $sku,
+        $editMode = false,
+        $storeId = null,
+        $forceReload = false
+    ): ProductInterface {
+        if (ProductStatus::STATUS_ENABLED !== (int) $result->getStatus()) {
+            throw new NoSuchEntityException(
+                __("The product that was requested doesn't exist. Verify the product and try again.")
+            );
+        }
+
+        $context = $this->contextFactory->get();
+        $store = $context->getExtensionAttributes()->getStore();
+        if (!in_array($store->getWebsiteId(), $result->getWebsiteIds())) {
+            throw new NoSuchEntityException(
+                __("The product that was requested doesn't exist. Verify the product and try again.")
+            );
+        }
+
+        return $result;
+    }
+}

app/code/Magento/CatalogGraphQl/etc/graphql/di.xml

@@ -188,4 +188,7 @@
             </argument>
         </arguments>
     </type>
+    <type name="Magento\Catalog\Api\ProductRepositoryInterface">
+        <plugin name="availableProductsFilter" type="Magento\CatalogGraphQl\Plugin\AvailableProductsFilter" />
+    </type>
 </config>

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

@@ -92,9 +92,6 @@ public function execute(array $cartItemData): array
         } catch (NoSuchEntityException $e) {
             throw new GraphQlNoSuchEntityException(__('Could not find specified product.'));
         }
-        if (!in_array($cart->getStore()->getWebsiteId(), $product->getWebsiteIds())) {
-            throw new GraphQlNoSuchEntityException(__('Could not find specified product.'));
-        }
 
         $this->checkProductStock($sku, (float) $qty, (int) $cart->getStore()->getWebsiteId());
 

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

@@ -151,15 +151,6 @@ private function addItemToCart(CartInterface $cart, Data\CartItem $cartItem, int
             return;
         }
 
-        if (!in_array($cart->getStoreId(), $product->getStoreIds())) {
-            $this->addError(
-                __('Could not find a product with SKU "%sku"', ['sku' => $sku])->render(),
-                $cartItemPosition
-            );
-
-            return;
-        }
-
         try {
             $result = $cart->addProduct($product, $this->requestBuilder->build($cartItem));
             $this->cartRepository->save($cart);

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

@@ -60,9 +60,6 @@ public function execute(Quote $cart, array $cartItemData): void
         } catch (NoSuchEntityException $e) {
             throw new GraphQlNoSuchEntityException(__('Could not find a product with SKU "%sku"', ['sku' => $sku]));
         }
-        if (!in_array($cart->getStore()->getWebsiteId(), $product->getWebsiteIds())) {
-            throw new GraphQlNoSuchEntityException(__('Could not find a product with SKU "%sku"', ['sku' => $sku]));
-        }
 
         try {
             $result = $cart->addProduct($product, $this->buyRequestBuilder->build($cartItemData));

app/code/Magento/Wishlist/Model/Wishlist/AddProductsToWishlist.php

@@ -117,9 +117,6 @@ private function addItemToWishlist(Wishlist $wishlist, WishlistItem $wishlistIte
             if ((int)$wishlistItem->getQuantity() === 0) {
                 throw new LocalizedException(__("The quantity of a wish list item cannot be 0"));
             }
-            if ($product->getStatus() == Status::STATUS_DISABLED) {
-                throw new LocalizedException(__("The product is disabled"));
-            }
             $options = $this->buyRequestBuilder->build($wishlistItem, (int) $product->getId());
             $result = $wishlist->addNewItem($product, $options);
 

dev/tests/api-functional/testsuite/Magento/GraphQl/ConfigurableProduct/AddConfigurableProductToCartTest.php

@@ -593,6 +593,25 @@ public function testAddMoreProductsFromAnotherStore()
         self::assertEquals($quantity * 2, $cartItem['quantity']);
     }
 
+    /**
+     * @magentoApiDataFixture Magento/ConfigurableProduct/_files/product_configurable_in_multiple_websites_disable_first_child.php
+     * @magentoApiDataFixture Magento/Checkout/_files/active_quote.php
+     */
+    public function testAddConfigurableProductWithDisabledChildToCart(): void
+    {
+        $quantity = 1;
+        $parentSku = 'configurable';
+        $sku = 'simple_Option_1';
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_order_1');
+
+        $this->expectException(\Exception::class);
+        $this->expectExceptionMessage('Could not find specified product.');
+
+        $query = $this->getQuery($maskedQuoteId, $parentSku, $sku, $quantity);
+        $headerMap = ['Store' => 'default'];
+        $this->graphQlMutation($query, [], '', $headerMap);
+    }
+
     /**
      * @param string $maskedQuoteId
      * @param string $parentSku

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

@@ -196,8 +196,7 @@ public function testAddDisabledProductToCart(): void
 
         $this->expectException(ResponseContainsErrorsException::class);
         $this->expectExceptionMessage(
-            'Could not add the product with SKU ' . $sku . ' to the shopping cart: ' .
-            'Product that you are trying to add is not available.'
+            'GraphQL response contains errors: Could not find a product with SKU "' . $sku . '"'
         );
 
         $this->graphQlMutation($query);

dev/tests/api-functional/testsuite/Magento/GraphQl/Wishlist/CustomerWishlistTest.php

@@ -261,7 +261,7 @@ public function testAddProductToWishlistWithDisabledProduct()
             $addToWishlistResponse['addProductsToWishlist']['wishlist']['items_count'],
             'Count is greater than 0'
         );
-        $message = 'The product is disabled';
+        $message = 'Could not find a product with SKU "' . $sku . '"';
         $this->assertEquals(
             $message,
             $addToWishlistResponse['addProductsToWishlist']['user_errors'][0]['message']

dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/product_configurable_in_multiple_websites_disable_first_child.php

@@ -0,0 +1,27 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Catalog\Api\Data\ProductAttributeInterface;
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Catalog\Model\Product\Action;
+use Magento\Catalog\Model\Product\Attribute\Source\Status;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\Workaround\Override\Fixture\Resolver;
+
+Resolver::getInstance()->requireDataFixture('Magento/ConfigurableProduct/_files/configurable_product_two_websites.php');
+
+$childSku = 'simple_Option_1';
+$objectManager = Bootstrap::getObjectManager();
+/** @var ProductRepositoryInterface $productRepository */
+$productRepository = $objectManager->create(ProductRepositoryInterface::class);
+$childProduct = $productRepository->get($childSku);
+$productAction = Bootstrap::getObjectManager()->get(Action::class);
+$productAction->updateAttributes(
+    [$childProduct->getEntityId()],
+    [ProductAttributeInterface::CODE_STATUS => Status::STATUS_DISABLED],
+    $childProduct->getStoreId()
+);