ACP2E-3493: Expired persistent quotes are not cleaned up by a cron job sales_clean_quotes

 - Addressed the CR comments.

Author: devarul

app/code/Magento/Persistent/Model/DeleteExpiredQuote.php renamed to app/code/Magento/Persistent/Model/ResourceModel/DeleteExpiredQuote.php

@@ -5,14 +5,14 @@
  */
 declare(strict_types=1);
 
-namespace Magento\Persistent\Model;
+namespace Magento\Persistent\Model\ResourceModel;
 
 use Magento\Framework\Exception\LocalizedException;
-use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Persistent\Helper\Data;
 use Magento\Store\Model\StoreManagerInterface;
 use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Framework\App\ResourceConnection;
+use Magento\Store\Model\ScopeInterface;
 
 /**
  * Delete expired quote model
@@ -34,23 +34,18 @@ public function __construct(
     /**
      * Delete expired persistent quote for the website
      *
-     * @param int|null $websiteId
+     * @param int $websiteId
      * @return void
      * @throws LocalizedException
-     * @throws NoSuchEntityException
      */
-    public function deleteExpiredQuote(?int $websiteId): void
+    public function deleteExpiredQuote(int $websiteId): void
     {
-        if ($websiteId === null) {
-            $websiteId = $this->storeManager->getStore()->getWebsiteId();
-        }
-
         $storeIds = $this->storeManager->getWebsite($websiteId)->getStoreIds();
 
         $lifetime = $this->scopeConfig->getValue(
             Data::XML_PATH_LIFE_TIME,
-            'website',
-            (int)$websiteId
+            ScopeInterface::SCOPE_WEBSITE,
+            $websiteId
         );
 
         if ($lifetime) {

app/code/Magento/Persistent/Observer/ClearExpiredCronJobObserver.php

@@ -8,7 +8,7 @@
 namespace Magento\Persistent\Observer;
 
 use Magento\Cron\Model\Schedule;
-use Magento\Persistent\Model\DeleteExpiredQuoteFactory;
+use Magento\Persistent\Model\ResourceModel\DeleteExpiredQuote;
 use Magento\Persistent\Model\SessionFactory;
 use Magento\Store\Model\ResourceModel\Website\CollectionFactory;
 
@@ -31,23 +31,23 @@ class ClearExpiredCronJobObserver
     /**
      * A property for delete expired quote factory
      *
-     * @var DeleteExpiredQuoteFactory
+     * @var DeleteExpiredQuote
      */
-    private DeleteExpiredQuoteFactory $deleteExpiredQuoteFactory;
+    private DeleteExpiredQuote $deleteExpiredQuote;
 
     /**
      * @param CollectionFactory $websiteCollectionFactory
      * @param SessionFactory $sessionFactory
-     * @param DeleteExpiredQuoteFactory $deleteExpiredQuoteFactory
+     * @param DeleteExpiredQuote $deleteExpiredQuote
      */
     public function __construct(
         CollectionFactory $websiteCollectionFactory,
         SessionFactory $sessionFactory,
-        DeleteExpiredQuoteFactory $deleteExpiredQuoteFactory
+        DeleteExpiredQuote $deleteExpiredQuote
     ) {
         $this->_websiteCollectionFactory = $websiteCollectionFactory;
         $this->_sessionFactory = $sessionFactory;
-        $this->deleteExpiredQuoteFactory = $deleteExpiredQuoteFactory;
+        $this->deleteExpiredQuote = $deleteExpiredQuote;
     }
 
     /**
@@ -64,10 +64,9 @@ public function execute(Schedule $schedule)
             return $this;
         }
 
-        $deleteExpiredQuote = $this->deleteExpiredQuoteFactory->create();
         foreach ($websiteIds as $websiteId) {
             $this->_sessionFactory->create()->deleteExpired($websiteId);
-            $deleteExpiredQuote->deleteExpiredQuote((int) $websiteId);
+            $this->deleteExpiredQuote->deleteExpiredQuote((int) $websiteId);
         }
 
         return $this;

app/code/Magento/Persistent/Test/Unit/Model/DeleteExpiredQuoteTest.php

@@ -10,7 +10,7 @@
 use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Framework\App\ResourceConnection;
 use Magento\Persistent\Helper\Data;
-use Magento\Persistent\Model\DeleteExpiredQuote;
+use Magento\Persistent\Model\ResourceModel\DeleteExpiredQuote;
 use Magento\Store\Model\StoreManagerInterface;
 use Magento\Store\Model\Website;
 use Magento\Store\Api\Data\StoreInterface;
@@ -101,49 +101,6 @@ public function testDeleteExpiredQuote(): void
         $this->model->deleteExpiredQuote($websiteId);
     }
 
-    /**
-     * Test deleting expired quotes when no websiteId is provided.
-     */
-    public function testDeleteExpiredQuoteWithNullWebsiteId(): void
-    {
-        // Mock the store manager and store data
-        $websiteId = 1;
-        $storeIds = [1, 2];
-        $websiteMock = $this->createMock(Website::class);
-        $websiteMock->method('getStoreIds')->willReturn($storeIds);
-        $this->storeManagerMock->method('getWebsite')->with($websiteId)->willReturn($websiteMock);
-        $this->storeManagerMock->method('getStore')->willReturn($this->storeMock);
-        $this->storeMock->method('getWebsiteId')->willReturn($websiteId);
-
-        // Mock the scope config to return a specific lifetime
-        $lifetime = 60; // 1 hour in seconds
-        $this->scopeConfigMock->method('getValue')
-            ->with(Data::XML_PATH_LIFE_TIME, 'website', $websiteId)
-            ->willReturn($lifetime);
-
-        // Mock the database connection
-        $connectionMock = $this->createMock(\Magento\Framework\DB\Adapter\AdapterInterface::class);
-        $this->resourceConnectionMock->method('getConnection')->willReturn($connectionMock);
-        $connectionMock->expects($this->once())
-            ->method('delete')
-            ->with(
-                $this->resourceConnectionMock->getTableName('quote'),
-                $this->callback(function ($condition) use ($storeIds, $lifetime) {
-                    // Validate the delete condition
-                    $expiredBefore = gmdate('Y-m-d H:i:s', time() - $lifetime);
-                    return isset($condition['store_id in (?)']) &&
-                        $condition['store_id in (?)'] === $storeIds &&
-                        isset($condition['updated_at < ?']) &&
-                        $condition['updated_at < ?'] === $expiredBefore &&
-                        isset($condition['is_persistent']) &&
-                        $condition['is_persistent'] === 1;
-                })
-            );
-
-        // Call the method to test with null websiteId
-        $this->model->deleteExpiredQuote(null);
-    }
-
     /**
      * Test when there is no lifetime configured.
      */

app/code/Magento/Persistent/Test/Unit/Observer/ClearExpiredCronJobObserverTest.php

@@ -13,8 +13,7 @@
 use Magento\Persistent\Observer\ClearExpiredCronJobObserver;
 use Magento\Store\Model\ResourceModel\Website\Collection;
 use Magento\Store\Model\ResourceModel\Website\CollectionFactory;
-use Magento\Persistent\Model\DeleteExpiredQuote;
-use Magento\Persistent\Model\DeleteExpiredQuoteFactory;
+use Magento\Persistent\Model\ResourceModel\DeleteExpiredQuote;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 
@@ -35,11 +34,6 @@ class ClearExpiredCronJobObserverTest extends TestCase
      */
     protected $sessionFactoryMock;
 
-    /**
-     * @var MockObject
-     */
-    protected $deleteExpiredQuoteFactoryMock;
-
     /**
      * @var MockObject
      */
@@ -68,10 +62,6 @@ protected function setUp(): void
             SessionFactory::class,
             ['create']
         );
-        $this->deleteExpiredQuoteFactoryMock = $this->createPartialMock(
-            DeleteExpiredQuoteFactory::class,
-            ['create']
-        );
         $this->scheduleMock = $this->createMock(Schedule::class);
         $this->sessionMock = $this->createMock(Session::class);
         $this->websiteCollectionMock
@@ -82,7 +72,7 @@ protected function setUp(): void
         $this->model = new ClearExpiredCronJobObserver(
             $this->collectionFactoryMock,
             $this->sessionFactoryMock,
-            $this->deleteExpiredQuoteFactoryMock
+            $this->deleteExpiredQuoteMock
         );
     }
 
@@ -97,10 +87,6 @@ public function testExecute()
             ->expects($this->once())
             ->method('create')
             ->willReturn($this->sessionMock);
-        $this->deleteExpiredQuoteFactoryMock
-            ->expects($this->once())
-            ->method('create')
-            ->willReturn($this->deleteExpiredQuoteMock);
         $this->sessionMock->expects($this->once())->method('deleteExpired')->with(1);
         $this->deleteExpiredQuoteMock->expects($this->once())->method('deleteExpiredQuote')->with(1);
         $this->model->execute($this->scheduleMock);