MC-20212: [On premise] Data loss due to core cron job called sales_clean_quotes

- fixed
- modified tests

Author: Oleksandr Dubovyk

app/code/Magento/Sales/Cron/CleanExpiredQuotes.php

@@ -5,40 +5,35 @@
  */
 namespace Magento\Sales\Cron;
 
-use Magento\Store\Model\StoresConfig;
+use Magento\Quote\Model\ResourceModel\Quote\Collection;
+use Magento\Sales\Helper\ExpiredQuotesCollection;
+use Magento\Store\Model\StoreManagerInterface;
 
 /**
  * Class CleanExpiredQuotes
  */
 class CleanExpiredQuotes
 {
-    const LIFETIME = 86400;
-
-    /**
-     * @var StoresConfig
-     */
-    protected $storesConfig;
-
     /**
-     * @var \Magento\Quote\Model\ResourceModel\Quote\CollectionFactory
+     * @var ExpiredQuotesCollection
      */
-    protected $quoteCollectionFactory;
+    private $expiredQuotesCollection;
 
     /**
-     * @var array
+     * @var StoreManagerInterface
      */
-    protected $expireQuotesFilterFields = [];
+    private $storeManager;
 
     /**
-     * @param StoresConfig $storesConfig
-     * @param \Magento\Quote\Model\ResourceModel\Quote\CollectionFactory $collectionFactory
+     * @param StoreManagerInterface $storeManager
+     * @param ExpiredQuotesCollection $expiredQuotesCollection
      */
     public function __construct(
-        StoresConfig $storesConfig,
-        \Magento\Quote\Model\ResourceModel\Quote\CollectionFactory $collectionFactory
+        StoreManagerInterface $storeManager,
+        ExpiredQuotesCollection $expiredQuotesCollection
     ) {
-        $this->storesConfig = $storesConfig;
-        $this->quoteCollectionFactory = $collectionFactory;
+        $this->storeManager = $storeManager;
+        $this->expiredQuotesCollection = $expiredQuotesCollection;
     }
 
     /**
@@ -48,42 +43,11 @@ public function __construct(
      */
     public function execute()
     {
-        $lifetimes = $this->storesConfig->getStoresConfigByPath('checkout/cart/delete_quote_after');
-        foreach ($lifetimes as $storeId => $lifetime) {
-            $lifetime *= self::LIFETIME;
-
-            /** @var $quotes \Magento\Quote\Model\ResourceModel\Quote\Collection */
-            $quotes = $this->quoteCollectionFactory->create();
-
-            $quotes->addFieldToFilter('store_id', $storeId);
-            $quotes->addFieldToFilter('updated_at', ['to' => date("Y-m-d", time() - $lifetime)]);
-
-            foreach ($this->getExpireQuotesAdditionalFilterFields() as $field => $condition) {
-                $quotes->addFieldToFilter($field, $condition);
-            }
-
+        $stores = $this->storeManager->getStores(true);
+        foreach ($stores as $store) {
+            /** @var $quotes Collection */
+            $quotes = $this->expiredQuotesCollection->getExpiredQuotes($store);
             $quotes->walk('delete');
         }
     }
-
-    /**
-     * Retrieve expire quotes additional fields to filter
-     *
-     * @return array
-     */
-    protected function getExpireQuotesAdditionalFilterFields()
-    {
-        return $this->expireQuotesFilterFields;
-    }
-
-    /**
-     * Set expire quotes additional fields to filter
-     *
-     * @param array $fields
-     * @return void
-     */
-    public function setExpireQuotesAdditionalFilterFields(array $fields)
-    {
-        $this->expireQuotesFilterFields = $fields;
-    }
 }

app/code/Magento/Sales/Helper/ExpiredQuotesCollection.php

@@ -0,0 +1,99 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Sales\Helper;
+
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Quote\Model\ResourceModel\Quote\Collection;
+use Magento\Quote\Model\ResourceModel\Quote\CollectionFactory;
+use Magento\Store\Api\Data\StoreInterface;
+use Magento\Store\Model\ScopeInterface;
+
+/**
+ * Class ExpiredQuotesCollection
+ */
+class ExpiredQuotesCollection
+{
+    const SECONDS_IN_DAY = 86400;
+    const QUOTE_LIFETIME = 'checkout/cart/delete_quote_after';
+
+    /**
+     * @var CollectionFactory
+     */
+    private $quoteCollectionFactory;
+
+    /**
+     * @var array
+     */
+    private $expireQuotesFilterFields = [];
+
+    /**
+     * @var ScopeConfigInterface
+     */
+    private $config;
+
+    /**
+     * @param ScopeConfigInterface $config
+     * @param CollectionFactory $collectionFactory
+     */
+    public function __construct(
+        ScopeConfigInterface $config,
+        CollectionFactory $collectionFactory
+    ) {
+        $this->config = $config;
+        $this->quoteCollectionFactory = $collectionFactory;
+    }
+
+    /**
+     * Gets expired quotes
+     *
+     * Quote is considered expired if the latest update date
+     * of the quote is greater than lifetime threshold
+     *
+     * @param StoreInterface $store
+     * @return Collection
+     */
+    public function getExpiredQuotes(StoreInterface $store)
+    {
+        $lifetime = $this->config->getValue(
+            self::QUOTE_LIFETIME,
+            ScopeInterface::SCOPE_STORE,
+            $store->getCode()
+        );
+        $lifetime *= self::SECONDS_IN_DAY;
+
+        /** @var $quotes Collection */
+        $quotes = $this->quoteCollectionFactory->create();
+        $quotes->addFieldToFilter('store_id', $store->getId());
+        $quotes->addFieldToFilter('updated_at', ['to' => date("Y-m-d", time() - $lifetime)]);
+
+        foreach ($this->getExpireQuotesAdditionalFilterFields() as $field => $condition) {
+            $quotes->addFieldToFilter($field, $condition);
+        }
+
+        return $quotes;
+    }
+
+    /**
+     * Retrieve expire quotes additional fields to filter
+     *
+     * @return array
+     */
+    private function getExpireQuotesAdditionalFilterFields()
+    {
+        return $this->expireQuotesFilterFields;
+    }
+
+    /**
+     * Set expire quotes additional fields to filter
+     *
+     * @param array $fields
+     * @return void
+     */
+    public function setExpireQuotesAdditionalFilterFields(array $fields)
+    {
+        $this->expireQuotesFilterFields = $fields;
+    }
+}