Fix style

Author: tatevikg1

resources/translations/messages.en.xlf

@@ -726,6 +726,10 @@ Thank you.</target>
         <source>No data changed</source>
         <target>__No data changed</target>
       </trans-unit>
+      <trans-unit id="n7nf5lh" resname="Campaign not found or not in submitted status">
+        <source>Campaign not found or not in submitted status</source>
+        <target>__Campaign not found or not in submitted status</target>
+      </trans-unit>
     </body>
   </file>
 </xliff>

src/Domain/Messaging/Command/ProcessQueueCommand.php

@@ -21,6 +21,9 @@
 use Symfony\Contracts\Translation\TranslatorInterface;
 use Throwable;
 
+/**
+ * @SuppressWarnings("PHPMD.CouplingBetweenObjects")
+ */
 #[AsCommand(
     name: 'phplist:process-queue',
     description: 'Processes the email campaign queue.'
@@ -93,8 +96,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
 
         try {
             foreach ($campaigns as $campaign) {
-                $message = new CampaignProcessorMessage(messageId: $campaign->getId());
-                $this->messageBus->dispatch($message);
+                $this->messageBus->dispatch(new CampaignProcessorMessage(messageId: $campaign->getId()));
             }
         } catch (Throwable $throwable) {
             $output->writeln($throwable->getMessage());

src/Domain/Messaging/MessageHandler/CampaignProcessorMessageHandler.php

@@ -104,39 +104,12 @@ public function __invoke(CampaignProcessorMessage $message): void
             $this->userMessageRepository->save($userMessage);
 
             if (!filter_var($subscriber->getEmail(), FILTER_VALIDATE_EMAIL)) {
-                $this->updateUserMessageStatus($userMessage, UserMessageStatus::InvalidEmailAddress);
-                $this->unconfirmSubscriber($subscriber);
-                $this->logger->warning($this->translator->trans('Invalid email, marking unconfirmed: %email%', [
-                    '%email%' => $subscriber->getEmail(),
-                ]));
-                $this->subscriberHistoryManager->addHistory(
-                    subscriber: $subscriber,
-                    message: $this->translator->trans('Subscriber marked unconfirmed for invalid email address'),
-                    details: $this->translator->trans(
-                        'Marked unconfirmed while sending campaign %message_id%',
-                        ['%message_id%' => $campaign->getId()]
-                    )
-                );
+                $this->handleInvalidEmail($userMessage, $subscriber, $campaign);
                 $this->entityManager->flush();
                 continue;
             }
 
-            $processed = $this->messagePreparator->processMessageLinks($campaign, $subscriber->getId());
-
-            try {
-                $email = $this->mailer->composeEmail($processed, $subscriber);
-                $this->mailer->send($email);
-                $this->updateUserMessageStatus($userMessage, UserMessageStatus::Sent);
-            } catch (Throwable $e) {
-                $this->updateUserMessageStatus($userMessage, UserMessageStatus::NotSent);
-                $this->logger->error($e->getMessage(), [
-                    'subscriber_id' => $subscriber->getId(),
-                    'campaign_id' => $campaign->getId(),
-                ]);
-                $this->logger->warning($this->translator->trans('Failed to send to: %email%', [
-                    '%email%' => $subscriber->getEmail(),
-                ]));
-            }
+            $this->handleEmailSending($campaign, $subscriber, $userMessage);
         }
 
         if ($stoppedEarly && $this->requeueHandler->handle($campaign)) {
@@ -166,4 +139,41 @@ private function updateUserMessageStatus(UserMessage $userMessage, UserMessageSt
         $userMessage->setStatus($status);
         $this->entityManager->flush();
     }
+
+    private function handleInvalidEmail(UserMessage $userMessage, Subscriber $subscriber, mixed $campaign): void
+    {
+        $this->updateUserMessageStatus($userMessage, UserMessageStatus::InvalidEmailAddress);
+        $this->unconfirmSubscriber($subscriber);
+        $this->logger->warning($this->translator->trans('Invalid email, marking unconfirmed: %email%', [
+            '%email%' => $subscriber->getEmail(),
+        ]));
+        $this->subscriberHistoryManager->addHistory(
+            subscriber: $subscriber,
+            message: $this->translator->trans('Subscriber marked unconfirmed for invalid email address'),
+            details: $this->translator->trans(
+                'Marked unconfirmed while sending campaign %message_id%',
+                ['%message_id%' => $campaign->getId()]
+            )
+        );
+    }
+
+    private function handleEmailSending(mixed $campaign, Subscriber $subscriber, UserMessage $userMessage): void
+    {
+        $processed = $this->messagePreparator->processMessageLinks($campaign, $subscriber->getId());
+
+        try {
+            $email = $this->mailer->composeEmail($processed, $subscriber);
+            $this->mailer->send($email);
+            $this->updateUserMessageStatus($userMessage, UserMessageStatus::Sent);
+        } catch (Throwable $e) {
+            $this->updateUserMessageStatus($userMessage, UserMessageStatus::NotSent);
+            $this->logger->error($e->getMessage(), [
+                'subscriber_id' => $subscriber->getId(),
+                'campaign_id' => $campaign->getId(),
+            ]);
+            $this->logger->warning($this->translator->trans('Failed to send to: %email%', [
+                '%email%' => $subscriber->getEmail(),
+            ]));
+        }
+    }
 }

tests/Unit/Domain/Messaging/Command/ProcessQueueCommandTest.php

@@ -163,25 +163,25 @@ public function testExecuteWithMultipleCampaigns(): void
         $this->messageProcessingPreparator->expects($this->once())
             ->method('ensureCampaignsHaveUuid');
 
-        $campaign1 = $this->createMock(Message::class);
-        $campaign1->method('getId')->willReturn(1);
-        $campaign2 = $this->createMock(Message::class);
-        $campaign2->method('getId')->willReturn(2);
+        $cmp1 = $this->createMock(Message::class);
+        $cmp1->method('getId')->willReturn(1);
+        $cmp2 = $this->createMock(Message::class);
+        $cmp2->method('getId')->willReturn(2);
 
         $this->messageRepository->expects($this->once())
             ->method('getByStatusAndEmbargo')
             ->with($this->anything(), $this->anything())
-            ->willReturn([$campaign1, $campaign2]);
+            ->willReturn([$cmp1, $cmp2]);
 
         $this->messageBus->expects($this->exactly(2))
             ->method('dispatch')
-            ->willReturnCallback(function (CampaignProcessorMessage $message, array $stamps) use ($campaign1, $campaign2) {
+            ->willReturnCallback(function (CampaignProcessorMessage $message, array $stamps) use ($cmp1, $cmp2) {
                 static $call = 0;
                 $call++;
                 if ($call === 1) {
-                    $this->assertEquals($campaign1->getId(), $message->getMessageId());
+                    $this->assertEquals($cmp1->getId(), $message->getMessageId());
                 } else {
-                    $this->assertEquals($campaign2->getId(), $message->getMessageId());
+                    $this->assertEquals($cmp2->getId(), $message->getMessageId());
                 }
                 $this->assertSame([], $stamps);