Feature/add ability to resend automatically failed generated pdf

config/doctrine/Invoice.orm.xml

@@ -10,6 +10,7 @@
         <field name="localeCode" column="locale_code" />
         <field name="total" column="total" type="integer" />
         <field name="paymentState" column="payment_state" />
+        <field name="pdfSent" column="pdf_sent" type="boolean" />
 
         <one-to-one field="billingData" target-entity="Sylius\InvoicingPlugin\Entity\BillingDataInterface">
             <cascade>

config/services.xml

@@ -23,13 +23,25 @@
     <parameters>
         <parameter key="sylius_invoicing.default_logo_file">@SyliusInvoicingPlugin/assets/sylius-logo.png</parameter>
         <parameter key="sylius_invoicing.template.logo_file">%env(default:sylius_invoicing.default_logo_file:resolve:SYLIUS_INVOICING_LOGO_FILE)%</parameter>
+        <parameter key="sylius_invoicing.email.retry_max_attempts">3</parameter>
+        <parameter key="sylius_invoicing.email.retry_delay_ms">60000</parameter>
     </parameters>
 
     <services>
+        <service id="sylius_invoicing.email.invoice_email_retry_scheduler" class="Sylius\InvoicingPlugin\Email\InvoiceEmailRetryScheduler">
+            <argument type="service" id="sylius.command_bus" />
+            <argument>%sylius_invoicing.email.retry_max_attempts%</argument>
+            <argument>%sylius_invoicing.email.retry_delay_ms%</argument>
+            <argument type="service" id="logger" on-invalid="null" />
+        </service>
+        <service id="Sylius\InvoicingPlugin\Email\InvoiceEmailRetrySchedulerInterface" alias="sylius_invoicing.email.invoice_email_retry_scheduler" />
+
         <service id="sylius_invoicing.email.invoice_email_sender" class="Sylius\InvoicingPlugin\Email\InvoiceEmailSender">
             <argument type="service" id="sylius.email_sender" />
             <argument type="service" id="sylius_invoicing.provider.invoice_file" />
             <argument>%sylius_invoicing.pdf_generator.enabled%</argument>
+            <argument type="service" id="logger" on-invalid="null" />
+            <argument type="service" id="sylius_invoicing.email.invoice_email_retry_scheduler" on-invalid="null" />
         </service>
         <service id="Sylius\InvoicingPlugin\Email\InvoiceEmailSenderInterface" alias="sylius_invoicing.email.invoice_email_sender" />
 

config/services/cli.xml

@@ -24,5 +24,11 @@
             <argument type="service" id="sylius.repository.order" />
             <tag name="console.command" />
         </service>
+        <service id="sylius_invoicing.cli.retry_failed_invoices" class="Sylius\InvoicingPlugin\Cli\RetryFailedInvoicesCommand">
+            <argument type="service" id="sylius_invoicing.repository.invoice" />
+            <argument type="service" id="sylius.command_bus" />
+            <argument type="service" id="logger" />
+            <tag name="console.command" />
+        </service>
     </services>
 </container>

phpstan.neon

@@ -22,3 +22,4 @@ parameters:
         - '/Method Sylius\\InvoicingPlugin\\Security\\Voter\\InvoiceVoter::supports\(\) has parameter \$attribute with no typehint specified./'
         - '/Method Sylius\\InvoicingPlugin\\Security\\Voter\\InvoiceVoter::supports\(\) has parameter \$subject with no typehint specified./'
         - '/expects string, string\|null given\.$/'
+        - '/Method Sylius\\Component\\Mailer\\Sender\\SenderInterface::send\(\) invoked with 7 parameters, 2-5 required\./'

src/Cli/RetryFailedInvoicesCommand.php

