UnidentifiedBounceReprocessor

Author: tatevikg1

resources/translations/messages.en.xlf

@@ -296,6 +296,23 @@
                 <target>Failed to send to: %email%</target>
             </trans-unit>
 
+            <trans-unit id="messaging.process_unidentified">
+                <source>Reprocessing unidentified bounces</source>
+                <target>Reprocessing unidentified bounces</target>
+            </trans-unit>
+            <trans-unit id="messaging.total_to_process">
+                <source>%total% bounces to reprocess</source>
+                <target>%total% bounces to reprocess</target>
+            </trans-unit>
+            <trans-unit id="messaging.bounce_process.report">
+                <source>%count% out of %total% processed</source>
+                <target>%count% out of %total% processed</target>
+            </trans-unit>
+            <trans-unit id="messaging.bounce_process.final_report">
+                <source>%reparsed% bounces were re-processed and %reidentified% bounces were re-identified</source>
+                <target>%reparsed% bounces were re-processed and %reidentified% bounces were re-identified</target>
+            </trans-unit>
+
             <!-- Subscription -->
             <trans-unit id="subscription.list_not_found">
                 <source>Subscriber list not found.</source>

src/Domain/Messaging/Model/BounceStatus.php

@@ -10,7 +10,7 @@ enum BounceStatus: string
     case BouncedList = 'bounced list message %d';
     case DuplicateBounce = 'duplicate bounce for %d';
     case SystemMessage = 'bounced system message';
-    case Unknown = 'unidentified bounce';
+    case UnidentifiedBounce = 'unidentified bounce';
 
     public function format(int $userId): string
     {

src/Domain/Messaging/Service/Processor/BounceDataProcessor.php

@@ -64,7 +64,7 @@ public function process(Bounce $bounce, ?string $msgId, ?int $userId, DateTimeIm
             return $this->handleMessageOnly(bounce: $bounce, msgId: (int)$msgId);
         }
 
-        $this->bounceManager->update(bounce: $bounce, status: BounceStatus::Unknown->value, comment: 'not processed');
+        $this->bounceManager->update(bounce: $bounce, status: BounceStatus::UnidentifiedBounce->value, comment: 'not processed');
 
         return false;
     }

src/Domain/Messaging/Service/Processor/UnidentifiedBounceReprocessor.php

@@ -5,66 +5,77 @@
 namespace PhpList\Core\Domain\Messaging\Service\Processor;
 
 use DateTimeImmutable;
+use PhpList\Core\Domain\Messaging\Model\BounceStatus;
 use PhpList\Core\Domain\Messaging\Service\MessageParser;
 use PhpList\Core\Domain\Messaging\Service\Manager\BounceManager;
 use Symfony\Component\Console\Style\SymfonyStyle;
+use Symfony\Contracts\Translation\TranslatorInterface;
 
 class UnidentifiedBounceReprocessor
 {
     private BounceManager $bounceManager;
     private MessageParser $messageParser;
     private BounceDataProcessor $bounceDataProcessor;
-
+    private TranslatorInterface $translator;
 
     public function __construct(
         BounceManager $bounceManager,
         MessageParser $messageParser,
         BounceDataProcessor $bounceDataProcessor,
+        TranslatorInterface $translator,
     ) {
         $this->bounceManager = $bounceManager;
         $this->messageParser = $messageParser;
         $this->bounceDataProcessor = $bounceDataProcessor;
+        $this->translator = $translator;
     }
 
     public function process(SymfonyStyle $inputOutput): void
     {
-        $inputOutput->section('Reprocessing unidentified bounces');
-        $bounces = $this->bounceManager->findByStatus('unidentified bounce');
+        $inputOutput->section($this->translator->trans('Reprocessing unidentified bounces'));
+        $bounces = $this->bounceManager->findByStatus(BounceStatus::UnidentifiedBounce->value);
         $total = count($bounces);
-        $inputOutput->writeln(sprintf('%d bounces to reprocess', $total));
+        $inputOutput->writeln($this->translator->trans('%total% bounces to reprocess', ['%total%' => $total]));
 
         $count = 0;
         $reparsed = 0;
         $reidentified = 0;
         foreach ($bounces as $bounce) {
             $count++;
             if ($count % 25 === 0) {
-                $inputOutput->writeln(sprintf('%d out of %d processed', $count, $total));
+                $inputOutput->writeln($this->translator->trans('%count% out of %total% processed', [
+                    '%count%' => $count,
+                    '%total%' => $total
+                ]));
             }
 
-            $decodedBody = $this->messageParser->decodeBody($bounce->getHeader(), $bounce->getData());
+            $decodedBody = $this->messageParser->decodeBody(header: $bounce->getHeader(), body: $bounce->getData());
             $userId = $this->messageParser->findUserId($decodedBody);
             $messageId = $this->messageParser->findMessageId($decodedBody);
 
             if ($userId || $messageId) {
                 $reparsed++;
                 if ($this->bounceDataProcessor->process(
-                    $bounce,
-                    $messageId,
-                    $userId,
-                    new DateTimeImmutable()
+                    bounce: $bounce,
+                    msgId: $messageId,
+                    userId: $userId,
+                    bounceDate: new DateTimeImmutable()
                 )
                 ) {
                     $reidentified++;
                 }
             }
         }
 
-        $inputOutput->writeln(sprintf('%d out of %d processed', $count, $total));
-        $inputOutput->writeln(sprintf(
-            '%d bounces were re-processed and %d bounces were re-identified',
-            $reparsed,
-            $reidentified
+        $inputOutput->writeln($this->translator->trans('%count% out of %total% processed', [
+            '%count%' => $count,
+            '%total%' => $total
+        ]));
+        $inputOutput->writeln($this->translator->trans(
+            '%reparsed% bounces were re-processed and %reidentified% bounces were re-identified', [
+                '%reparsed%' => $reparsed,
+                '%reidentified%' => $reidentified,
+            ]
         ));
     }
 }

tests/Unit/Domain/Messaging/Service/Processor/UnidentifiedBounceReprocessorTest.php

@@ -13,6 +13,7 @@
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Console\Style\SymfonyStyle;
+use Symfony\Component\Translation\Translator;
 
 class UnidentifiedBounceReprocessorTest extends TestCase
 {
@@ -62,7 +63,8 @@ public function testProcess(): void
         $processor = new UnidentifiedBounceReprocessor(
             bounceManager: $this->bounceManager,
             messageParser: $this->messageParser,
-            bounceDataProcessor: $this->dataProcessor
+            bounceDataProcessor: $this->dataProcessor,
+            translator: new Translator('en'),
         );
         $processor->process($this->io);
     }