ACP2E-2734: Emails are failing to send

Author: thiaramus

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

@@ -26,14 +26,14 @@ class EmailSenderHandler
     /**
      * Email sender model.
      *
-     * @var \Magento\Sales\Model\Order\Email\Sender
+     * @var Sender
      */
     protected $emailSender;
 
     /**
      * Entity resource model.
      *
-     * @var \Magento\Sales\Model\ResourceModel\EntityAbstract
+     * @var EntityAbstract
      */
     protected $entityResource;
 
@@ -47,7 +47,7 @@ class EmailSenderHandler
     /**
      * Global configuration storage.
      *
-     * @var \Magento\Framework\App\Config\ScopeConfigInterface
+     * @var ScopeConfigInterface
      */
     protected $globalConfig;
 
@@ -57,7 +57,7 @@ class EmailSenderHandler
     private $identityContainer;
 
     /**
-     * @var \Magento\Store\Model\StoreManagerInterface
+     * @var StoreManagerInterface
      */
     private $storeManager;
 
@@ -73,11 +73,6 @@ class EmailSenderHandler
      */
     private $modifyStartFromDate;
 
-    /**
-     * @var int
-     */
-    private int $maxSendAttempts;
-
     /**
      * @param Sender $emailSender
      * @param EntityAbstract $entityResource
@@ -87,18 +82,16 @@ class EmailSenderHandler
      * @param StoreManagerInterface|null $storeManager
      * @param ValueFactory|null $configValueFactory
      * @param string|null $modifyStartFromDate
-     * @param int $maxSendAttempts
      */
     public function __construct(
-        \Magento\Sales\Model\Order\Email\Sender $emailSender,
-        \Magento\Sales\Model\ResourceModel\EntityAbstract $entityResource,
-        AbstractCollection $entityCollection,
-        \Magento\Framework\App\Config\ScopeConfigInterface $globalConfig,
-        IdentityInterface $identityContainer = null,
-        \Magento\Store\Model\StoreManagerInterface $storeManager = null,
-        ?ValueFactory $configValueFactory = null,
-        ?string $modifyStartFromDate = null,
-        int $maxSendAttempts = null
+        Sender                $emailSender,
+        EntityAbstract        $entityResource,
+        AbstractCollection    $entityCollection,
+        ScopeConfigInterface  $globalConfig,
+        IdentityInterface     $identityContainer = null,
+        StoreManagerInterface $storeManager = null,
+        ?ValueFactory         $configValueFactory = null,
+        ?string               $modifyStartFromDate = null,
     ) {
         $this->emailSender = $emailSender;
         $this->entityResource = $entityResource;
@@ -108,11 +101,10 @@ public function __construct(
         $this->identityContainer = $identityContainer ?: ObjectManager::getInstance()
             ->get(\Magento\Sales\Model\Order\Email\Container\NullIdentity::class);
         $this->storeManager = $storeManager ?: ObjectManager::getInstance()
-            ->get(\Magento\Store\Model\StoreManagerInterface::class);
+            ->get(StoreManagerInterface::class);
 
         $this->configValueFactory = $configValueFactory ?: ObjectManager::getInstance()->get(ValueFactory::class);
         $this->modifyStartFromDate = $modifyStartFromDate ?: $this->modifyStartFromDate;
-        $this->maxSendAttempts = $maxSendAttempts ?? 3;
     }
 
     /**
@@ -139,6 +131,8 @@ public function sendEmails()
             /** @var \Magento\Store\Api\Data\StoreInterface[] $stores */
             $stores = $this->getStores(clone $this->entityCollection);
 
+            $maxSendAttempts = $this->globalConfig->getValue('sales_email/general/async_sending_attempts');
+
             /** @var \Magento\Store\Model\Store $store */
             foreach ($stores as $store) {
                 $this->identityContainer->setStore($store);
@@ -150,7 +144,7 @@ public function sendEmails()
 
                 /** @var \Magento\Sales\Model\AbstractModel $item */
                 foreach ($entityCollection->getItems() as $item) {
-                    $sendAttempts = $item->getEmailSent() ?? -$this->maxSendAttempts;
+                    $sendAttempts = $item->getEmailSent() ?? -$maxSendAttempts;
                     $isEmailSent = $this->emailSender->send($item, true);
 
                     if ($isEmailSent) {
@@ -183,7 +177,7 @@ private function getStores(
         $entityCollection->addAttributeToSelect('store_id')->getSelect()->group('store_id');
         /** @var \Magento\Sales\Model\EntityInterface $item */
         foreach ($entityCollection->getItems() as $item) {
-            /** @var \Magento\Store\Model\StoreManagerInterface $store */
+            /** @var StoreManagerInterface $store */
             $store = $this->storeManager->getStore($item->getStoreId());
             $stores[$item->getStoreId()] = $store;
         }

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

@@ -163,12 +163,17 @@ public function testExecute(
         ?bool $emailSendingResult,
         ?int $expectedIsEmailSent
     ): void {
-        $path = 'sales_email/general/async_sending';
-
         $this->globalConfig
             ->method('getValue')
-            ->withConsecutive([$path])
-            ->willReturnOnConsecutiveCalls($configValue);
+            ->willReturnCallback(function ($path) use ($configValue) {
+                if ($path === 'sales_email/general/async_sending') {
+                    return $configValue;
+                }
+                if ($path === 'sales_email/general/async_sending_attempts') {
+                    return 3;
+                }
+                return null;
+            });
 
         if ($configValue) {
             $nowDate = date('Y-m-d H:i:s');

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

@@ -36,6 +36,7 @@
         <sales_email>
             <general>
                 <async_sending>0</async_sending>
+                <async_sending_attempts>3</async_sending_attempts>
                 <sending_limit>50</sending_limit>
             </general>
             <order>

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

@@ -220,7 +220,6 @@
     <type name="Magento\Sales\Model\EmailSenderHandler">
         <arguments>
             <argument name="modifyStartFromDate" xsi:type="string">-1 day</argument>
-            <argument name="maxSendAttempts" xsi:type="number">3</argument>
         </arguments>
     </type>
     <virtualType name="SalesOrderIndexGridSyncRemove" type="Magento\Sales\Observer\GridSyncRemoveObserver">