ACP2E-4244: Product not being removed from the compare list after the list is assigned to the customer

Author: katmoon

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

@@ -12,6 +12,7 @@
 use Magento\Catalog\Model\ResourceModel\Product\Compare\CompareList as ResourceCompareList;
 use Magento\Catalog\Model\ResourceModel\Product\Compare\Item\CollectionFactory as CompareItemsCollectionFactory;
 use Magento\CompareListGraphQl\Model\Service\AddToCompareList;
+use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\GraphQl\Query\Resolver\ContextInterface;
 
 /**
@@ -64,18 +65,33 @@ public function __construct(
      * @param int $customerListId
      * @param ContextInterface $context
      * @return CompareList
+     * @throws LocalizedException
      * @throws \Exception
      */
     public function execute(int $guestListId, int $customerListId, ContextInterface $context): CompareList
     {
-        $items = $this->itemCollectionFactory->create();
-        $products = $items->getProductsByListId($guestListId);
+        if ($guestListId === $customerListId) {
+            throw new LocalizedException(__('Cannot merge a list with itself.'));
+        }
 
-        $this->addProductToCompareList->execute($customerListId, $products, $context);
+        $connection = $this->resourceCompareList->getConnection();
+        $connection->beginTransaction();
 
-        $guestList = $this->compareListFactory->create();
-        $this->resourceCompareList->load($guestList, $guestListId, 'list_id');
-        $this->resourceCompareList->delete($guestList);
+        try {
+            $items = $this->itemCollectionFactory->create();
+            $products = $items->getProductsByListId($guestListId);
+
+            $this->addProductToCompareList->execute($customerListId, $products, $context);
+
+            $guestList = $this->compareListFactory->create();
+            $this->resourceCompareList->load($guestList, $guestListId, 'list_id');
+            $this->resourceCompareList->delete($guestList);
+
+            $connection->commit();
+        } catch (\Exception $e) {
+            $connection->rollBack();
+            throw $e;
+        }
 
         $customerList = $this->compareListFactory->create();
         $this->resourceCompareList->load($customerList, $customerListId, 'list_id');

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

@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);