On Email Failed regular mark email as failed

app/bundles/EmailBundle/EventListener/EmailSubscriber.php

@@ -114,11 +114,9 @@ public function onEmailFailed(Events\QueueEmailEvent $event)
         if (isset($message->leadIdHash)) {
             $stat = $this->emailModel->getEmailStatus($message->leadIdHash);
 
-            if (null !== $stat) {
-                $reason = $this->translator->trans('mautic.email.dnc.failed', [
-                    '%subject%' => EmojiHelper::toShort($message->getSubject()),
-                ]);
-                $this->emailModel->setDoNotContact($stat, $reason);
+            if (null !== $stat && true !== $stat->getIsFailed()) {
+                $stat->setIsFailed(true);
+                $this->emailModel->getStatRepository()->saveEntity($stat);
             }
         }
     }

app/bundles/EmailBundle/Swiftmailer/Message/MauticMessage.php

@@ -14,6 +14,11 @@ class MauticMessage extends \Swift_Message
      */
     protected $attachments = [];
 
+    /**
+     * @var string|int
+     */
+    public $leadIdHash;
+
     /**
      * Create a new Message.
      *

app/bundles/EmailBundle/Tests/EventListener/EmailSubscriberTest.php

@@ -11,6 +11,7 @@
 use Mautic\EmailBundle\Event\QueueEmailEvent;
 use Mautic\EmailBundle\EventListener\EmailSubscriber;
 use Mautic\EmailBundle\Model\EmailModel;
+use Mautic\EmailBundle\Swiftmailer\Message\MauticMessage;
 use PHPUnit\Framework\MockObject\MockObject;
 use Symfony\Component\Translation\TranslatorInterface;
 
@@ -42,7 +43,7 @@ final class EmailSubscriberTest extends \PHPUnit\Framework\TestCase
     private $em;
 
     /**
-     * @var MockObject|\Swift_Message
+     * @var MockObject|MauticMessage
      */
     private $mockSwiftMessage;
 
@@ -60,7 +61,7 @@ protected function setup(): void
         $this->emailModel       = $this->createMock(EmailModel::class);
         $this->translator       = $this->createMock(TranslatorInterface::class);
         $this->em               = $this->createMock(EntityManager::class);
-        $this->mockSwiftMessage = $this->createMock(\Swift_Message::class);
+        $this->mockSwiftMessage = $this->createMock(MauticMessage::class);
         $this->subscriber       = new EmailSubscriber($this->ipLookupHelper, $this->auditLogModel, $this->emailModel, $this->translator, $this->em);
     }
 
@@ -101,4 +102,28 @@ public function testOnEmailResendWhenShouldNotTryAgain(): void
         $this->subscriber->onEmailResend($queueEmailEvent);
         $this->assertFalse($queueEmailEvent->shouldTryAgain());
     }
+
+    public function testOnEmailFailed(): void
+    {
+        $this->mockSwiftMessage->leadIdHash = 'idhash';
+
+        $queueEmailEvent = new QueueEmailEvent($this->mockSwiftMessage);
+
+        $stat = new Stat();
+
+        $this->emailModel->expects($this->once())
+            ->method('getEmailStatus')
+            ->willReturn($stat);
+
+        $this->emailModel->expects($this->once())
+            ->method('getStatRepository')
+            ->willReturn(new class() {
+                public function saveEntity(Stat $stat): void
+                {
+                }
+            });
+
+        $this->subscriber->onEmailFailed($queueEmailEvent);
+        $this->assertTrue($stat->isFailed());
+    }
 }