Merge commit '27a592cf38b501bcf05d9ef2e5401a9cff7e986b' into compare-products

Author: Prabhu Ram

app/code/Magento/CompareListGraphQl/Model/Resolver/AssignCompareListToCustomer.php

@@ -89,11 +89,11 @@ public function resolve(
 
         if ($listId) {
             try {
-                $result = $this->setCustomerToCompareList->execute($listId, $context->getUserId());
+                $result = $this->setCustomerToCompareList->execute($listId, $context->getUserId(), $context);
                 if ($result) {
                     return [
                         'result' => true,
-                        'compare_list' => $this->getCompareList->execute($listId, $context)
+                        'compare_list' => $this->getCompareList->execute((int)$result->getListId(), $context)
                     ];
                 }
             } catch (LocalizedException $exception) {

app/code/Magento/CompareListGraphQl/Model/Service/Customer/SetCustomerToCompareList.php

@@ -10,9 +10,13 @@
 use Magento\Catalog\Model\CompareList;
 use Magento\Catalog\Model\CompareListFactory;
 use Magento\Catalog\Model\ResourceModel\Product\Compare\CompareList as ResourceCompareList;
+use Magento\Catalog\Model\ResourceModel\Product\Compare\Item\Collection;
+use Magento\Catalog\Model\ResourceModel\Product\Compare\Item\CollectionFactory as CompareItemsCollectionFactory;
+use Magento\CompareListGraphQl\Model\Service\AddToCompareList;
 use Magento\Framework\GraphQl\Exception\GraphQlAuthenticationException;
 use Magento\Framework\GraphQl\Exception\GraphQlInputException;
 use Magento\Framework\GraphQl\Exception\GraphQlNoSuchEntityException;
+use Magento\Framework\GraphQl\Query\Resolver\ContextInterface;
 
 /**
  * Assign customer to compare list
@@ -34,6 +38,26 @@ class SetCustomerToCompareList
      */
     private $resourceCompareList;
 
+    /**
+     * @var GetListIdByCustomerId
+     */
+    private $getListIdByCustomerId;
+
+    /**
+     * @var Collection
+     */
+    private $items;
+
+    /**
+     * @var CompareItemsCollectionFactory
+     */
+    private $itemCollectionFactory;
+
+    /**
+     * @var AddToCompareList
+     */
+    private $addProductToCompareList;
+
     /**
      * @param ValidateCustomer $validateCustomer
      * @param CompareListFactory $compareListFactory
@@ -42,11 +66,17 @@ class SetCustomerToCompareList
     public function __construct(
         ValidateCustomer $validateCustomer,
         CompareListFactory $compareListFactory,
-        ResourceCompareList $resourceCompareList
+        ResourceCompareList $resourceCompareList,
+        GetListIdByCustomerId $getListIdByCustomerId,
+        CompareItemsCollectionFactory $itemCollectionFactory,
+        AddToCompareList $addProductToCompareList
     ) {
         $this->validateCustomer = $validateCustomer;
         $this->compareListFactory = $compareListFactory;
         $this->resourceCompareList = $resourceCompareList;
+        $this->getListIdByCustomerId = $getListIdByCustomerId;
+        $this->itemCollectionFactory = $itemCollectionFactory;
+        $this->addProductToCompareList = $addProductToCompareList;
     }
 
     /**
@@ -61,12 +91,22 @@ public function __construct(
      * @throws GraphQlInputException
      * @throws GraphQlNoSuchEntityException
      */
-    public function execute(int $listId, int $customerId): ?CompareList
+    public function execute(int $listId, int $customerId, ContextInterface $context): ?CompareList
     {
         if ($this->validateCustomer->execute($customerId)) {
             /** @var CompareList $compareListModel */
             $compareList = $this->compareListFactory->create();
+            $customerListId = $this->getListIdByCustomerId->execute($customerId);
             $this->resourceCompareList->load($compareList, $listId, 'list_id');
+            if ($customerListId) {
+                $this->items = $this->itemCollectionFactory->create();
+                $products = $this->items->getProductsByListId($listId);
+                $this->addProductToCompareList->execute($customerListId, $products, $context);
+                $this->resourceCompareList->delete($compareList);
+                $compareList = $this->compareListFactory->create();
+                $this->resourceCompareList->load($compareList, $customerListId, 'list_id');
+                return $compareList;
+            }
             $compareList->setCustomerId($customerId);
             $this->resourceCompareList->save($compareList);
             return $compareList;