Merge pull request #5659 from magento-performance/MC-33400-cart-addorderitem-improvement

[Performance] MC-33400 Cart Add Order Item-improvement

Author: duhon

app/code/Magento/Bundle/Model/ResourceModel/Option.php

@@ -92,29 +92,29 @@ protected function _afterSave(AbstractModel $object)
  {
  parent::_afterSave($object);
 
- $condition = [
- 'option_id = ?' => $object->getId(),
- 'store_id = ? OR store_id = 0' => $object->getStoreId(),
- 'parent_product_id = ?' => $object->getParentId()
- ];
-
  $connection = $this->getConnection();
- $connection->delete($this->getTable('catalog_product_bundle_option_value'), $condition);
-
  $data = new DataObject();
  $data->setOptionId($object->getId())
  ->setStoreId($object->getStoreId())
  ->setParentProductId($object->getParentId())
  ->setTitle($object->getTitle());
 
- $connection->insert($this->getTable('catalog_product_bundle_option_value'), $data->getData());
+ $connection->insertOnDuplicate(
+ $this->getTable('catalog_product_bundle_option_value'),
+ $data->getData(),
+ ['title']
+ );
 
  /**
  * also saving default fallback value
  */
  if (0 !== (int)$object->getStoreId()) {
  $data->setStoreId(0)->setTitle($object->getDefaultTitle());
- $connection->insert($this->getTable('catalog_product_bundle_option_value'), $data->getData());
+ $connection->insertOnDuplicate(
+ $this->getTable('catalog_product_bundle_option_value'),
+ $data->getData(),
+ ['title']
+ );
  }
 
  return $this;

app/code/Magento/Catalog/Test/Mftf/Test/StoreFrontRecentlyComparedAtWebsiteLevelTest.xml

@@ -18,6 +18,9 @@
  <useCaseId value="MC-32763"/>
  <group value="catalog"/>
  <group value="widget"/>
+ <skip>
+ <issueId value="MC-34091"/>
+ </skip>
  </annotations>
  <before>
  <!-- Set Stores > Configurations > Catalog > Recently Viewed/Compared Products > Show for Current = Website -->

app/code/Magento/Sales/Model/Reorder/Reorder.php

@@ -6,16 +6,22 @@
 declare(strict_types=1);
 namespace Magento\Sales\Model\Reorder;
 
+use Magento\Catalog\Api\Data\ProductInterface;
 use Magento\Catalog\Api\ProductRepositoryInterface;
 use Magento\Catalog\Model\Product;
+use Magento\Catalog\Model\ResourceModel\Product\Collection;
 use Magento\Framework\Exception\InputException;
 use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Quote\Api\CartRepositoryInterface;
 use Magento\Quote\Api\Data\CartInterface;
 use Magento\Quote\Model\Cart\CustomerCartResolver;
+use Magento\Quote\Model\Quote as Quote;
+use Magento\Sales\Api\Data\OrderItemInterface;
 use Magento\Sales\Helper\Reorder as ReorderHelper;
 use Magento\Sales\Model\Order\Item;
 use Magento\Sales\Model\OrderFactory;
+use Magento\Sales\Model\ResourceModel\Order\Item\Collection as ItemCollection;
+use Magento\Catalog\Model\ResourceModel\Product\CollectionFactory as ProductCollectionFactory;
 
 /**
  * Allows customer quickly to reorder previously added products and put them to the Cart
@@ -81,28 +87,36 @@ class Reorder
  */
  private $customerCartProvider;
 
+ /**
+ * @var ProductCollectionFactory
+ */
+ private $productCollectionFactory;
+
  /**
  * @param OrderFactory $orderFactory
  * @param CustomerCartResolver $customerCartProvider
  * @param CartRepositoryInterface $cartRepository
  * @param ProductRepositoryInterface $productRepository
  * @param ReorderHelper $reorderHelper
  * @param \Psr\Log\LoggerInterface $logger
+ * @param ProductCollectionFactory $productCollectionFactory
  */
  public function __construct(
  OrderFactory $orderFactory,
  CustomerCartResolver $customerCartProvider,
  CartRepositoryInterface $cartRepository,
  ProductRepositoryInterface $productRepository,
  ReorderHelper $reorderHelper,
- \Psr\Log\LoggerInterface $logger
+ \Psr\Log\LoggerInterface $logger,
+ ProductCollectionFactory $productCollectionFactory
  ) {
  $this->orderFactory = $orderFactory;
  $this->cartRepository = $cartRepository;
  $this->productRepository = $productRepository;
  $this->reorderHelper = $reorderHelper;
  $this->logger = $logger;
  $this->customerCartProvider = $customerCartProvider;
+ $this->productCollectionFactory = $productCollectionFactory;
  }
 
  /**
@@ -133,10 +147,7 @@ public function execute(string $orderNumber, string $storeId): Data\ReorderOutpu
  return $this->prepareOutput($cart);
  }
 
- $items = $order->getItemsCollection();
- foreach ($items as $item) {
- $this->addOrderItem($cart, $item);
- }
+ $this->addItemsToCart($cart, $order->getItemsCollection(), $storeId);
 
  try {
  $this->cartRepository->save($cart);
@@ -145,52 +156,109 @@ public function execute(string $orderNumber, string $storeId): Data\ReorderOutpu
  $this->addError($e->getMessage());
  }
 
- $cart = $this->cartRepository->get($cart->getId());
+ $savedCart = $this->cartRepository->get($cart->getId());
 
- return $this->prepareOutput($cart);
+ return $this->prepareOutput($savedCart);
  }
 
  /**
- * Convert order item to quote item
+ * Add collections of order items to cart.
  *
- * @param \Magento\Quote\Model\Quote $cart
- * @param Item $orderItem
+ * @param Quote $cart
+ * @param ItemCollection $orderItems
+ * @param string $storeId
  * @return void
  */
- private function addOrderItem(\Magento\Quote\Model\Quote $cart, $orderItem): void
+ private function addItemsToCart(Quote $cart, ItemCollection $orderItems, string $storeId): void
  {
- /* @var $orderItem Item */
- if ($orderItem->getParentItem() === null) {
- $info = $orderItem->getProductOptionByCode('info_buyRequest');
- $info = new \Magento\Framework\DataObject($info);
- $info->setQty($orderItem->getQtyOrdered());
-
- try {
- /** @var Product $product */
- $product = $this->productRepository->getById($orderItem->getProductId(), false, null, true);
- } catch (NoSuchEntityException $e) {
+ $orderItemProductIds = [];
+ /** @var \Magento\Sales\Model\Order\Item[] $orderItemsByProductId */
+ $orderItemsByProductId = [];
+
+ /** @var \Magento\Sales\Model\Order\Item $item */
+ foreach ($orderItems as $item) {
+ if ($item->getParentItem() === null) {
+ $orderItemProductIds[] = $item->getProductId();
+ $orderItemsByProductId[$item->getProductId()][$item->getId()] = $item;
+ }
+ }
+
+ $products = $this->getOrderProducts($storeId, $orderItemProductIds);
+
+ // compare founded products and throw an error if some product not exists
+ $productsNotFound = array_diff($orderItemProductIds, array_keys($products));
+ if (!empty($productsNotFound)) {
+ foreach ($productsNotFound as $productId) {
+ /** @var \Magento\Sales\Model\Order\Item $orderItemProductNotFound */
  $this->addError(
- (string)__('Could not find a product with ID "%1"', $orderItem->getProductId()),
+ (string)__('Could not find a product with ID "%1"', $productId),
  self::ERROR_PRODUCT_NOT_FOUND
  );
- return;
  }
- $addProductResult = null;
- try {
- $addProductResult = $cart->addProduct($product, $info);
- } catch (\Magento\Framework\Exception\LocalizedException $e) {
- $this->addError($this->getCartItemErrorMessage($orderItem, $product, $e->getMessage()));
- } catch (\Throwable $e) {
- $this->logger->critical($e);
- $this->addError($this->getCartItemErrorMessage($orderItem, $product), self::ERROR_UNDEFINED);
+ }
+
+ foreach ($orderItemsByProductId as $productId => $orderItems) {
+ if (!isset($products[$productId])) {
+ continue;
+ }
+ $product = $products[$productId];
+ foreach ($orderItems as $orderItem) {
+ $this->addItemToCart($orderItem, $cart, clone $product);
  }
+ }
+ }
+
+ /**
+ * Get order products by store id and order item product ids.
+ *
+ * @param string $storeId
+ * @param int[] $orderItemProductIds
+ * @return Product[]
+ * @throws \Magento\Framework\Exception\LocalizedException
+ */
+ private function getOrderProducts(string $storeId, array $orderItemProductIds): array
+ {
+ /** @var Collection $collection */
+ $collection = $this->productCollectionFactory->create();
+ $collection->setStore($storeId)
+ ->addIdFilter($orderItemProductIds)
+ ->addStoreFilter()
+ ->addAttributeToSelect('*')
+ ->joinAttribute('status', 'catalog_product/status', 'entity_id', null, 'inner')
+ ->joinAttribute('visibility', 'catalog_product/visibility', 'entity_id', null, 'inner');
+
+ return $collection->getItems();
+ }
+
+ /**
+ * Adds order item product to cart.
+ *
+ * @param OrderItemInterface $orderItem
+ * @param Quote $cart
+ * @param ProductInterface $product
+ * @return void
+ */
+ private function addItemToCart(OrderItemInterface $orderItem, Quote $cart, ProductInterface $product): void
+ {
+ $info = $orderItem->getProductOptionByCode('info_buyRequest');
+ $info = new \Magento\Framework\DataObject($info);
+ $info->setQty($orderItem->getQtyOrdered());
+
+ $addProductResult = null;
+ try {
+ $addProductResult = $cart->addProduct($product, $info);
+ } catch (\Magento\Framework\Exception\LocalizedException $e) {
+ $this->addError($this->getCartItemErrorMessage($orderItem, $product, $e->getMessage()));
+ } catch (\Throwable $e) {
+ $this->logger->critical($e);
+ $this->addError($this->getCartItemErrorMessage($orderItem, $product), self::ERROR_UNDEFINED);
+ }
 
- // error happens in case the result is string
- if (is_string($addProductResult)) {
- $errors = array_unique(explode("\n", $addProductResult));
- foreach ($errors as $error) {
- $this->addError($this->getCartItemErrorMessage($orderItem, $product, $error));
- }
+ // error happens in case the result is string
+ if (is_string($addProductResult)) {
+ $errors = array_unique(explode("\n", $addProductResult));
+ foreach ($errors as $error) {
+ $this->addError($this->getCartItemErrorMessage($orderItem, $product, $error));
  }
  }
  }