B2B-2243: Optimize addProductsToCart operations

Roman Hanin · Roman Hanin · commit ea20fdbe0c0a · 2022-09-12T17:31:24.000-05:00
diff --git a/app/code/Magento/Quote/Model/Cart/AddProductsToCart.php b/app/code/Magento/Quote/Model/Cart/AddProductsToCart.php
@@ -8,7 +8,6 @@
 namespace Magento\Quote\Model\Cart;
 
 use Magento\Catalog\Api\ProductRepositoryInterface;
-use Magento\Framework\Api\SearchCriteriaBuilder;
 use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Quote\Api\CartRepositoryInterface;
@@ -68,31 +67,29 @@ class AddProductsToCart
     private $requestBuilder;
 
     /**
-     * @var SearchCriteriaBuilder
+     * @var ProductReaderInterface
      */
-    private $searchCriteriaBuilder;
+    private $productReader;
 
     /**
      * @param ProductRepositoryInterface $productRepository
      * @param CartRepositoryInterface $cartRepository
      * @param MaskedQuoteIdToQuoteIdInterface $maskedQuoteIdToQuoteId
      * @param BuyRequestBuilder $requestBuilder
-     * @param SearchCriteriaBuilder|null $searchCriteriaBuilder
+     * @param ProductReaderInterface $productReader
      */
     public function __construct(
         ProductRepositoryInterface $productRepository,
         CartRepositoryInterface $cartRepository,
         MaskedQuoteIdToQuoteIdInterface $maskedQuoteIdToQuoteId,
         BuyRequestBuilder $requestBuilder,
-        SearchCriteriaBuilder $searchCriteriaBuilder = null
+        ProductReaderInterface $productReader = null
     ) {
         $this->productRepository = $productRepository;
         $this->cartRepository = $cartRepository;
         $this->maskedQuoteIdToQuoteId = $maskedQuoteIdToQuoteId;
         $this->requestBuilder = $requestBuilder;
-        $this->searchCriteriaBuilder = $searchCriteriaBuilder ?: ObjectManager::getInstance()->get(
-            SearchCriteriaBuilder::class
-        );
+        $this->productReader = $productReader ?: ObjectManager::getInstance()->get(ProductReaderInterface::class);
     }
 
     /**
@@ -134,11 +131,9 @@ public function execute(string $maskedCartId, array $cartItems): AddProductsToCa
                 }
             }
         }
-
         if ($saveCart) {
             $this->cartRepository->save($cart);
         }
-
         if (count($allErrors) !== 0) {
             /* Revert changes introduced by add to cart processes in case of an error */
             $cart->getItemsCollection()->clear();