@@ -0,0 +1,78 @@
+<?php
+
+/*
+ * This file is part of the Sylius package.
+ *
+ * (c) Sylius Sp. z o.o.
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Sylius\InvoicingPlugin\Cli;
+
+use Psr\Log\LoggerInterface;
+use Sylius\InvoicingPlugin\Command\SendInvoiceEmail;
+use Sylius\InvoicingPlugin\Doctrine\ORM\InvoiceRepositoryInterface;
+use Symfony\Component\Console\Attribute\AsCommand;
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\Messenger\Exception\ExceptionInterface;
+use Symfony\Component\Messenger\MessageBusInterface;
+
+#[AsCommand(
+    name: 'sylius-invoicing:retry-failed-invoices',
+    description: 'Retries sending invoice emails for invoices with missing PDF attachments.',
+)]
+final class RetryFailedInvoicesCommand extends Command
+{
+    public function __construct(
+        private readonly InvoiceRepositoryInterface $invoiceRepository,
+        private readonly MessageBusInterface $commandBus,
+        private readonly LoggerInterface $logger,
+    ) {
+        parent::__construct();
+    }
+
+    public function execute(InputInterface $input, OutputInterface $output): int
+    {
+        $failedInvoices = $this->invoiceRepository->findUnsent();
+
+        if ([] === $failedInvoices) {
+            $output->writeln('No failed invoices found to retry.');
+
+            return Command::SUCCESS;
+        }
+
+        $dispatched = 0;
+
+        foreach ($failedInvoices as $invoice) {
+            $orderNumber = $invoice->order()->getNumber();
+
+            if (null === $orderNumber) {
+                continue;
+            }
+
+            try {
+                $this->commandBus->dispatch(new SendInvoiceEmail($orderNumber));
+            } catch (ExceptionInterface $e) {
+                $this->logger->error(
+                    sprintf(
+                        'Failed to dispatch invoice resend command for order %s: %s',
+                        $orderNumber,
+                        $e->getMessage(),
+                    ),
+                    ['exception' => $e],
+                );
+            }
+            ++$dispatched;
+        }
+
+        $output->writeln(sprintf('Dispatched %d invoice resend command(s).', $dispatched));
+
+        return Command::SUCCESS;
+    }
+}

src/Command/SendInvoiceEmail.php

@@ -13,14 +13,21 @@
 
 namespace Sylius\InvoicingPlugin\Command;
 
-final class SendInvoiceEmail
+final readonly class SendInvoiceEmail
 {
-    public function __construct(private readonly string $orderNumber)
-    {
+    public function __construct(
+        private string $orderNumber,
+        private int $attempt = 0,
+    ) {
     }
 
     public function orderNumber(): string
     {
         return $this->orderNumber;
     }
+
+    public function attempt(): int
+    {
+        return $this->attempt;
+    }
 }

src/CommandHandler/SendInvoiceEmailHandler.php

@@ -20,12 +20,12 @@
 use Sylius\InvoicingPlugin\Email\InvoiceEmailSenderInterface;
 use Sylius\InvoicingPlugin\Entity\InvoiceInterface;
 
-final class SendInvoiceEmailHandler
+final readonly class SendInvoiceEmailHandler
 {
     public function __construct(
-        private readonly InvoiceRepositoryInterface $invoiceRepository,
-        private readonly OrderRepositoryInterface $orderRepository,
-        private readonly InvoiceEmailSenderInterface $emailSender,
+        private InvoiceRepositoryInterface $invoiceRepository,
+        private OrderRepositoryInterface $orderRepository,
+        private InvoiceEmailSenderInterface $emailSender,
     ) {
     }
 
@@ -48,6 +48,15 @@ public function __invoke(SendInvoiceEmail $command): void
             return;
         }
 
-        $this->emailSender->sendInvoiceEmail($invoice, $customer->getEmail());
+        $customerEmail = $customer->getEmail();
+        if (null === $customerEmail) {
+            return;
+        }
+
+        $this->emailSender->sendInvoiceEmail($invoice, $customerEmail, $command->attempt());
+
+        if ($invoice->isPdfSent()) {
+            $this->invoiceRepository->add($invoice);
+        }
     }
 }

src/Doctrine/ORM/InvoiceRepository.php

@@ -43,4 +43,19 @@ public function findByOrderNumber(string $orderNumber): array
 
         return $invoices;
     }
+
+    public function findUnsent(): array
+    {
+        $invoices = $this
+            ->createQueryBuilder('invoice')
+            ->where('invoice.pdfSent = :pdfSent')
+            ->setParameter('pdfSent', false)
+            ->getQuery()
+            ->getResult()
+        ;
+
+        Assert::isArray($invoices);
+
+        return $invoices;
+    }
 }

src/Doctrine/ORM/InvoiceRepositoryInterface.php

@@ -22,4 +22,9 @@ interface InvoiceRepositoryInterface extends RepositoryInterface
     public function findOneByOrder(OrderInterface $order): ?InvoiceInterface;
 
     public function findByOrderNumber(string $orderNumber): array;
+
+    /**
+     * @return array<InvoiceInterface>
+     */
+    public function findUnsent(): array;
 }

