Merge remote-tracking branch 'origin/MAGETWO-89337' into 2.2.4-develop-pr23

Author: DianaRusin

app/code/Magento/Sales/CustomerData/LastOrderedItems.php

@@ -7,11 +7,15 @@
 
 use Magento\Customer\CustomerData\SectionSourceInterface;
 use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Framework\Exception\NoSuchEntityException;
+use Psr\Log\LoggerInterface;
+use Magento\Framework\App\ObjectManager;
 
 /**
  * Returns information for "Recently Ordered" widget.
  * It contains list of 5 salable products from the last placed order.
  * Qty of products to display is limited by LastOrderedItems::SIDEBAR_ORDER_LIMIT constant.
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class LastOrderedItems implements SectionSourceInterface
 {
@@ -60,28 +64,36 @@ class LastOrderedItems implements SectionSourceInterface
      */
     private $productRepository;
 
+    /**
+     * @var LoggerInterface
+     */
+    private $logger;
+
     /**
      * @param \Magento\Sales\Model\ResourceModel\Order\CollectionFactory $orderCollectionFactory
      * @param \Magento\Sales\Model\Order\Config $orderConfig
      * @param \Magento\Customer\Model\Session $customerSession
      * @param \Magento\CatalogInventory\Api\StockRegistryInterface $stockRegistry
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param ProductRepositoryInterface $productRepository
+     * @param LoggerInterface|null $logger
      */
     public function __construct(
         \Magento\Sales\Model\ResourceModel\Order\CollectionFactory $orderCollectionFactory,
         \Magento\Sales\Model\Order\Config $orderConfig,
         \Magento\Customer\Model\Session $customerSession,
         \Magento\CatalogInventory\Api\StockRegistryInterface $stockRegistry,
         \Magento\Store\Model\StoreManagerInterface $storeManager,
-        ProductRepositoryInterface $productRepository
+        ProductRepositoryInterface $productRepository,
+        LoggerInterface $logger = null
     ) {
         $this->_orderCollectionFactory = $orderCollectionFactory;
         $this->_orderConfig = $orderConfig;
         $this->_customerSession = $customerSession;
         $this->stockRegistry = $stockRegistry;
         $this->_storeManager = $storeManager;
         $this->productRepository = $productRepository;
+        $this->logger = $logger ?? ObjectManager::getInstance()->get(LoggerInterface::class);
     }
 
     /**
@@ -118,12 +130,17 @@ protected function getItems()
             /** @var \Magento\Sales\Model\Order\Item $item */
             foreach ($order->getParentItemsRandomCollection($limit) as $item) {
                 /** @var \Magento\Catalog\Model\Product $product */
-                $product = $this->productRepository->getById(
-                    $item->getProductId(),
-                    false,
-                    $this->_storeManager->getStore()->getId()
-                );
-                if ($product && in_array($website, $product->getWebsiteIds())) {
+                try {
+                    $product = $this->productRepository->getById(
+                        $item->getProductId(),
+                        false,
+                        $this->_storeManager->getStore()->getId()
+                    );
+                } catch (NoSuchEntityException $noEntityException) {
+                    $this->logger->critical($noEntityException);
+                    continue;
+                }
+                if (isset($product) && in_array($website, $product->getWebsiteIds())) {
                     $url = $product->isVisibleInSiteVisibility() ? $product->getProductUrl() : null;
                     $items[] = [
                         'id' => $item->getId(),
@@ -152,7 +169,7 @@ protected function isItemAvailableForReorder(\Magento\Sales\Model\Order\Item $or
                 $orderItem->getStore()->getWebsiteId()
             );
             return $stockItem->getIsInStock();
-        } catch (\Magento\Framework\Exception\NoSuchEntityException $noEntityException) {
+        } catch (NoSuchEntityException $noEntityException) {
             return false;
         }
     }

app/code/Magento/Sales/Test/Unit/CustomerData/LastOrderedItemsTest.php

@@ -58,6 +58,11 @@ class LastOrderedItemsTest extends \PHPUnit\Framework\TestCase
      */
     private $section;
 
+    /**
+     * @var \Psr\Log\LoggerInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $loggerMock;
+
     protected function setUp()
     {
         $this->objectManagerHelper = new ObjectManagerHelper($this);
@@ -81,13 +86,16 @@ protected function setUp()
             ->getMock();
         $this->productRepository = $this->getMockBuilder(\Magento\Catalog\Api\ProductRepositoryInterface::class)
             ->getMockForAbstractClass();
+        $this->loggerMock = $this->getMockBuilder(\Psr\Log\LoggerInterface::class)
+            ->getMockForAbstractClass();
         $this->section = new \Magento\Sales\CustomerData\LastOrderedItems(
             $this->orderCollectionFactoryMock,
             $this->orderConfigMock,
             $this->customerSessionMock,
             $this->stockRegistryMock,
             $this->storeManagerMock,
-            $this->productRepository
+            $this->productRepository,
+            $this->loggerMock
         );
     }
 
@@ -196,4 +204,34 @@ private function getLastOrderMock()
             ->willReturnSelf();
         return $this->orderMock;
     }
+
+    public function testGetSectionDataWithNotExistingProduct()
+    {
+        $storeId = 1;
+        $websiteId = 4;
+        $productId = 1;
+        $exception = new \Magento\Framework\Exception\NoSuchEntityException(__("Product doesn't exist"));
+        $orderItemMock = $this->getMockBuilder(\Magento\Sales\Model\Order\Item::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getProductId'])
+            ->getMock();
+        $storeMock = $this->getMockBuilder(\Magento\Store\Api\Data\StoreInterface::class)->getMockForAbstractClass();
+
+        $this->getLastOrderMock();
+        $this->storeManagerMock->expects($this->exactly(2))->method('getStore')->willReturn($storeMock);
+        $storeMock->expects($this->once())->method('getWebsiteId')->willReturn($websiteId);
+        $storeMock->expects($this->once())->method('getId')->willReturn($storeId);
+        $this->orderMock->expects($this->once())
+            ->method('getParentItemsRandomCollection')
+            ->with(\Magento\Sales\CustomerData\LastOrderedItems::SIDEBAR_ORDER_LIMIT)
+            ->willReturn([$orderItemMock]);
+        $orderItemMock->expects($this->once())->method('getProductId')->willReturn($productId);
+        $this->productRepository->expects($this->once())
+            ->method('getById')
+            ->with($productId, false, $storeId)
+            ->willThrowException($exception);
+        $this->loggerMock->expects($this->once())->method('critical')->with($exception);
+
+        $this->assertEquals(['items' => []], $this->section->getSectionData());
+    }
 }