[GraphQL] Compare products

app/code/Magento/Catalog/Model/CompareList.php

@@ -0,0 +1,24 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Catalog\Model;
+
+use Magento\Framework\Model\AbstractModel;
+
+class CompareList extends AbstractModel
+{
+    /**
+     * Initialize resource
+     *
+     * @return void
+     */
+    protected function _construct()
+    {
+        $this->_init(\Magento\Catalog\Model\ResourceModel\CompareList::class);
+    }
+}

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

@@ -0,0 +1,154 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Catalog\Model\Product\Compare;
+
+use Magento\Catalog\Model\CompareList;
+use Magento\Catalog\Model\CompareListFactory;
+use Magento\Catalog\Model\ResourceModel\CompareList as CompareListResource;
+use Magento\Customer\Model\Session;
+use Magento\Customer\Model\Visitor;
+
+class AddToList
+{
+    /**
+     * @var CompareListFactory
+     */
+    private $compareListFactory;
+
+    /**
+     * @var CompareList
+     */
+    private $compareList;
+
+    /**
+     * @var CompareListResource
+     */
+    private $compareListResource;
+
+    /**
+     * Customer session
+     *
+     * @var Session
+     */
+    private $customerSession;
+
+    /**
+     * Customer visitor
+     *
+     * @var Visitor
+     */
+    private $customerVisitor;
+
+    /**
+     * @param CompareListFactory $compareListFactory
+     * @param CompareList $compareList
+     * @param CompareListResource $compareListResource
+     * @param Session $customerSession
+     * @param Visitor $customerVisitor
+     */
+    public function __construct(
+        CompareListFactory $compareListFactory,
+        CompareList $compareList,
+        CompareListResource $compareListResource,
+        Session $customerSession,
+        Visitor $customerVisitor
+    ) {
+        $this->compareListFactory = $compareListFactory;
+        $this->compareList = $compareList;
+        $this->compareListResource = $compareListResource;
+        $this->customerSession = $customerSession;
+        $this->customerVisitor = $customerVisitor;
+    }
+
+    /**
+     * Get list_id
+     *
+     * @return int
+     */
+    public function execute()
+    {
+        if ($this->customerSession->isLoggedIn()) {
+            return $this->getListIdByCustomerId();
+        }
+
+        return $this->getListIdByVisitorId();
+    }
+
+    /**
+     * Set customer from visitor
+     */
+    public function setCustomerFromVisitor()
+    {
+        $customerId = $this->customerSession->getCustomerId();
+
+        if (!$customerId) {
+            return $this;
+        }
+
+        $visitorId = $this->customerVisitor->getId();
+        $compareListModel = $this->compareListFactory->create();
+        $this->compareListResource->load($compareListModel, $visitorId, 'visitor_id');
+        $compareListModel->setCustomerId($customerId);
+        $compareListModel->save();
+    }
+
+    /**
+     * Get list_id for visitor
+     *
+     * @return int
+     */
+    private function getListIdByVisitorId()
+    {
+        $visitorId = $this->customerVisitor->getId();
+        $compareListModel = $this->compareListFactory->create();
+        $this->compareListResource->load($compareListModel, $visitorId, 'visitor_id');
+        if ($compareListId = $compareListModel->getId()) {
+            return (int)$compareListId;
+        }
+
+        return $this->createCompareList($visitorId, null);
+    }
+
+    /**
+     * Get list_id for logged customers
+     *
+     * @return int
+     */
+    private function getListIdByCustomerId()
+    {
+        $customerId = $this->customerSession->getCustomerId();
+        $compareListModel = $this->compareListFactory->create();
+        $this->compareListResource->load($compareListModel, $customerId, 'customer_id');
+
+        if ($compareListId = $compareListModel->getId()) {
+            return (int)$compareListId;
+        }
+
+        return $this->createCompareList(0, $customerId);
+    }
+
+    /**
+     * Create new compare list
+     *
+     * @param $visitorId
+     * @param $customerId
+     *
+     * @return int
+     */
+    private function createCompareList($visitorId, $customerId)
+    {
+        /* @var $compareList CompareList */
+        $compareList = $this->compareListFactory->create();
+        $compareList->setVisitorId($visitorId);
+        $compareList->setCustomerId($customerId);
+        $compareList->save();
+
+        return (int)$compareList->getId();
+    }
+}

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

