Resolve "Notification: envoi à des groupes utilisateurs"

2025-09-24 07:35:03 +00:00 · 2025-07-20 20:18:49 +00:00
parent 5bdb2df929
commit ab8da4ab7a
47 changed files with 1635 additions and 148 deletions
--- a/src/Bundle/ChillMainBundle/Notification/Email/DailyNotificationDigestCronjob.php
+++ b/src/Bundle/ChillMainBundle/Notification/Email/DailyNotificationDigestCronjob.php
@@ -0,0 +1,102 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\MainBundle\Notification\Email;
+
+use Chill\MainBundle\Cron\CronJobInterface;
+use Chill\MainBundle\Entity\CronJobExecution;
+use Chill\MainBundle\Notification\Email\NotificationEmailMessages\ScheduleDailyNotificationDigestMessage;
+use Doctrine\DBAL\Connection;
+use Doctrine\DBAL\Exception;
+use Psr\Log\LoggerInterface;
+use Symfony\Component\Clock\ClockInterface;
+use Symfony\Component\Messenger\MessageBusInterface;
+
+readonly class DailyNotificationDigestCronjob implements CronJobInterface
+{
+    public function __construct(
+        private ClockInterface $clock,
+        private Connection $connection,
+        private MessageBusInterface $messageBus,
+        private LoggerInterface $logger,
+    ) {}
+
+    public function canRun(?CronJobExecution $cronJobExecution): bool
+    {
+        $now = $this->clock->now();
+
+        if (null !== $cronJobExecution && $now->sub(new \DateInterval('PT23H45M')) < $cronJobExecution->getLastStart()) {
+            return false;
+        }
+
+        // Run between 6 and 9 AM
+        return in_array((int) $now->format('H'), [6, 7, 8], true);
+    }
+
+    public function getKey(): string
+    {
+        return 'daily-notification-digest';
+    }
+
+    /**
+     * @throws \DateInvalidOperationException
+     * @throws Exception
+     */
+    public function run(array $lastExecutionData): ?array
+    {
+        $now = $this->clock->now();
+        if (isset($lastExecutionData['last_execution'])) {
+            $lastExecution = \DateTimeImmutable::createFromFormat(
+                \DateTimeImmutable::ATOM,
+                $lastExecutionData['last_execution']
+            );
+        } else {
+            $lastExecution = $now->sub(new \DateInterval('P1D'));
+        }
+
+        // Get distinct users who received notifications since the last execution
+        $sql = <<<'SQL'
+        SELECT DISTINCT cmnau.user_id
+        FROM chill_main_notification cmn
+        JOIN chill_main_notification_addresses_user cmnau ON cmnau.notification_id = cmn.id
+        WHERE cmn.date >= :lastExecution AND cmn.date <= :now
+        SQL;
+
+        $sqlStatement = $this->connection->prepare($sql);
+        $sqlStatement->bindValue('lastExecution', $lastExecution->format(\DateTimeInterface::RFC3339));
+        $sqlStatement->bindValue('now', $now->format(\DateTimeInterface::RFC3339));
+        $result = $sqlStatement->executeQuery();
+
+        $count = 0;
+        foreach ($result->fetchAllAssociative() as $row) {
+            $userId = (int) $row['user_id'];
+
+            $message = new ScheduleDailyNotificationDigestMessage(
+                $userId,
+                $lastExecution,
+                $now
+            );
+
+            $this->messageBus->dispatch($message);
+            ++$count;
+        }
+
+        $this->logger->info('[DailyNotificationDigestCronjob] Dispatched daily digest messages', [
+            'user_count' => $count,
+            'last_execution' => $lastExecution->format('Y-m-d-H:i:s.u e'),
+            'current_time' => $now->format('Y-m-d-H:i:s.u e'),
+        ]);
+
+        return [
+            'last_execution' => $now->format('Y-m-d-H:i:s.u e'),
+        ];
+    }
+}
--- a/src/Bundle/ChillMainBundle/Notification/Email/NotificationEmailHandlers/ScheduleDailyNotificationDigestHandler.php
+++ b/src/Bundle/ChillMainBundle/Notification/Email/NotificationEmailHandlers/ScheduleDailyNotificationDigestHandler.php
@@ -0,0 +1,75 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\MainBundle\Notification\Email\NotificationEmailHandlers;
+
+use Chill\MainBundle\Notification\Email\NotificationEmailMessages\ScheduleDailyNotificationDigestMessage;
+use Chill\MainBundle\Notification\Email\NotificationMailer;
+use Chill\MainBundle\Repository\NotificationRepository;
+use Chill\MainBundle\Repository\UserRepository;
+use Psr\Log\LoggerInterface;
+use Symfony\Component\Mailer\Exception\TransportExceptionInterface;
+use Symfony\Component\Messenger\Attribute\AsMessageHandler;
+
+#[AsMessageHandler]
+readonly class ScheduleDailyNotificationDigestHandler
+{
+    public function __construct(
+        private NotificationRepository $notificationRepository,
+        private UserRepository $userRepository,
+        private NotificationMailer $notificationMailer,
+        private LoggerInterface $logger,
+    ) {}
+
+    /**
+     * @throws TransportExceptionInterface
+     */
+    public function __invoke(ScheduleDailyNotificationDigestMessage $message): void
+    {
+        $userId = $message->getUserId();
+        $lastExecutionDate = $message->getLastExecutionDateTime();
+        $currentDate = $message->getCurrentDateTime();
+
+        $user = $this->userRepository->find($userId);
+        if (null === $user) {
+            $this->logger->warning('[ScheduleDailyNotificationDigestHandler] User not found', [
+                'user_id' => $userId,
+            ]);
+
+            throw new \InvalidArgumentException(sprintf('User with ID %s not found', $userId));
+        }
+
+        // Get all notifications for this user between last execution and current date
+        $notifications = $this->notificationRepository->findNotificationsForUserBetweenDates(
+            $userId,
+            $lastExecutionDate,
+            $currentDate
+        );
+
+        // Filter out notifications that should be sent in a daily digest
+        $dailyNotifications = array_filter($notifications, fn ($notification) => $user->isNotificationDailyDigest($notification->getType()));
+
+        if ([] === $dailyNotifications) {
+            $this->logger->info('[ScheduleDailyNotificationDigestHandler] No daily notifications found for user', [
+                'user_id' => $userId,
+            ]);
+
+            return;
+        }
+
+        $this->notificationMailer->sendDailyDigest($user, $dailyNotifications);
+
+        $this->logger->info('[ScheduleDailyNotificationDigestHandler] Sent daily digest', [
+            'user_id' => $userId,
+            'notification_count' => count($dailyNotifications),
+        ]);
+    }
+}
--- a/src/Bundle/ChillMainBundle/Notification/Email/NotificationEmailHandlers/SendImmediateNotificationEmailHandler.php
+++ b/src/Bundle/ChillMainBundle/Notification/Email/NotificationEmailHandlers/SendImmediateNotificationEmailHandler.php
@@ -0,0 +1,68 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\MainBundle\Notification\Email\NotificationEmailHandlers;
+
+use Chill\MainBundle\Notification\Email\NotificationEmailMessages\SendImmediateNotificationEmailMessage;
+use Chill\MainBundle\Notification\Email\NotificationMailer;
+use Chill\MainBundle\Repository\NotificationRepository;
+use Chill\MainBundle\Repository\UserRepository;
+use Psr\Log\LoggerInterface;
+use Symfony\Component\Mailer\Exception\TransportExceptionInterface;
+use Symfony\Component\Messenger\Attribute\AsMessageHandler;
+
+#[AsMessageHandler]
+readonly class SendImmediateNotificationEmailHandler
+{
+    public function __construct(
+        private NotificationRepository $notificationRepository,
+        private UserRepository $userRepository,
+        private NotificationMailer $notificationMailer,
+        private LoggerInterface $logger,
+    ) {}
+
+    /**
+     * @throws TransportExceptionInterface
+     * @throws \Exception
+     */
+    public function __invoke(SendImmediateNotificationEmailMessage $message): void
+    {
+        $notification = $this->notificationRepository->find($message->getNotificationId());
+        $addressee = $this->userRepository->find($message->getAddresseeId());
+
+        if (null === $notification) {
+            $this->logger->error('[SendImmediateNotificationEmailHandler] Notification not found', [
+                'notification_id' => $message->getNotificationId(),
+            ]);
+
+            throw new \InvalidArgumentException(sprintf('Notification with ID %s not found', $message->getNotificationId()));
+        }
+
+        if (null === $addressee) {
+            $this->logger->error('[SendImmediateNotificationEmailHandler] Addressee not found', [
+                'addressee_id' => $message->getAddresseeId(),
+            ]);
+
+            throw new \InvalidArgumentException(sprintf('User with ID %s not found', $message->getAddresseeId()));
+        }
+
+        try {
+            $this->notificationMailer->sendEmailToAddressee($notification, $addressee);
+        } catch (\Exception $e) {
+            $this->logger->error('[SendImmediateNotificationEmailHandler] Failed to send email', [
+                'notification_id' => $message->getNotificationId(),
+                'addressee_id' => $message->getAddresseeId(),
+                'stacktrace' => $e->getTraceAsString(),
+            ]);
+            throw $e;
+        }
+    }
+}
--- a/src/Bundle/ChillMainBundle/Notification/Email/NotificationEmailMessages/ScheduleDailyNotificationDigestMessage.php
+++ b/src/Bundle/ChillMainBundle/Notification/Email/NotificationEmailMessages/ScheduleDailyNotificationDigestMessage.php
@@ -0,0 +1,36 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\MainBundle\Notification\Email\NotificationEmailMessages;
+
+readonly class ScheduleDailyNotificationDigestMessage
+{
+    public function __construct(
+        private int $userId,
+        private \DateTimeInterface $lastExecutionDate,
+        private \DateTimeInterface $currentDate,
+    ) {}
+
+    public function getUserId(): int
+    {
+        return $this->userId;
+    }
+
+    public function getLastExecutionDateTime(): \DateTimeInterface
+    {
+        return $this->lastExecutionDate;
+    }
+
+    public function getCurrentDateTime(): \DateTimeInterface
+    {
+        return $this->currentDate;
+    }
+}
--- a/src/Bundle/ChillMainBundle/Notification/Email/NotificationEmailMessages/SendImmediateNotificationEmailMessage.php
+++ b/src/Bundle/ChillMainBundle/Notification/Email/NotificationEmailMessages/SendImmediateNotificationEmailMessage.php
@@ -0,0 +1,30 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\MainBundle\Notification\Email\NotificationEmailMessages;
+
+readonly class SendImmediateNotificationEmailMessage
+{
+    public function __construct(
+        private int $notificationId,
+        private int $addresseeId,
+    ) {}
+
+    public function getNotificationId(): int
+    {
+        return $this->notificationId;
+    }
+
+    public function getAddresseeId(): int
+    {
+        return $this->addresseeId;
+    }
+}
--- a/src/Bundle/ChillMainBundle/Notification/Email/NotificationMailer.php
+++ b/src/Bundle/ChillMainBundle/Notification/Email/NotificationMailer.php
@@ -13,22 +13,32 @@ namespace Chill\MainBundle\Notification\Email;

 use Chill\MainBundle\Entity\Notification;
 use Chill\MainBundle\Entity\NotificationComment;