@@ -157,17 +152,14 @@ public function execute(string $maskedCartId, array $cartItems): AddProductsToCa
     public function addItemsToCart(Quote $cart, array $cartItems): array
     {
         $failedCartItems = [];
-        $cartItemSkus = \array_map(
+        // add new cart items for preload
+        $skus = \array_map(
             function ($item) {
                 return $item->getSku();
             },
             $cartItems
         );
-
-        $searchCriteria = $this->searchCriteriaBuilder->addFilter('sku', $cartItemSkus, 'in')->create();
-        // getList() call caches product models in runtime cache
-        $this->productRepository->getList($searchCriteria)->getItems();
-
+        $this->productReader->loadProducts($skus, $cart->getStoreId());
         foreach ($cartItems as $cartItemPosition => $cartItem) {
             $errors = $this->addItemToCart($cart, $cartItem, $cartItemPosition);
             if ($errors) {
@@ -191,37 +183,32 @@ private function addItemToCart(Quote $cart, Data\CartItem $cartItem, int $cartIt
         $sku = $cartItem->getSku();
         $errors = [];
         $result = null;
-        $product = null;
 
         if ($cartItem->getQuantity() <= 0) {
             $errors[] = $this->createError(
                 __('The product quantity should be greater than 0')->render(),
                 $cartItemPosition
             );
         } else {
-            try {
-                $product = $this->productRepository->get($sku, false, $cart->getStoreId(), false);
-            } catch (NoSuchEntityException $e) {
+            $product = $this->productReader->getProductBySku($sku);
+            if (!$product) {
                 $errors[] = $this->createError(
                     __('Could not find a product with SKU "%sku"', ['sku' => $sku])->render(),
                     $cartItemPosition
                 );
             }
+            try {
+                $result = $cart->addProduct($product, $this->requestBuilder->build($cartItem));
+            } catch (\Throwable $e) {
+                $errors[] = $this->createError(
+                    __($e->getMessage())->render(),
+                    $cartItemPosition
+                );
+            }
 
-            if ($product !== null) {
-                try {
-                    $result = $cart->addProduct($product, $this->requestBuilder->build($cartItem));
-                } catch (\Throwable $e) {
-                    $errors[] = $this->createError(
-                        __($e->getMessage())->render(),
-                        $cartItemPosition
-                    );
-                }
-
-                if (is_string($result)) {
-                    foreach (array_unique(explode("\n", $result)) as $error) {
-                        $errors[] = $this->createError(__($error)->render(), $cartItemPosition);
-                    }
+            if (is_string($result)) {
+                foreach (array_unique(explode("\n", $result)) as $error) {
+                    $errors[] = $this->createError(__($error)->render(), $cartItemPosition);
                 }
             }
         }
diff --git a/app/code/Magento/Quote/Model/Cart/ProductReader.php b/app/code/Magento/Quote/Model/Cart/ProductReader.php
@@ -0,0 +1,71 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Quote\Model\Cart;
+
+use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\Catalog\Model\ResourceModel\Product\CollectionFactory as ProductCollectionFactory;
+use Magento\Quote\Model\Quote\Config;
+
+/**
+ * Cart reader product loader.
+ */
+class ProductReader implements ProductReaderInterface
+{
+    /**
+     * @var ProductCollectionFactory
+     */
+    private $productCollectionFactory;
+
+    /**
+     * @var ProductInterface[]
+     */
+    private $productsBySku;
+
+    /**
+     * @var Config
+     */
+    private $quoteConfig;
+
+    /**
+     * @param ProductCollectionFactory $productCollectionFactory
+     * @param Config $quoteConfig
+     */
+    public function __construct(
+        ProductCollectionFactory $productCollectionFactory,
+        Config $quoteConfig
+    ) {
+        $this->productCollectionFactory = $productCollectionFactory;
+        $this->quoteConfig = $quoteConfig;
+    }
+
+    /**
+     * @inheirtdoc
+     */
+    public function loadProducts(array $skus, int $storeId): void
+    {
+        $this->productCollection = $this->productCollectionFactory->create();
+
+        $this->productCollection->addAttributeToSelect($this->quoteConfig->getProductAttributes());
+        $this->productCollection->setStoreId($storeId);
+        $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->load();
+        foreach ($this->productCollection->getItems() as $productItem) {
+            $this->productsBySku[$productItem->getData(ProductInterface::SKU)] = $productItem;
+        }
+    }
+
+    /**
+     * @inheirtdoc
+     */
+    public function getProductBySku(string $sku) : ?ProductInterface
+    {
+        return $this->productsBySku[$sku] ?: null;
+    }
+}
diff --git a/app/code/Magento/Quote/Model/Cart/ProductReaderInterface.php b/app/code/Magento/Quote/Model/Cart/ProductReaderInterface.php
@@ -0,0 +1,33 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Quote\Model\Cart;
+
+use Magento\Catalog\Api\Data\ProductInterface;
+
+/**
+ * Cart layer product loader.
+ */
+interface ProductReaderInterface
+{
+    /**
+     * Load products by skus for specified store.
+     *
+     * @param string[] $skus
+     * @param int $storeId
+     * @return void
+     */
+    public function loadProducts(array $skus, int $storeId);
+
+    /**
+     * Get product by specified sku.
+     *
+     * @param string $sku
+     * @return ProductInterface
+     */
+    public function getProductBySku(string $sku) : ?ProductInterface;
+}
diff --git a/app/code/Magento/Quote/Model/Quote.php b/app/code/Magento/Quote/Model/Quote.php
@@ -368,6 +368,11 @@ class Quote extends AbstractExtensibleModel implements \Magento\Quote\Api\Data\C
      */
     private $allowedCountriesReader;
 
+    /**
+     * @var Quote\Item[]
+     */
+    private $allItemsCache;
+
     /**
      * @param \Magento\Framework\Model\Context $context
      * @param \Magento\Framework\Registry $registry
@@ -1428,16 +1433,17 @@ public function getItemsCollection($useCache = true)
      */
     public function getAllItems()
     {
-        $items = [];
+        if (!empty($this->allItemsCache)) {
+            return $this->allItemsCache;
+        }
         /** @var \Magento\Quote\Model\Quote\Item $item */
         foreach ($this->getItemsCollection() as $item) {
             $product = $item->getProduct();
             if (!$item->isDeleted() && ($product && (int)$product->getStatus() !== ProductStatus::STATUS_DISABLED)) {
-                $items[] = $item;
+                $this->allItemsCache[$product->getSku()] = $item;
             }
         }
-
-        return $items;
+        return $this->allItemsCache;
     }
 
     /**
@@ -1572,7 +1578,7 @@ public function removeItem($itemId)
             if ($parent) {
                 $parent->isDeleted(true);
             }
-
+            unset($this->allItemsCache[$item->getSku()]);
             $this->_eventManager->dispatch('sales_quote_remove_item', ['quote_item' => $item]);
         }
 
@@ -1843,10 +1849,9 @@ public function updateItem($itemId, $buyRequest, $params = null)
      */
     public function getItemByProduct($product)
     {
-        foreach ($this->getAllItems() as $item) {
-            if ($item->representProduct($product)) {
-                return $item;
-            }
+        $item = $this->getAllItems()[$product->getSku()] ?? null;
+        if ($item && $item->representProduct($product)) {
+            return $item;
         }
         return false;
     }
diff --git a/app/code/Magento/Quote/etc/di.xml b/app/code/Magento/Quote/etc/di.xml
@@ -46,6 +46,7 @@
     <preference for="Magento\Quote\Model\ValidationRules\QuoteValidationRuleInterface" type="Magento\Quote\Model\ValidationRules\QuoteValidationComposite\Proxy"/>
     <preference for="Magento\Quote\Model\QuoteMutexInterface" type="Magento\Quote\Model\QuoteMutex"/>
     <preference for="Magento\Quote\Model\Quote\Item\Option\ComparatorInterface" type="Magento\Quote\Model\Quote\Item\Option\Comparator"/>
+    <preference for="Magento\Quote\Model\Cart\ProductReaderInterface" type="Magento\Quote\Model\Cart\ProductReader"/>
     <type name="Magento\Webapi\Controller\Rest\ParamsOverrider">
         <arguments>
             <argument name="paramOverriders" xsi:type="array">
