ACP2E-2734: Emails are failing to send

Author: thiaramus

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

@@ -72,6 +72,10 @@ class EmailSenderHandler
      * @var string
      */
     private $modifyStartFromDate;
+
+    /**
+     * @var int
+     */
     private int $maxSendAttempts;
 
     /**

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

@@ -151,6 +151,7 @@ protected function setUp(): void
      * @param int $configValue
      * @param array|null $collectionItems
      * @param bool|null $emailSendingResult
+     * @param int|null $expectedIsEmailSent
      *
      * @return void
      * @dataProvider executeDataProvider
@@ -159,7 +160,8 @@ protected function setUp(): void
     public function testExecute(
         int $configValue,
         ?array $collectionItems,
-        ?bool $emailSendingResult
+        ?bool $emailSendingResult,
+        ?int $expectedIsEmailSent
     ): void {
         $path = 'sales_email/general/async_sending';
 
@@ -175,7 +177,12 @@ public function testExecute(
                 ->method('addFieldToFilter')
                 ->withConsecutive(
                     ['send_email', ['eq' => 1]],
-                    ['email_sent', ['null' => true]],
+                    ['email_sent',
+                        [
+                            ['null' => true],
+                            ['lteq' => -1]
+                        ]
+                    ],
                     ['created_at', ['from' => $fromDate]]
                 );
 
@@ -248,7 +255,7 @@ public function testExecute(
                 $collectionItem
                     ->expects($this->once())
                     ->method('setEmailSent')
-                    ->with($emailSendingResult)
+                    ->with($expectedIsEmailSent)
                     ->willReturn($collectionItem);
 
                 $this->entityResource
@@ -280,22 +287,26 @@ public function executeDataProvider(): array
             [
                 'configValue' => 1,
                 'collectionItems' => [clone $entityModel],
-                'emailSendingResult' => true
+                'emailSendingResult' => true,
+                'expectedIsEmailSent' => 1
             ],
             [
                 'configValue' => 1,
                 'collectionItems' => [clone $entityModel],
-                'emailSendingResult' => false
+                'emailSendingResult' => false,
+                'expectedIsEmailSent' => -2
             ],
             [
                 'configValue' => 1,
                 'collectionItems' => [],
-                'emailSendingResult' => null
+                'emailSendingResult' => null,
+                'expectedIsEmailSent' => 1
             ],
             [
                 'configValue' => 0,
                 'collectionItems' => null,
-                'emailSendingResult' => null
+                'emailSendingResult' => null,
+                'expectedIsEmailSent' => 1
             ]
         ];
     }