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

 - Fixed the CR comments.

Author: devarul

app/code/Magento/Persistent/Model/CleanExpiredPersistentQuotes.php

@@ -11,7 +11,6 @@
 use Magento\Store\Model\StoreManagerInterface;
 use Magento\Quote\Model\ResourceModel\Quote\Collection as QuoteCollection;
 use Magento\Persistent\Model\ResourceModel\ExpiredPersistentQuotesCollection;
-use Magento\Customer\Model\Logger as CustomerLogger;
 use Magento\Quote\Model\QuoteRepository;
 use Psr\Log\LoggerInterface;
 use Exception;
@@ -24,14 +23,12 @@ class CleanExpiredPersistentQuotes
     /**
      * @param StoreManagerInterface $storeManager
      * @param ExpiredPersistentQuotesCollection $expiredPersistentQuotesCollection
-     * @param CustomerLogger $customerLogger
      * @param QuoteRepository $quoteRepository
      * @param LoggerInterface $logger
      */
     public function __construct(
         private readonly StoreManagerInterface $storeManager,
         private readonly ExpiredPersistentQuotesCollection $expiredPersistentQuotesCollection,
-        private readonly CustomerLogger $customerLogger,
         private readonly QuoteRepository $quoteRepository,
         private readonly LoggerInterface $logger
     ) {
@@ -73,9 +70,7 @@ private function deletePersistentQuotes(QuoteCollection $quoteCollection): void
     {
         foreach ($quoteCollection as $quote) {
             try {
-                if (!$this->isLoggedInCustomer((int) $quote->getCustomerId())) {
-                    $this->quoteRepository->delete($quote);
-                }
+                $this->quoteRepository->delete($quote);
             } catch (Exception $e) {
                 $message = sprintf(
                     'Unable to delete expired quote (ID: %s): %s',
@@ -88,21 +83,4 @@ private function deletePersistentQuotes(QuoteCollection $quoteCollection): void
 
         $quoteCollection->clear();
     }
-
-    /**
-     * Determine if the customer is currently logged in based on their last login and logout timestamps.
-     *
-     * @param int $customerId
-     * @return bool
-     */
-    private function isLoggedInCustomer(int $customerId): bool
-    {
-        $isLoggedIn = false;
-        $customerLastLoginAt = strtotime($this->customerLogger->get($customerId)->getLastLoginAt());
-        $customerLastLogoutAt = strtotime($this->customerLogger->get($customerId)->getLastLogoutAt());
-        if ($customerLastLoginAt > $customerLastLogoutAt) {
-            $isLoggedIn = true;
-        }
-        return $isLoggedIn;
-    }
 }

app/code/Magento/Persistent/Model/ResourceModel/ExpiredPersistentQuotesCollection.php

@@ -48,6 +48,11 @@ public function getExpiredPersistentQuotes(StoreInterface $store): AbstractColle
 
         /** @var $quotes Collection */
         $quotes = $this->quoteCollectionFactory->create();
+        $quotes->getSelect()->join(
+            ['cl' => $quotes->getTable('customer_log')],
+            'cl.customer_id = main_table.customer_id',
+            []
+        )->where('cl.last_logout_at > cl.last_login_at');
         $quotes->addFieldToFilter('main_table.store_id', $store->getId());
         $quotes->addFieldToFilter('main_table.updated_at', ['lt' => gmdate("Y-m-d H:i:s", time() - $lifetime)]);
         $quotes->addFieldToFilter('main_table.is_persistent', 1);

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

@@ -9,7 +9,6 @@
 
 use Magento\Persistent\Model\CleanExpiredPersistentQuotes;
 use Magento\Persistent\Model\ResourceModel\ExpiredPersistentQuotesCollection;
-use Magento\Customer\Model\Logger as CustomerLogger;
 use Magento\Quote\Model\Quote;
 use Magento\Quote\Model\QuoteRepository;
 use Magento\Store\Model\StoreManagerInterface;
@@ -32,11 +31,6 @@ class CleanExpiredPersistentQuotesTest extends TestCase
      */
     private ExpiredPersistentQuotesCollection $expiredPersistentQuotesCollectionMock;
 
-    /**
-     * @var CustomerLogger
-     */
-    private CustomerLogger $customerLoggerMock;
-
     /**
      * @var QuoteRepository
      */
@@ -56,14 +50,12 @@ protected function setUp(): void
     {
         $this->storeManagerMock = $this->createMock(StoreManagerInterface::class);
         $this->expiredPersistentQuotesCollectionMock = $this->createMock(ExpiredPersistentQuotesCollection::class);
-        $this->customerLoggerMock = $this->createMock(CustomerLogger::class);
         $this->quoteRepositoryMock = $this->createMock(QuoteRepository::class);
         $this->loggerMock = $this->createMock(LoggerInterface::class);
 
         $this->cleanExpiredPersistentQuotes = new CleanExpiredPersistentQuotes(
             $this->storeManagerMock,
             $this->expiredPersistentQuotesCollectionMock,
-            $this->customerLoggerMock,
             $this->quoteRepositoryMock,
             $this->loggerMock
         );
@@ -95,18 +87,9 @@ public function testExecuteDeletesExpiredQuotes(): void
             ->with($storeMock)
             ->willReturn($quoteCollectionMock);
 
-        $quoteMock = $this->getMockBuilder(Quote::class)
-            ->disableOriginalConstructor()
-            ->addMethods(['getCustomerId'])
-            ->getMock();
-        $quoteMock->method('getCustomerId')->willReturn(1);
+        $quoteMock = $this->createMock(Quote::class);
         $quoteCollectionMock->method('getIterator')->willReturn(new \ArrayIterator([$quoteMock]));
 
-        $logMock = $this->createMock(Log::class);
-        $logMock->method('getLastLoginAt')->willReturn('2025-01-01 00:00:00');
-        $logMock->method('getLastLogoutAt')->willReturn('2025-01-01 10:05:00');
-        $this->customerLoggerMock->method('get')->willReturn($logMock);
-
         $this->quoteRepositoryMock->expects($this->once())->method('delete');
 
         $this->cleanExpiredPersistentQuotes->execute($websiteId);

app/code/Magento/Persistent/Test/Unit/Model/ResourceModel/ExpiredPersistentQuotesCollectionTest.php

@@ -14,6 +14,7 @@
 use Magento\Store\Api\Data\StoreInterface;
 use Magento\Persistent\Helper\Data;
 use Magento\Store\Model\ScopeInterface;
+use Magento\Framework\DB\Select;
 use PHPUnit\Framework\TestCase;
 
 class ExpiredPersistentQuotesCollectionTest extends TestCase
@@ -58,6 +59,22 @@ public function testGetExpiredPersistentQuotes(): void
 
         $this->quoteCollectionFactoryMock->method('create')->willReturn($quoteCollectionMock);
 
+        $dbSelectMock = $this->createMock(Select::class);
+        $quoteCollectionMock->method('getSelect')->willReturn($dbSelectMock);
+        $quoteCollectionMock->method('getTable')->willReturn('customer_log');
+        $dbSelectMock->expects($this->once())
+            ->method('join')
+            ->with(
+                $this->equalTo(['cl' => 'customer_log']),
+                $this->equalTo('cl.customer_id = main_table.customer_id'),
+                $this->equalTo([])
+            )
+            ->willReturnSelf();
+        $dbSelectMock->expects($this->once())
+            ->method('where')
+            ->with($this->equalTo('cl.last_logout_at > cl.last_login_at'))
+            ->willReturnSelf();
+
         $quoteCollectionMock->expects($this->exactly(3))
             ->method('addFieldToFilter')
             ->with(