src/Email/InvoiceEmailRetryScheduler.php

@@ -0,0 +1,84 @@
+<?php
+
+/*
+ * This file is part of the Sylius package.
+ *
+ * (c) Sylius Sp. z o.o.
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Sylius\InvoicingPlugin\Email;
+
+use Psr\Log\LoggerInterface;
+use Sylius\InvoicingPlugin\Command\SendInvoiceEmail;
+use Sylius\InvoicingPlugin\Entity\InvoiceInterface;
+use Symfony\Component\Messenger\Envelope;
+use Symfony\Component\Messenger\Exception\ExceptionInterface;
+use Symfony\Component\Messenger\MessageBusInterface;
+use Symfony\Component\Messenger\Stamp\DelayStamp;
+
+final class InvoiceEmailRetryScheduler implements InvoiceEmailRetrySchedulerInterface
+{
+    public function __construct(
+        private readonly MessageBusInterface $commandBus,
+        private readonly int $maxAttempts,
+        private readonly int $retryDelayMilliseconds,
+        private readonly ?LoggerInterface $logger = null,
+    ) {
+    }
+
+    public function scheduleRetry(InvoiceInterface $invoice, string $customerEmail, int $attempt): void
+    {
+        if ($attempt >= $this->maxAttempts) {
+            $this->logger?->warning(
+                sprintf(
+                    'Invoice email retry aborted for invoice "%s" (%s) after %d attempts.',
+                    $invoice->number(),
+                    $invoice->id(),
+                    $attempt,
+                ),
+                ['customerEmail' => $customerEmail],
+            );
+
+            return;
+        }
+
+        $orderNumber = $invoice->order()->getNumber();
+        if (null === $orderNumber) {
+            $this->logger?->warning(
+                sprintf(
+                    'Invoice email retry skipped because order number is missing for invoice "%s" (%s).',
+                    $invoice->number(),
+                    $invoice->id(),
+                ),
+                ['customerEmail' => $customerEmail],
+            );
+
+            return;
+        }
+
+        $nextAttempt = $attempt + 1;
+        $message = new SendInvoiceEmail($orderNumber, $nextAttempt);
+        $envelope = new Envelope($message, [new DelayStamp($this->retryDelayMilliseconds)]);
+
+        try {
+            $this->commandBus->dispatch($envelope);
+        } catch (ExceptionInterface $e) {
+            $this->logger?->error($e->getMessage());
+        }
+
+        $this->logger?->info(
+            sprintf(
+                'Scheduled invoice email retry #%d for invoice "%s" (%s) to "%s".',
+                $nextAttempt,
+                $invoice->number(),
+                $invoice->id(),
+                $customerEmail,
+            ),
+        );
+    }
+}

src/Email/InvoiceEmailRetrySchedulerInterface.php

@@ -0,0 +1,21 @@
+<?php
+
+/*
+ * This file is part of the Sylius package.
+ *
+ * (c) Sylius Sp. z o.o.
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Sylius\InvoicingPlugin\Email;
+
+use Sylius\InvoicingPlugin\Entity\InvoiceInterface;
+
+interface InvoiceEmailRetrySchedulerInterface
+{
+    public function scheduleRetry(InvoiceInterface $invoice, string $customerEmail, int $attempt): void;
+}