@@ -60,6 +60,11 @@ class ListCompare extends \Magento\Framework\DataObject
      */
     private $productRepository;
 
+    /**
+     * @var AddToList
+     */
+    private $addToCompareList;
+
     /**
      * Constructor
      *
@@ -68,6 +73,7 @@ class ListCompare extends \Magento\Framework\DataObject
      * @param \Magento\Catalog\Model\ResourceModel\Product\Compare\Item $catalogProductCompareItem
      * @param \Magento\Customer\Model\Session $customerSession
      * @param \Magento\Customer\Model\Visitor $customerVisitor
+     * @param \Magento\Catalog\Model\Product\Compare\AddToList
      * @param array $data
      * @param ProductRepository|null $productRepository
      */
@@ -77,6 +83,7 @@ public function __construct(
         \Magento\Catalog\Model\ResourceModel\Product\Compare\Item $catalogProductCompareItem,
         \Magento\Customer\Model\Session $customerSession,
         \Magento\Customer\Model\Visitor $customerVisitor,
+        \Magento\Catalog\Model\Product\Compare\AddToList $addToList,
         array $data = [],
         ProductRepository $productRepository = null
     ) {
@@ -85,6 +92,7 @@ public function __construct(
         $this->_catalogProductCompareItem = $catalogProductCompareItem;
         $this->_customerSession = $customerSession;
         $this->_customerVisitor = $customerVisitor;
+        $this->addToCompareList = $addToList;
         $this->productRepository = $productRepository ?: ObjectManager::getInstance()->create(ProductRepository::class);
         parent::__construct($data);
     }
@@ -102,9 +110,11 @@ public function addProduct($product)
         $item = $this->_compareItemFactory->create();
         $this->_addVisitorToItem($item);
         $item->loadByProduct($product);
+        $listId = $this->addToCompareList->execute();
 
         if (!$item->getId() && $this->productExists($product)) {
             $item->addProductData($product);
+            $item->setListId($listId);
             $item->save();
         }
 

app/code/Magento/Catalog/Model/ResourceModel/CompareList.php

@@ -0,0 +1,23 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Catalog\Model\ResourceModel;
+
+use Magento\Framework\Model\ResourceModel\Db\AbstractDb;
+
+
+class CompareList extends AbstractDb
+{
+    /**
+     * @inheritdoc
+     */
+    protected function _construct()
+    {
+        $this->_init('catalog_compare_list', 'list_id');
+    }
+}

app/code/Magento/Catalog/Model/ResourceModel/Product/Compare/Item.php

@@ -5,13 +5,21 @@
  */
 namespace Magento\Catalog\Model\ResourceModel\Product\Compare;
 
+use Magento\Catalog\Model\Product\Compare\AddToList;
+use Magento\Framework\Model\ResourceModel\Db\Context;
+
 /**
  * Catalog compare item resource model
  *
  * @author      Magento Core Team <core@magentocommerce.com>
  */
 class Item extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
 {
+    /**
+     * @var AddToList
+     */
+    private $compareList;
+
     /**
      * Initialize connection
      *
@@ -22,6 +30,20 @@ protected function _construct()
         $this->_init('catalog_compare_item', 'catalog_compare_item_id');
     }
 
+    /**
+     * @param AddToList $addToList
+     * @param Context $context
+     * @param null $connectionName
+     */
+    public function __construct(
+        AddToList $addToList,
+        Context $context,
+        $connectionName = null
+    ) {
+        $this->compareList = $addToList;
+        parent::__construct($context, $connectionName);
+    }
+
     /**
      * Load object by product
      *
@@ -213,6 +235,7 @@ public function updateCustomerFromVisitor($object)
                     $this->getConnection()->quoteInto($this->getIdFieldName() . '=?', $itemId)
                 );
             }
+            $this->compareList->setCustomerFromVisitor();
         }
 
         return $this;

app/code/Magento/Catalog/etc/db_schema.xml

@@ -547,6 +547,8 @@
                 default="0" comment="Product ID"/>
         <column xsi:type="smallint" name="store_id" unsigned="true" nullable="true" identity="false"
                 comment="Store ID"/>
+        <column xsi:type="int" name="list_id" padding="10" unsigned="true" nullable="false" identity="false"
+                comment="List ID"/>
         <constraint xsi:type="primary" referenceId="PRIMARY">
             <column name="catalog_compare_item_id"/>
         </constraint>
@@ -558,6 +560,8 @@
                     referenceColumn="entity_id" onDelete="CASCADE"/>
         <constraint xsi:type="foreign" referenceId="CATALOG_COMPARE_ITEM_STORE_ID_STORE_STORE_ID" table="catalog_compare_item"
                     column="store_id" referenceTable="store" referenceColumn="store_id" onDelete="SET NULL"/>
+        <constraint xsi:type="foreign" referenceId="CATALOG_COMPARE_ITEM_LIST_ID_CATALOG_COMPARE_LIST_LIST_ID" table="catalog_compare_item"
+                    column="list_id" referenceTable="catalog_compare_list" referenceColumn="list_id" onDelete="CASCADE"/>
         <index referenceId="CATALOG_COMPARE_ITEM_PRODUCT_ID" indexType="btree">
             <column name="product_id"/>
         </index>
@@ -573,6 +577,27 @@
             <column name="store_id"/>
         </index>
     </table>
+    <table name="catalog_compare_list" resource="default" engine="innodb" comment="Catalog Compare List with hash Table">
+        <column xsi:type="int" name="list_id" padding="10" unsigned="true" nullable="false"
+                identity="true" comment="Compare List ID"/>
+        <column xsi:type="int" name="visitor_id" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Visitor ID"/>
+        <column xsi:type="int" name="customer_id" padding="10" unsigned="true" nullable="true" identity="false"
+                comment="Customer ID"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="list_id"/>
+        </constraint>
+        <constraint xsi:type="foreign" referenceId="CATALOG_COMPARE_LIST_CUSTOMER_ID_CUSTOMER_ENTITY_ENTITY_ID"
+                    table="catalog_compare_list" column="customer_id" referenceTable="customer_entity"
+                    referenceColumn="entity_id" onDelete="CASCADE"/>
+        <index referenceId="CATALOG_COMPARE_LIST_LIST_ID" indexType="btree">
+            <column name="list_id"/>
+        </index>
+        <index referenceId="CATALOG_COMPARE_LIST_VISITOR_ID_CUSTOMER_ID" indexType="btree">
+            <column name="visitor_id"/>
+            <column name="customer_id"/>
+        </index>
+    </table>
     <table name="catalog_product_website" resource="default" engine="innodb"
            comment="Catalog Product To Website Linkage Table">
         <column xsi:type="int" name="product_id" unsigned="true" nullable="false" identity="false"

app/code/Magento/Catalog/etc/db_schema_whitelist.json

@@ -308,7 +308,8 @@
             "visitor_id": true,
             "customer_id": true,
             "product_id": true,
-            "store_id": true
+            "store_id": true,
+            "list_id": true
         },
         "index": {
             "CATALOG_COMPARE_ITEM_PRODUCT_ID": true,
@@ -320,7 +321,8 @@
             "PRIMARY": true,
             "CATALOG_COMPARE_ITEM_CUSTOMER_ID_CUSTOMER_ENTITY_ENTITY_ID": true,
             "CATALOG_COMPARE_ITEM_PRODUCT_ID_CATALOG_PRODUCT_ENTITY_ENTITY_ID": true,
-            "CATALOG_COMPARE_ITEM_STORE_ID_STORE_STORE_ID": true
+            "CATALOG_COMPARE_ITEM_STORE_ID_STORE_STORE_ID": true,
+            "CATALOG_COMPARE_ITEM_LIST_ID_CATALOG_COMPARE_LIST_LIST_ID": true
         }
     },
     "catalog_product_website": {
@@ -1122,5 +1124,20 @@
             "CATALOG_PRODUCT_FRONTEND_ACTION_VISITOR_ID_PRODUCT_ID_TYPE_ID": true,
             "CATALOG_PRODUCT_FRONTEND_ACTION_CUSTOMER_ID_PRODUCT_ID_TYPE_ID": true
         }
+    },
+    "catalog_compare_list": {
+        "column": {
+            "list_id": true,
+            "visitor_id": true,
+            "customer_id": true
+        },
+        "index": {
+            "CATALOG_COMPARE_LIST_LIST_ID": true,
+            "CATALOG_COMPARE_LIST_VISITOR_ID_CUSTOMER_ID": true
+        },
+        "constraint": {
+            "PRIMARY": true,
+            "CATALOG_COMPARE_LIST_CUSTOMER_ID_CUSTOMER_ENTITY_ENTITY_ID": true
+        }
     }
-}
+}