Merge branch 'ACP2E-3004' of https://github.com/adobe-commerce-tier-4/magento2ce into PR-VK-2024-06-10-CE

Author: vkolesny

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

@@ -8,10 +8,11 @@
 
 use Magento\Catalog\Api\Data\ProductInterface;
 use Magento\Catalog\Model\Product;
-use Magento\Catalog\Model\ResourceModel\Product\Collection;
 use Magento\Catalog\Model\ResourceModel\Product\CollectionFactory as ProductCollectionFactory;
 use Magento\Framework\DataObject;
+use Magento\Framework\Exception\AlreadyExistsException;
 use Magento\Framework\Exception\InputException;
+use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Quote\Api\CartRepositoryInterface;
 use Magento\Quote\Api\Data\CartInterface;
@@ -24,12 +25,16 @@
 use Magento\Sales\Model\OrderFactory;
 use Magento\Framework\App\ObjectManager;
 use Magento\Store\Model\StoreManagerInterface;
+use Magento\Framework\Exception\CouldNotSaveException;
 use Magento\Sales\Model\ResourceModel\Order\Item\Collection as ItemCollection;
+use Magento\Customer\Model\Session as CustomerSession;
 use Psr\Log\LoggerInterface;
 
 /**
  * Allows customer quickly to reorder previously added products and put them to the Cart
+ *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
  */
 class Reorder
 {
@@ -116,6 +121,11 @@ class Reorder
      */
     private bool $addToCartInvalidProduct;
 
+    /**
+     * @var CustomerSession
+     */
+    private $customerSession;
+
     /**
      * @param OrderFactory $orderFactory
      * @param CustomerCartResolver $customerCartProvider
@@ -127,7 +137,7 @@ class Reorder
      * @param OrderInfoBuyRequestGetter $orderInfoBuyRequestGetter
      * @param StoreManagerInterface|null $storeManager
      * @param bool $addToCartInvalidProduct
-     *
+     * @param CustomerSession|null $customerSession
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
@@ -140,7 +150,8 @@ public function __construct(
         ProductCollectionFactory $productCollectionFactory,
         OrderInfoBuyRequestGetter $orderInfoBuyRequestGetter,
         ?StoreManagerInterface   $storeManager = null,
-        bool $addToCartInvalidProduct = false
+        bool $addToCartInvalidProduct = false,
+        ?CustomerSession $customerSession = null
     ) {
         $this->orderFactory = $orderFactory;
         $this->cartRepository = $cartRepository;
@@ -153,6 +164,8 @@ public function __construct(
         $this->storeManager = $storeManager
             ?: ObjectManager::getInstance()->get(StoreManagerInterface::class);
         $this->addToCartInvalidProduct = $addToCartInvalidProduct;
+        $this->customerSession = $customerSession
+            ?: ObjectManager::getInstance()->get(CustomerSession::class);
     }
 
     /**
@@ -163,7 +176,9 @@ public function __construct(
      * @return Data\ReorderOutput
      * @throws InputException Order is not found
      * @throws NoSuchEntityException The specified customer does not exist.
-     * @throws \Magento\Framework\Exception\CouldNotSaveException Could not create customer Cart
+     * @throws CouldNotSaveException
+     * @throws AlreadyExistsException
+     * @throws LocalizedException
      */
     public function execute(string $orderNumber, string $storeId): Data\ReorderOutput
     {
@@ -174,10 +189,10 @@ public function execute(string $orderNumber, string $storeId): Data\ReorderOutpu
                 __('Cannot find order number "%1" in store "%2"', $orderNumber, $storeId)
             );
         }
-        $customerId = (int)$order->getCustomerId();
+        $customerId = (int) $order->getCustomerId();
         $this->errors = [];
 
-        $cart = $customerId === 0
+        $cart = $this->isCustomerReorderAsGuest($customerId)
             ? $this->guestCartResolver->resolve()
             : $this->customerCartProvider->resolve($customerId);
         if (!$this->reorderHelper->isAllowed($order->getStore())) {
@@ -190,7 +205,7 @@ public function execute(string $orderNumber, string $storeId): Data\ReorderOutpu
 
         try {
             $this->cartRepository->save($cart);
-        } catch (\Magento\Framework\Exception\LocalizedException $e) {
+        } catch (LocalizedException $e) {
             // handle exception from \Magento\Quote\Model\QuoteRepository\SaveHandler::save
             $this->addError($e->getMessage());
         }
@@ -207,14 +222,15 @@ public function execute(string $orderNumber, string $storeId): Data\ReorderOutpu
      * @param ItemCollection $orderItems
      * @param string $storeId
      * @return void
+     * @throws LocalizedException
      */
     private function addItemsToCart(Quote $cart, ItemCollection $orderItems, string $storeId): void
     {
         $orderItemProductIds = [];
-        /** @var \Magento\Sales\Model\Order\Item[] $orderItemsByProductId */
+        /** @var Item[] $orderItemsByProductId */
         $orderItemsByProductId = [];
 
-        /** @var \Magento\Sales\Model\Order\Item $item */
+        /** @var Item $item */
         foreach ($orderItems as $item) {
             if ($item->getParentItem() === null) {
                 $orderItemProductIds[] = $item->getProductId();
@@ -228,7 +244,7 @@ private function addItemsToCart(Quote $cart, ItemCollection $orderItems, string
         $productsNotFound = array_diff($orderItemProductIds, array_keys($products));
         if (!empty($productsNotFound)) {
             foreach ($productsNotFound as $productId) {
-                /** @var \Magento\Sales\Model\Order\Item $orderItemProductNotFound */
+                /** @var Item $orderItemProductNotFound */
                 $this->addError(
                     (string)__('Could not find a product with ID "%1"', $productId),
                     self::ERROR_PRODUCT_NOT_FOUND
@@ -253,11 +269,10 @@ private function addItemsToCart(Quote $cart, ItemCollection $orderItems, string
      * @param string $storeId
      * @param int[] $orderItemProductIds
      * @return Product[]
-     * @throws \Magento\Framework\Exception\LocalizedException
+     * @throws LocalizedException
      */
     private function getOrderProducts(string $storeId, array $orderItemProductIds): array
     {
-        /** @var Collection $collection */
         $collection = $this->productCollectionFactory->create();
         $collection->setFlag('has_stock_status_filter', true);
         $collection->setStore($storeId)
@@ -288,7 +303,7 @@ private function addItemToCart(OrderItemInterface $orderItem, Quote $cart, Produ
         try {
             $infoBuyRequest->setAddToCartInvalidProduct($this->addToCartInvalidProduct);
             $addProductResult = $cart->addProduct($product, $infoBuyRequest);
-        } catch (\Magento\Framework\Exception\LocalizedException $e) {
+        } catch (LocalizedException $e) {
             $this->addError($this->getCartItemErrorMessage($orderItem, $product, $e->getMessage()));
         } catch (\Throwable $e) {
             $this->logger->critical($e);
@@ -391,4 +406,15 @@ 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));
     }
+
+    /**
+     * Check customer re-order as guest customer
+     *
+     * @param int $customerId
+     * @return bool
+     */
+    private function isCustomerReorderAsGuest(int $customerId): bool
+    {
+        return $customerId === 0 || !$this->customerSession->isLoggedIn();
+    }
 }