+use Chill\MainBundle\Entity\User;
+use Chill\MainBundle\Notification\Email\NotificationEmailMessages\SendImmediateNotificationEmailMessage;
 use Doctrine\ORM\Event\PostPersistEventArgs;
-use Doctrine\ORM\Event\PostUpdateEventArgs;
 use Psr\Log\LoggerInterface;
 use Symfony\Bridge\Twig\Mime\TemplatedEmail;
 use Symfony\Component\Mailer\Exception\TransportExceptionInterface;
 use Symfony\Component\Mailer\MailerInterface;
 use Symfony\Component\Mime\Email;
+use Symfony\Component\Messenger\MessageBusInterface;
 use Symfony\Contracts\Translation\TranslatorInterface;

-class NotificationMailer
+readonly class NotificationMailer
 {
-    public function __construct(private readonly MailerInterface $mailer, private readonly LoggerInterface $logger, private readonly TranslatorInterface $translator) {}
+    public function __construct(
+        private MailerInterface $mailer,
+        private LoggerInterface $logger,
+        private MessageBusInterface $messageBus,
+        private TranslatorInterface $translator,
+    ) {}

    public function postPersistComment(NotificationComment $comment, PostPersistEventArgs $eventArgs): void
    {
-        $dests = [$comment->getNotification()->getSender(), ...$comment->getNotification()->getAddressees()->toArray()];
+        $dests = [
+            $comment->getNotification()->getSender(),
+            ...$comment->getNotification()->getAddressees()->toArray(),
+        ];

        $uniqueDests = [];
        foreach ($dests as $dest) {
@@ -69,55 +79,147 @@ class NotificationMailer
     */
    public function postPersistNotification(Notification $notification, PostPersistEventArgs $eventArgs): void
    {
-        $this->sendNotificationEmailsToAddresses($notification);
+        $this->sendNotificationEmailsToAddressees($notification);
        $this->sendNotificationEmailsToAddressesEmails($notification);
    }

-    public function postUpdateNotification(Notification $notification, PostUpdateEventArgs $eventArgs): void
+    private function sendNotificationEmailsToAddressees(Notification $notification): void
    {
-        $this->sendNotificationEmailsToAddressesEmails($notification);
-    }
+        if ('' === $notification->getType()) {
+            $this->logger->warning('[NotificationMailer] Notification has no type, skipping email processing', [
+                'notification_id' => $notification->getId(),
+            ]);

-    private function sendNotificationEmailsToAddresses(Notification $notification): void
-    {
-        foreach ($notification->getAddressees() as $addressee) {
+            return;
+        }
+
+        foreach ($notification->getAllAddressees() as $addressee) {
            if (null === $addressee->getEmail()) {
                continue;
            }

-            if ($notification->isSystem()) {
-                $email = new Email();
-                $email
-                    ->text($notification->getMessage());
-            } else {
-                $email = new TemplatedEmail();
-                $email
-                    ->textTemplate('@ChillMain/Notification/email_non_system_notification_content.fr.md.twig')
-                    ->context([
-                        'notification' => $notification,
-                        'dest' => $addressee,
-                    ]);
-            }
+            $this->processNotificationForAddressee($notification, $addressee);
+        }
+    }

+    private function processNotificationForAddressee(Notification $notification, User $addressee): void
+    {
+        $notificationType = $notification->getType();
+
+        if ($addressee->isNotificationSendImmediately($notificationType)) {
+            $this->scheduleImmediateEmail($notification, $addressee);
+        }
+    }
+
+    private function scheduleImmediateEmail(Notification $notification, User $addressee): void
+    {
+        $message = new SendImmediateNotificationEmailMessage(
+            $notification->getId(),
+            $addressee->getId()
+        );
+
+        $this->messageBus->dispatch($message);
+
+        $this->logger->info('[NotificationMailer] Scheduled immediate email', [
+            'notification_id' => $notification->getId(),
+            'addressee_email' => $addressee->getEmail(),
+        ]);
+    }
+
+    /**
+     * This method sends the email but is now called by the immediate notification email message handler.
+     *
+     * @throws TransportExceptionInterface
+     */
+    public function sendEmailToAddressee(Notification $notification, User $addressee): void
+    {
+        if (null === $addressee->getEmail()) {
+            return;
+        }
+
+        if ($notification->isSystem()) {
+            $email = new Email();
+            $email->text($notification->getMessage());
+        } else {
+            $email = new TemplatedEmail();
            $email
-                ->subject($notification->getTitle())
-                ->to($addressee->getEmail());
-
-            try {
-                $this->mailer->send($email);
-            } catch (TransportExceptionInterface $e) {
-                $this->logger->warning('[NotificationMailer] could not send an email notification', [
-                    'to' => $addressee->getEmail(),
-                    'error_message' => $e->getMessage(),
-                    'error_trace' => $e->getTraceAsString(),
+                ->textTemplate('@ChillMain/Notification/email_non_system_notification_content.fr.md.twig')
+                ->context([
+                    'notification' => $notification,
+                    'dest' => $addressee,
                ]);
-            }
+        }
+
+        $email
+            ->subject($notification->getTitle())
+            ->to($addressee->getEmail());
+
+        try {
+            $this->mailer->send($email);
+            $this->logger->info('[NotificationMailer] Email sent successfully', [
+                'notification_id' => $notification->getId(),
+                'addressee_email' => $addressee->getEmail(),
+            ]);
+        } catch (TransportExceptionInterface $e) {
+            $this->logger->warning('[NotificationMailer] Could not send an email notification', [
+                'to' => $addressee->getEmail(),
+                'notification_id' => $notification->getId(),
+                'error_message' => $e->getMessage(),
+                'error_trace' => $e->getTraceAsString(),
+            ]);
+            throw $e;
+        }
+    }
+
+    /**
+     * Send daily digest email with multiple notifications to a user.
+     *
+     * @throws TransportExceptionInterface
+     */
+    public function sendDailyDigest(User $user, array $notifications): void
+    {
+        if (null === $user->getEmail() || [] === $notifications) {
+            return;
+        }
+
+        $email = new TemplatedEmail();
+        $email
+            ->htmlTemplate('@ChillMain/Notification/email_daily_digest.fr.md.twig')
+            ->context([
+                'user' => $user,
+                'notifications' => $notifications,
+                'notification_count' => count($notifications),
+            ])
+            ->subject($this->translator->trans('notification.Daily Notification Digest'))
+            ->to($user->getEmail());
+
+        try {
+            $this->mailer->send($email);
+            $this->logger->info('[NotificationMailer] Daily digest email sent successfully', [
+                'user_email' => $user->getEmail(),
+                'notification_count' => count($notifications),
+            ]);
+        } catch (TransportExceptionInterface $e) {
+            $this->logger->warning('[NotificationMailer] Could not send daily digest email', [
+                'to' => $user->getEmail(),
+                'notification_count' => count($notifications),
+                'error_message' => $e->getMessage(),
+                'error_trace' => $e->getTraceAsString(),
+            ]);
+            throw $e;
        }
    }

    private function sendNotificationEmailsToAddressesEmails(Notification $notification): void
    {
-        foreach ($notification->getAddressesEmailsAdded() as $emailAddress) {
+        foreach ($notification->getAddresseeUserGroups() as $userGroup) {
+
+            if (!$userGroup->hasEmail()) {
+                continue;
+            }
+
+            $emailAddress = $userGroup->getEmail();
+
            $email = new TemplatedEmail();
            $email
                ->textTemplate('@ChillMain/Notification/email_non_system_notification_content_to_email.fr.md.twig')
--- a/src/Bundle/ChillMainBundle/Notification/FlagProviders/NotificationByUserFlagProvider.php
+++ b/src/Bundle/ChillMainBundle/Notification/FlagProviders/NotificationByUserFlagProvider.php
@@ -0,0 +1,30 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\MainBundle\Notification\FlagProviders;
+
+use Symfony\Component\Translation\TranslatableMessage;
+use Symfony\Contracts\Translation\TranslatableInterface;
+
+class NotificationByUserFlagProvider implements NotificationFlagProviderInterface
+{
+    public const FLAG = 'notif-by-user';
+
+    public function getFlag(): string
+    {
+        return self::FLAG;
+    }
+
+    public function getLabel(): TranslatableInterface
+    {
+        return new TranslatableMessage('notification.flags.by-user');
+    }
+}
--- a/src/Bundle/ChillMainBundle/Notification/FlagProviders/NotificationFlagProviderInterface.php
+++ b/src/Bundle/ChillMainBundle/Notification/FlagProviders/NotificationFlagProviderInterface.php
@@ -0,0 +1,21 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\MainBundle\Notification\FlagProviders;
+
+use Symfony\Contracts\Translation\TranslatableInterface;
+
+interface NotificationFlagProviderInterface
+{
+    public function getFlag(): string;
+
+    public function getLabel(): TranslatableInterface;
+}
--- a/src/Bundle/ChillMainBundle/Notification/FlagProviders/WorkflowTransitionNotificationFlagProvider.php
+++ b/src/Bundle/ChillMainBundle/Notification/FlagProviders/WorkflowTransitionNotificationFlagProvider.php
@@ -0,0 +1,30 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\MainBundle\Notification\FlagProviders;
+
+use Symfony\Component\Translation\TranslatableMessage;
+use Symfony\Contracts\Translation\TranslatableInterface;
+
+class WorkflowTransitionNotificationFlagProvider implements NotificationFlagProviderInterface
+{
+    public const FLAG = 'workflow-trans-notif';
+
+    public function getFlag(): string
+    {
+        return self::FLAG;
+    }
+
+    public function getLabel(): TranslatableInterface
+    {
+        return new TranslatableMessage('notification.flags.workflow-trans');
+    }
+}
--- a/src/Bundle/ChillMainBundle/Notification/NotificationFlagManager.php
+++ b/src/Bundle/ChillMainBundle/Notification/NotificationFlagManager.php
@@ -0,0 +1,33 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\MainBundle\Notification;
+
+use Chill\MainBundle\Notification\FlagProviders\NotificationFlagProviderInterface;
+
+final readonly class NotificationFlagManager
+{
+    /**
+     * @var array<NotificationFlagProviderInterface>
+     */
+    private array $notificationFlagProviders;
+
+    public function __construct(
+        iterable $notificationFlagProviders,
+    ) {
+        $this->notificationFlagProviders = iterator_to_array($notificationFlagProviders);
+    }
+
+    public function getAllNotificationFlagProviders(): array
+    {
+        return $this->notificationFlagProviders;
+    }
+}