MC-41981: [Magento Cloud] Reorder Not Working On Storefront

Author: thiaramus

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

@@ -0,0 +1,71 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+namespace Magento\Sales\Model\Reorder;
+
+use Magento\Framework\DataObject;
+use Magento\Sales\Api\Data\OrderItemInterface;
+use Magento\Framework\Serialize\SerializerInterface;
+use Psr\Log\LoggerInterface;
+
+/**
+ * Gets info buy request from order info interface and process custom options
+ */
+class OrderInfoBuyRequestGetter
+{
+    /**
+     * @var LoggerInterface
+     */
+    private $logger;
+
+    /**
+     * @var SerializerInterface
+     */
+    private $serializer;
+
+    /**
+     * @param LoggerInterface $logger
+     * @param SerializerInterface $serializer
+     */
+    public function __construct(
+        LoggerInterface $logger,
+        SerializerInterface $serializer
+    ) {
+        $this->logger = $logger;
+        $this->serializer = $serializer;
+    }
+
+    /**
+     *  Prepare Custom Option for order Item by unserializing custom options data
+     *
+     * @param OrderItemInterface $orderItem
+     * @return DataObject
+     */
+    public function getInfoBuyRequest(OrderItemInterface $orderItem): DataObject
+    {
+        $info = $orderItem->getProductOptionByCode('info_buyRequest');
+        $options = $orderItem->getProductOptionByCode('options');
+
+        if (!empty($options) || is_array($info['options'])) {
+            foreach ($options as $option) {
+                if (array_key_exists($option['option_id'], $info['options'])) {
+                    try {
+                        $value = $this->serializer->unserialize($option['option_value']);
+                        $info['options'][$option['option_id']] = $value;
+                    } catch (\InvalidArgumentException $exception) {
+                        $this->logger->warning($exception);
+                    }
+                }
+            }
+        }
+
+        $infoBuyRequest = new DataObject($info);
+        $infoBuyRequest->setQty($orderItem->getQtyOrdered());
+
+        return $infoBuyRequest;
+    }
+
+}

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

@@ -22,7 +22,7 @@
 use Magento\Sales\Model\OrderFactory;
 use Magento\Sales\Model\ResourceModel\Order\Item\Collection as ItemCollection;
 use Magento\Catalog\Model\ResourceModel\Product\CollectionFactory as ProductCollectionFactory;
-use \Magento\Framework\Serialize\SerializerInterface;
+use Psr\Log\LoggerInterface;
 
 /**
  * Allows customer quickly to reorder previously added products and put them to the Cart
@@ -64,7 +64,7 @@ class Reorder
     private $reorderHelper;
 
     /**
-     * @var \Psr\Log\LoggerInterface
+     * @var LoggerInterface
      */
     private $logger;
 
@@ -94,28 +94,29 @@ class Reorder
     private $guestCartResolver;
 
     /**
-     * @var SerializerInterface
+     * @var OrderInfoBuyRequestGetter
      */
-    private $serializer;
+    private $orderInfoBuyRequestGetter;
 
     /**
      * @param OrderFactory $orderFactory
      * @param CustomerCartResolver $customerCartProvider
      * @param GuestCartResolver $guestCartResolver
      * @param CartRepositoryInterface $cartRepository
      * @param ReorderHelper $reorderHelper
-     * @param \Psr\Log\LoggerInterface $logger
+     * @param LoggerInterface $logger
      * @param ProductCollectionFactory $productCollectionFactory
+     * @param OrderInfoBuyRequestGetter $orderInfoBuyRequestGetter
      */
     public function __construct(
         OrderFactory $orderFactory,
         CustomerCartResolver $customerCartProvider,
         GuestCartResolver $guestCartResolver,
         CartRepositoryInterface $cartRepository,
         ReorderHelper $reorderHelper,
-        \Psr\Log\LoggerInterface $logger,
+        LoggerInterface $logger,
         ProductCollectionFactory $productCollectionFactory,
-        \Magento\Framework\Serialize\SerializerInterface $serializer
+        OrderInfoBuyRequestGetter $orderInfoBuyRequestGetter
     ) {
         $this->orderFactory = $orderFactory;
         $this->cartRepository = $cartRepository;
@@ -124,7 +125,7 @@ public function __construct(
         $this->customerCartProvider = $customerCartProvider;
         $this->guestCartResolver = $guestCartResolver;
         $this->productCollectionFactory = $productCollectionFactory;
-        $this->serializer = $serializer;
+        $this->orderInfoBuyRequestGetter = $orderInfoBuyRequestGetter;
     }
 
     /**
@@ -251,9 +252,7 @@ private function getOrderProducts(string $storeId, array $orderItemProductIds):
      */
     private function addItemToCart(OrderItemInterface $orderItem, Quote $cart, ProductInterface $product): void
     {
-        $infoBuyRequest = $this->getInfoBuyRequest($orderItem);
-        $infoBuyRequest  = new \Magento\Framework\DataObject($infoBuyRequest );
-        $infoBuyRequest->setQty($orderItem->getQtyOrdered());
+        $infoBuyRequest = $this->orderInfoBuyRequestGetter->getInfoBuyRequest($orderItem);
 
         $addProductResult = null;
         try {
@@ -346,35 +345,4 @@ private function getCartItemErrorMessage(Item $item, Product $product, string $m
             ? __('Could not add the product with SKU "%1" to the shopping cart: %2', $sku, $message)
             : __('Could not add the product with SKU "%1" to the shopping cart', $sku));
     }
-
-    /**
-     *  Prepare Custom Option for order Item
-     *
-     * @param OrderItemInterface $orderItem
-     * @return array|null
-     */
-    private function getInfoBuyRequest(OrderItemInterface $orderItem): ?array
-    {
-        $info = $orderItem->getProductOptionByCode('info_buyRequest');
-        $options = $orderItem->getProductOptionByCode('options');
-
-        if (empty($options) || !is_array($info['options'])) {
-            return $info;
-        }
-
-        foreach ($options as $option) {
-            if (array_key_exists($option['option_id'], $info['options'])) {
-                try {
-                    $value = $this->serializer->unserialize($option['option_value']);
-                    $info['options'][$option['option_id']] = $value;
-                } catch (\InvalidArgumentException $exception) {
-                    //log the exception as warning
-                    $this->_logger->warning($exception);
-                }
-            }
-        }
-
-        return $info;
-    }
-
 }