refactor(controller): Make StrategicEmailService more flexible

Author: pan93412

.env

@@ -70,3 +70,4 @@ SQLRUNNER_URL=http://sqlrunner.app-sf.orb.local:8080
 
 # Email
 SERVER_EMAIL=no-reply@dbplay.pan93.com
+SERVER_EMAIL_FOR_TEST=dbplay@pan93.com

src/Command/Email/SendLoginReminderCommand.php

@@ -4,6 +4,8 @@
 
 namespace App\Command\Email;
 
+use App\Entity\EmailDto\EmailDto;
+use App\Service\EmailService;
 use App\Service\StrategicEmailService;
 use Symfony\Component\Console\Attribute\AsCommand;
 use Symfony\Component\Console\Command\Command;
@@ -17,40 +19,59 @@ class SendLoginReminderCommand extends Command
 {
     public function __construct(
         private readonly StrategicEmailService $strategicEmailService,
+        private readonly EmailService $emailService,
     ) {
         parent::__construct();
     }
 
     protected function configure(): void
     {
         $this->addOption('dry-run', 'd', InputOption::VALUE_NONE, 'Whether to send the email or not');
+        $this->addOption('test-email', 't', InputOption::VALUE_NONE, 'Send the test email to the test email address');
     }
 
     protected function execute(InputInterface $input, OutputInterface $output): int
     {
         $io = new SymfonyStyle($input, $output);
         $dryRun = $input->getOption('dry-run');
+        $testEmail = $input->getOption('test-email');
 
-        $result = $this->strategicEmailService->sendLoginReminderEmail($dryRun);
+        if (!$dryRun && $testEmail) {
+            $io->error('The --test-email option can only be used with the --dry-run option.');
 
-        if (null !== $result) {
-            $table = $io->createTable();
-
-            $table->setHeaderTitle('Email to be sent');
-            $table->setHeaders(['Field', 'Value']);
-            $table->addRow(['Subject', $result->getSubject()]);
-            $table->addRow(['To', $result->getToAddress()->toString()]);
+            return Command::FAILURE;
+        }
 
-            $bcc = implode(', ', array_map(static fn ($address) => $address->toString(), $result->getBcc()));
-            $table->addRow(['Bcc', $bcc]);
+        $target = ($dryRun && $testEmail)
+            ? fn (EmailDto $emailDto) => $this->sendTestEmailDto($io, $emailDto)
+            : ($dryRun
+                ? fn (EmailDto $emailDto) => $this->printEmailDto($io, $emailDto)
+                : fn (EmailDto $emailDto) => $this->sendEmailDto($io, $emailDto));
 
-            $table->addRow(['Kind', $result->getKind()->value]);
-            $table->addRow(['Content', $result->getText()]);
-            $table->render();
-        } else {
-            $io->success('Emails have been sent successfully.');
-        }
+        $this->strategicEmailService->sendLoginReminderEmail($target);
 
         return Command::SUCCESS;
     }
+
+    private function printEmailDto(SymfonyStyle $io, EmailDto $emailDto): void
+    {
+        $io->writeln('Email to be sent:');
+        $io->writeln('Subject: '.$emailDto->getSubject());
+        $io->writeln('To: '.$emailDto->getToAddress()->toString());
+        $io->writeln('Bcc: '.implode(', ', array_map(static fn ($address) => $address->toString(), $emailDto->getBcc())));
+        $io->writeln('Kind: '.$emailDto->getKind()->value);
+        $io->writeln('Content: '.$emailDto->getText());
+    }
+
+    private function sendEmailDto(SymfonyStyle $io, EmailDto $emailDto): void
+    {
+        $this->emailService->send($emailDto);
+        $io->success('Email sent successfully.');
+    }
+
+    private function sendTestEmailDto(SymfonyStyle $io, EmailDto $emailDto): void
+    {
+        $this->emailService->sendToTest($emailDto);
+        $io->success('Test email sent successfully.');
+    }
 }

src/Service/StrategicEmailService.php

@@ -12,21 +12,17 @@
     public function __construct(
         private StatisticsService $statisticsService,
         private EmailTemplateService $emailTemplateService,
-        private EmailService $emailService,
     ) {}
 
     /**
      * Send login reminder emails to users who have not logged in for a long time.
      *
-     * @template T of bool
-     *
-     * @param T $dryRun whether to send the email or not
-     *
-     * @return ($dryRun is true ? EmailDto : null)
+     * @param callable(EmailDto): void $target the function that sends the email
+     *                                         according to the given EmailDto
      *
      * @throws \Throwable if the email content cannot be rendered
      */
-    public function sendLoginReminderEmail(bool $dryRun = false): ?EmailDto
+    public function sendLoginReminderEmail(callable $target): void
     {
         $lastLoginAt = array_filter(
             // Filter out users who have logged in within the last 7 days
@@ -47,12 +43,7 @@ static function (LastLoginDto $lastLoginDto): bool {
         );
 
         $emailDto = $this->emailTemplateService->createLoginReminderDto($bccUsers);
-        if ($dryRun) {
-            return $emailDto;
-        }
-
-        $this->emailService->send($emailDto);
 
-        return null;
+        $target($emailDto);
     }
 }