Merge remote-tracking branch 'origin/2.2.10-develop' into MC-18100

Author: zakdma

app/code/Magento/Catalog/Model/Product/Compare/ListCompare.php

@@ -5,7 +5,10 @@
  */
 namespace Magento\Catalog\Model\Product\Compare;
 
+use Magento\Catalog\Model\ProductRepository;
 use Magento\Catalog\Model\ResourceModel\Product\Compare\Item\Collection;
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Exception\NoSuchEntityException;
 
 /**
  * Product Compare List Model
@@ -51,6 +54,11 @@ class ListCompare extends \Magento\Framework\DataObject
      */
     protected $_compareItemFactory;
 
+    /**
+     * @var ProductRepository
+     */
+    private $productRepository;
+
     /**
      * Constructor
      *
@@ -60,20 +68,23 @@ class ListCompare extends \Magento\Framework\DataObject
      * @param \Magento\Customer\Model\Session $customerSession
      * @param \Magento\Customer\Model\Visitor $customerVisitor
      * @param array $data
+     * @param ProductRepository|null $productRepository
      */
     public function __construct(
         \Magento\Catalog\Model\Product\Compare\ItemFactory $compareItemFactory,
         \Magento\Catalog\Model\ResourceModel\Product\Compare\Item\CollectionFactory $itemCollectionFactory,
         \Magento\Catalog\Model\ResourceModel\Product\Compare\Item $catalogProductCompareItem,
         \Magento\Customer\Model\Session $customerSession,
         \Magento\Customer\Model\Visitor $customerVisitor,
-        array $data = []
+        array $data = [],
+        ProductRepository $productRepository = null
     ) {
         $this->_compareItemFactory = $compareItemFactory;
         $this->_itemCollectionFactory = $itemCollectionFactory;
         $this->_catalogProductCompareItem = $catalogProductCompareItem;
         $this->_customerSession = $customerSession;
         $this->_customerVisitor = $customerVisitor;
+        $this->productRepository = $productRepository ?: ObjectManager::getInstance()->create(ProductRepository::class);
         parent::__construct($data);
     }
 
@@ -82,6 +93,7 @@ public function __construct(
      *
      * @param int|\Magento\Catalog\Model\Product $product
      * @return $this
+     * @throws \Exception
      */
     public function addProduct($product)
     {
@@ -90,14 +102,33 @@ public function addProduct($product)
         $this->_addVisitorToItem($item);
         $item->loadByProduct($product);
 
-        if (!$item->getId()) {
+        if (!$item->getId() && $this->productExists($product)) {
             $item->addProductData($product);
             $item->save();
         }
 
         return $this;
     }
 
+    /**
+     * Check product exists.
+     *
+     * @param int|\Magento\Catalog\Model\Product $product
+     * @return bool
+     */
+    private function productExists($product)
+    {
+        if ($product instanceof \Magento\Catalog\Model\Product && $product->getId()) {
+            return true;
+        }
+        try {
+            $product = $this->productRepository->getById((int)$product);
+            return !empty($product->getId());
+        } catch (NoSuchEntityException $e) {
+            return false;
+        }
+    }
+
     /**
      * Add products to compare list
      *

dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Compare/ListCompareTest.php

@@ -6,10 +6,6 @@
 
 namespace Magento\Catalog\Model\Product\Compare;
 
-/**
- * @magentoDataFixture Magento/Catalog/_files/product_simple.php
- * @magentoDataFixture Magento/Customer/_files/customer.php
- */
 class ListCompareTest extends \PHPUnit\Framework\TestCase
 {
     /**
@@ -44,17 +40,44 @@ protected function tearDown()
         $this->_session->setCustomerId(null);
     }
 
+    /**
+     * @magentoDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoDataFixture Magento/Customer/_files/customer.php
+     */
     public function testAddProductWithSession()
     {
         $this->_session->setCustomerId(1);
         /** @var $product \Magento\Catalog\Model\Product */
         $product = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
             ->create(\Magento\Catalog\Model\Product::class)
             ->load(1);
-        $this->_model->addProduct($product);
+        /** @var $product2 \Magento\Catalog\Model\Product */
+        $product2 = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
+            ->create(\Magento\Catalog\Model\Product::class)
+            ->load(6);
+        $products = [$product->getId(), $product2->getId()];
+        $this->_model->addProducts($products);
+
         $this->assertTrue($this->_model->hasItems(1, $this->_visitor->getId()));
     }
 
+    /**
+     * @magentoDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoDataFixture Magento/Customer/_files/customer.php
+     */
+    public function testAddProductWithSessionNeg()
+    {
+        $this->_session->setCustomerId(1);
+        $products = ['none', 99];
+        $this->_model->addProducts($products);
+
+        $this->assertFalse($this->_model->hasItems(1, $this->_visitor->getId()));
+    }
+
+    /**
+     * @magentoDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoDataFixture Magento/Customer/_files/customer.php
+     */
     public function testAddProductWithoutSession()
     {
         /** @var $product \Magento\Catalog\Model\Product */