MC-38717: Sales emails asynchronous sending sends out old emails

Author: tsviklinskyi

app/code/Magento/Sales/Model/EmailSenderHandler.php

@@ -8,8 +8,8 @@
 use Magento\Framework\App\Config\ValueFactory;
 use Magento\Framework\App\Config\ValueInterface;
 use Magento\Framework\App\ObjectManager;
-use Magento\Framework\Stdlib\DateTime\TimezoneInterface;
 use Magento\Sales\Model\Order\Email\Container\IdentityInterface;
+use Magento\Sales\Model\ResourceModel\Collection\AbstractCollection;
 
 /**
  * Sales emails sending
@@ -36,7 +36,7 @@ class EmailSenderHandler
     /**
      * Entity collection model.
      *
-     * @var \Magento\Sales\Model\ResourceModel\Collection\AbstractCollection
+     * @var AbstractCollection
      */
     protected $entityCollection;
 
@@ -64,36 +64,29 @@ class EmailSenderHandler
      */
     private $configValueFactory;
 
-    /**
-     * @var TimezoneInterface
-     */
-    private $localeDate;
-
     /**
      * @var string
      */
-    private $modifyStartFromDate = '-1 day';
+    private $modifyStartFromDate;
 
     /**
      * @param \Magento\Sales\Model\Order\Email\Sender $emailSender
      * @param \Magento\Sales\Model\ResourceModel\EntityAbstract $entityResource
-     * @param \Magento\Sales\Model\ResourceModel\Collection\AbstractCollection $entityCollection
+     * @param AbstractCollection $entityCollection
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $globalConfig
      * @param IdentityInterface|null $identityContainer
      * @param \Magento\Store\Model\StoreManagerInterface|null $storeManager
      * @param ValueFactory|null $configValueFactory
-     * @param TimezoneInterface|null $localeDate
      * @param string|null $modifyStartFromDate
      */
     public function __construct(
         \Magento\Sales\Model\Order\Email\Sender $emailSender,
         \Magento\Sales\Model\ResourceModel\EntityAbstract $entityResource,
-        \Magento\Sales\Model\ResourceModel\Collection\AbstractCollection $entityCollection,
+        AbstractCollection $entityCollection,
         \Magento\Framework\App\Config\ScopeConfigInterface $globalConfig,
         IdentityInterface $identityContainer = null,
         \Magento\Store\Model\StoreManagerInterface $storeManager = null,
         ?ValueFactory $configValueFactory = null,
-        ?TimezoneInterface $localeDate = null,
         ?string $modifyStartFromDate = null
     ) {
         $this->emailSender = $emailSender;
@@ -107,7 +100,6 @@ public function __construct(
             ->get(\Magento\Store\Model\StoreManagerInterface::class);
 
         $this->configValueFactory = $configValueFactory ?: ObjectManager::getInstance()->get(ValueFactory::class);
-        $this->localeDate = $localeDate ?: ObjectManager::getInstance()->get(TimezoneInterface::class);
         $this->modifyStartFromDate = $modifyStartFromDate ?: $this->modifyStartFromDate;
     }
 
@@ -120,8 +112,7 @@ public function sendEmails()
         if ($this->globalConfig->getValue('sales_email/general/async_sending')) {
             $this->entityCollection->addFieldToFilter('send_email', ['eq' => 1]);
             $this->entityCollection->addFieldToFilter('email_sent', ['null' => true]);
-            $startFromDate = $this->getStartFromDate();
-            $this->entityCollection->addFieldToFilter('created_at', ['from' => $startFromDate]);
+            $this->filterCollectionByStartFromDate($this->entityCollection);
             $this->entityCollection->setPageSize(
                 $this->globalConfig->getValue('sales_email/general/sending_limit')
             );
@@ -158,7 +149,7 @@ public function sendEmails()
      * @throws \Magento\Framework\Exception\NoSuchEntityException
      */
     private function getStores(
-        \Magento\Sales\Model\ResourceModel\Collection\AbstractCollection $entityCollection
+        AbstractCollection $entityCollection
     ): array {
         $stores = [];
 
@@ -174,22 +165,24 @@ private function getStores(
     }
 
     /**
-     * Get start from date for collection filter
+     * Filter collection by start from date
      *
-     * @return string
+     * @param AbstractCollection $collection
+     * @return void
      */
-    private function getStartFromDate(): string
+    private function filterCollectionByStartFromDate(AbstractCollection $collection): void
     {
-        $fromDate = $this->localeDate->date()->format('Y-m-d H:i:s');
         /** @var $configValue ValueInterface */
         $configValue = $this->configValueFactory->create();
         $configValue->load('sales_email/general/async_sending', 'path');
 
         if ($configValue->getId()) {
-            $fromDate = $this->localeDate->date($configValue->getUpdatedAt())
-                ->modify($this->modifyStartFromDate)->format('Y-m-d H:i:s');
-        }
+            $startFromDate = date(
+                'Y-m-d H:i:s',
+                strtotime($configValue->getUpdatedAt() . ' ' . $this->modifyStartFromDate)
+            );
 
-        return $fromDate;
+            $collection->addFieldToFilter('created_at', ['from' => $startFromDate]);
+        }
     }
 }

app/code/Magento/Sales/Test/Unit/Model/EmailSenderHandlerTest.php

@@ -12,7 +12,6 @@
 use Magento\Framework\App\Config\Value;
 use Magento\Framework\App\Config\ValueFactory;
 use Magento\Framework\DB\Select;
-use Magento\Framework\Stdlib\DateTime\TimezoneInterface;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\Sales\Model\AbstractModel;
 use Magento\Sales\Model\EmailSenderHandler;
@@ -80,11 +79,6 @@ class EmailSenderHandlerTest extends TestCase
      */
     private $configValueFactory;
 
-    /**
-     * @var TimezoneInterface|MockObject
-     */
-    private $localeDate;
-
     /**
      * @var string
      */
@@ -133,10 +127,6 @@ protected function setUp(): void
             ValueFactory::class
         );
 
