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

Author: tsviklinskyi

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

@@ -69,6 +69,11 @@ class EmailSenderHandler
      */
     private $localeDate;
 
+    /**
+     * @var string
+     */
+    private $modifyStartFromDate = '-1 day';
+
     /**
      * @param \Magento\Sales\Model\Order\Email\Sender $emailSender
      * @param \Magento\Sales\Model\ResourceModel\EntityAbstract $entityResource
@@ -78,6 +83,7 @@ class EmailSenderHandler
      * @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,
@@ -87,7 +93,8 @@ public function __construct(
         IdentityInterface $identityContainer = null,
         \Magento\Store\Model\StoreManagerInterface $storeManager = null,
         ?ValueFactory $configValueFactory = null,
-        ?TimezoneInterface $localeDate = null
+        ?TimezoneInterface $localeDate = null,
+        ?string $modifyStartFromDate = null
     ) {
         $this->emailSender = $emailSender;
         $this->entityResource = $entityResource;
@@ -101,6 +108,7 @@ public function __construct(
 
         $this->configValueFactory = $configValueFactory ?: ObjectManager::getInstance()->get(ValueFactory::class);
         $this->localeDate = $localeDate ?: ObjectManager::getInstance()->get(TimezoneInterface::class);
+        $this->modifyStartFromDate = $modifyStartFromDate ?: $this->modifyStartFromDate;
     }
 
     /**
@@ -179,7 +187,7 @@ private function getStartFromDate(): string
 
         if ($configValue->getId()) {
             $fromDate = $this->localeDate->date($configValue->getUpdatedAt())
-                ->modify('-1 day')->format('Y-m-d H:i:s');
+                ->modify($this->modifyStartFromDate)->format('Y-m-d H:i:s');
         }
 
         return $fromDate;

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

@@ -85,6 +85,11 @@ class EmailSenderHandlerTest extends TestCase
      */
     private $localeDate;
 
+    /**
+     * @var string
+     */
+    private $modifyStartFromDate = '-1 day';
+
     protected function setUp(): void
     {
         $objectManager = new ObjectManager($this);
@@ -135,14 +140,15 @@ protected function setUp(): void
         $this->object = $objectManager->getObject(
             EmailSenderHandler::class,
             [
-                'emailSender'        => $this->emailSender,
-                'entityResource'     => $this->entityResource,
-                'entityCollection'   => $this->entityCollection,
-                'globalConfig'       => $this->globalConfig,
-                'identityContainer'  => $this->identityContainerMock,
-                'storeManager'       => $this->storeManagerMock,
-                'configValueFactory' => $this->configValueFactory,
-                'localeDate'         => $this->localeDate,
+                'emailSender'         => $this->emailSender,
+                'entityResource'      => $this->entityResource,
+                'entityCollection'    => $this->entityCollection,
+                'globalConfig'        => $this->globalConfig,
+                'identityContainer'   => $this->identityContainerMock,
+                'storeManager'        => $this->storeManagerMock,
+                'configValueFactory'  => $this->configValueFactory,
+                'localeDate'          => $this->localeDate,
+                'modifyStartFromDate' => $this->modifyStartFromDate
             ]
         );
     }
@@ -177,7 +183,7 @@ public function testExecute($configValue, $collectionItems, $emailSendingResult)
 
             $dateTime = new \DateTime();
             $nowDate = $dateTime->format('Y-m-d H:i:s');
-            $fromDate = $dateTime->modify('-1 day')->format('Y-m-d H:i:s');
+            $fromDate = $dateTime->modify($this->modifyStartFromDate)->format('Y-m-d H:i:s');
             $this->entityCollection
                 ->expects($this->at(2))
                 ->method('addFieldToFilter')