-        $this->localeDate = $this->createMock(
-            TimezoneInterface::class
-        );
-
         $this->object = $objectManager->getObject(
             EmailSenderHandler::class,
             [
@@ -147,7 +137,6 @@ protected function setUp(): void
                 'identityContainer'   => $this->identityContainerMock,
                 'storeManager'        => $this->storeManagerMock,
                 'configValueFactory'  => $this->configValueFactory,
-                'localeDate'          => $this->localeDate,
                 'modifyStartFromDate' => $this->modifyStartFromDate
             ]
         );
@@ -181,9 +170,8 @@ public function testExecute($configValue, $collectionItems, $emailSendingResult)
                 ->method('addFieldToFilter')
                 ->with('email_sent', ['null' => true]);
 
-            $dateTime = new \DateTime();
-            $nowDate = $dateTime->format('Y-m-d H:i:s');
-            $fromDate = $dateTime->modify($this->modifyStartFromDate)->format('Y-m-d H:i:s');
+            $nowDate = date('Y-m-d H:i:s');
+            $fromDate = date('Y-m-d H:i:s', strtotime($nowDate . ' ' . $this->modifyStartFromDate));
             $this->entityCollection
                 ->expects($this->at(2))
                 ->method('addFieldToFilter')
@@ -227,10 +215,6 @@ public function testExecute($configValue, $collectionItems, $emailSendingResult)
                 ->method('create')
                 ->willReturn($backendModelMock);
 
-            $this->localeDate->expects($this->exactly(2))
-                ->method('date')
-                ->willReturn(new \DateTime($nowDate));
-
             if ($collectionItems) {
 
                 /** @var AbstractModel|MockObject $collectionItem */

app/code/Magento/Sales/etc/di.xml

@@ -215,6 +215,11 @@
             </argument>
         </arguments>
     </type>
+    <type name="Magento\Sales\Model\EmailSenderHandler">
+        <arguments>
+            <argument name="modifyStartFromDate" xsi:type="string">-1 day</argument>
+        </arguments>
+    </type>
     <virtualType name="SalesOrderIndexGridSyncRemove" type="Magento\Sales\Observer\GridSyncRemoveObserver">
         <arguments>
             <argument name="entityGrid" xsi:type="object">Magento\Sales\Model\ResourceModel\Order\Grid</argument>