feat(notification): web push notification support

config/domains/notification.yaml

@@ -7,3 +7,4 @@ services:
 
     # Doctrine Repositories
     Domain\Notification\Repository\NotificationRepositoryInterface: '@Infrastructure\Notification\Doctrine\Repository\NotificationRepository'
+    Domain\Notification\Repository\PushSubscriptionRepositoryInterface: '@Infrastructure\Notification\Doctrine\Repository\PushSubscriptionRepository'

src/Application/Notification/Command/SetAllNotificationsReadCommand.php

@@ -15,7 +15,6 @@ final class SetAllNotificationsReadCommand
 {
     public function __construct(
         public readonly User $user
-    )
-    {
+    ) {
     }
 }

src/Application/Notification/Service/NotificationService.php

@@ -115,15 +115,15 @@ private function getHashForEntity(object $entity): string
     {
         $hash = $entity::class;
         if (method_exists($entity, 'getId')) {
-            $hash .= sprintf('::%s', (string)$entity->getId());
+            $hash .= sprintf('::%s', (string) $entity->getId());
         }
 
         return $hash;
     }
 
-    private function getUrlForEntityChannel(object $entity): ?string
+    private function getUrlForEntityChannel(object $entity): string
     {
-        return null;
+        return '';
     }
 
     private function getUrlForEntityUser(object $entity, User $user): string
@@ -132,8 +132,12 @@ private function getUrlForEntityUser(object $entity, User $user): string
             'report_employee_report_show' :
             'report_manager_report_show';
         $parameters = match (true) {
-            $entity instanceof Evaluation => ['uuid' => $entity->getReport()->getUuid()],
-            $entity instanceof Report => ['uuid' => $entity->getUuid()],
+            $entity instanceof Evaluation => [
+                'uuid' => $entity->getReport()?->getUuid(),
+            ],
+            $entity instanceof Report => [
+                'uuid' => $entity->getUuid(),
+            ],
             default => []
         };
 

src/Domain/Notification/Entity/Notification.php

@@ -133,7 +133,7 @@ public function getIsRead(): bool
         return $this->is_read;
     }
 
-    public function setIsRead(?bool $is_read): self
+    public function setIsRead(bool $is_read): self
     {
         $this->is_read = $is_read;
 

src/Domain/Notification/Entity/PushSubscription.php

@@ -77,6 +77,7 @@ public function getUser(): ?User
     public function setUser(?User $user): self
     {
         $this->user = $user;
+
         return $this;
     }
 }

src/Domain/Notification/Repository/NotificationRepositoryInterface.php

@@ -22,5 +22,5 @@ public function findRecentForUser(User $user, array $channels = ['public']): arr
 
     public function countUnreadForUser(User $user): int;
 
-    public function setAllReadForUser(User $user);
+    public function setAllReadForUser(User $user): int;
 }

src/Domain/Notification/Repository/PushSubscriptionRepositoryInterface.php

@@ -13,4 +13,5 @@
  */
 interface PushSubscriptionRepositoryInterface extends DataRepositoryInterface
 {
+    public function deleteSubscriptionByEndpoint(string $endpoint): int;
 }

src/Domain/Notification/ValueObject/PushSubscriptionKeys.php

@@ -16,7 +16,7 @@ class PushSubscriptionKeys
     public readonly string $p256dh;
     public readonly string $auth;
 
-    private function __construct($p256dh, $auth)
+    private function __construct(string $p256dh, string $auth)
     {
         Assert::notEmpty($p256dh);
         Assert::notEmpty($auth);
@@ -37,7 +37,7 @@ public function toArray(): array
     {
         return [
             'auth' => $this->auth,
-            'p256dh' => $this->p256dh
+            'p256dh' => $this->p256dh,
         ];
     }
 }

src/Infrastructure/Notification/Doctrine/Repository/PushSubscriptionRepository.php

@@ -21,24 +21,35 @@ public function __construct(ManagerRegistry $registry)
         parent::__construct($registry, PushSubscription::class);
     }
 
-    /**
-     * @param PushSubscription $entity
-     * @return void
-     */
     public function save(object $entity): void
     {
-        $subscription = $this->findOneBy(['endpoint' => $entity->getEndpoint()]);
-
-        if ($subscription) {
-            $subscription
-                ->setExpirationTime($entity->getExpirationTime())
-                ->setKeys($entity->getKeys())
-                ->setUpdatedAt($entity->getCreatedAt());
-        } else {
-            $subscription = $entity;
+        if ($entity instanceof PushSubscription) {
+            /** @var PushSubscription|null $subscription */
+            $subscription = $this->findOneBy([
+                'endpoint' => $entity->getEndpoint(),
+            ]);
+
+            if ($subscription) {
+                $subscription
+                    ->setExpirationTime($entity->getExpirationTime())
+                    ->setKeys($entity->getKeys())
+                    ->setUpdatedAt($entity->getCreatedAt());
+            } else {
+                $subscription = $entity;
+            }
+
+            $this->getEntityManager()->persist($subscription);
+            $this->getEntityManager()->flush();
         }
+    }
 
-        $this->getEntityManager()->persist($subscription);
-        $this->getEntityManager()->flush();
+    public function deleteSubscriptionByEndpoint(string $endpoint): int
+    {
+        return intval($this->createQueryBuilder('ps')
+            ->delete(PushSubscription::class, 'ps')
+            ->where('ps.endpoint = :endpoint')
+            ->setParameter('endpoint', $endpoint)
+            ->getQuery()
+            ->execute());
     }
 }

src/Infrastructure/Notification/Mercure/MercureEventSubscriber.php

@@ -7,7 +7,6 @@
 use Domain\Authentication\Entity\User;
 use Domain\Notification\Event\NotificationCreatedEvent;
 use Domain\Notification\Event\NotificationReadEvent;
-use Infrastructure\Notification\WebPushService;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 use Symfony\Component\Mercure\HubInterface;
 use Symfony\Component\Mercure\Update;
@@ -21,7 +20,6 @@ final class MercureEventSubscriber implements EventSubscriberInterface
 {
     public function __construct(
         private readonly HubInterface $hub,
-        private readonly WebPushService $push
     ) {
     }
 

src/Infrastructure/Notification/Symfony/Controller/NotificationController.php

@@ -39,7 +39,7 @@ public function index(
                     target: $repository->findRecentForUser($user),
                     page: $request->query->getInt('page', 1),
                     limit: 20
-                )
+                ),
             ]
         );
     }
@@ -60,7 +60,7 @@ public function show(Notification $notification): Response
             $this->handleUnexpectedException($e);
         }
 
-        return $this->redirect($notification->getUrl(), status: Response::HTTP_PERMANENTLY_REDIRECT);
+        return $this->redirect((string) $notification->getUrl(), status: Response::HTTP_PERMANENTLY_REDIRECT);
     }
 
     #[Route('/set_as_read', name: 'read', methods: ['POST'])]

src/Infrastructure/Notification/Symfony/Controller/PushSubscriptionController.php

@@ -5,10 +5,8 @@
 namespace Infrastructure\Notification\Symfony\Controller;
 
 use Domain\Authentication\Entity\User;
-use Domain\Notification\Entity\Notification;
 use Domain\Notification\Entity\PushSubscription;
 use Domain\Notification\Repository\PushSubscriptionRepositoryInterface;
-use Infrastructure\Notification\WebPushService;
 use Infrastructure\Shared\Symfony\Controller\AbstractController;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\IsGranted;
 use Symfony\Component\HttpFoundation\JsonResponse;
@@ -30,28 +28,19 @@ public function subscribe(Request $request, PushSubscriptionRepositoryInterface
         /** @var User $user */
         $user = $this->getUser();
         $subscription = PushSubscription::fromArray(
-            data: json_decode($request->getContent(), associative: true),
+            data: (array) json_decode($request->getContent(), associative: true),
             user: $user
         );
         $repository->save($subscription);
+
         return new JsonResponse(status: Response::HTTP_CREATED);
     }
 
     #[Route('/notification/push/key', name: 'notification_push_key', methods: ['GET'])]
     public function key(): Response
     {
-        return new JsonResponse(['key' => $_ENV['VAPID_PUBLIC_KEY']]);
-    }
-
-    #[Route('notification/ping')]
-    public function ping(WebPushService $service): Response
-    {
-        $notification = (new Notification())
-            ->setMessage("Hello world")
-            ->setUrl("hello");
-
-        $service->notifyChannel($notification);
-
-        return $this->redirectSeeOther('notification_index');
+        return new JsonResponse([
+            'key' => $_ENV['VAPID_PUBLIC_KEY'],
+        ]);
     }
 }

src/Infrastructure/Notification/Symfony/Twig/NotificationExtension.php

@@ -20,16 +20,15 @@ final class NotificationExtension extends AbstractExtension
 {
     public function __construct(
         private readonly NotificationService $notificationService,
-        private readonly Security            $security
-    )
-    {
+        private readonly Security $security
+    ) {
     }
 
     public function getFunctions(): array
     {
         return [
             new TwigFunction('recent_notifications', [$this, 'notifications']),
-            new TwigFunction('count_notifications', [$this, 'count'])
+            new TwigFunction('count_notifications', [$this, 'count']),
         ];
     }
 
@@ -48,6 +47,7 @@ public function count(): int
     {
         /** @var User $user */
         $user = $this->security->getUser();
+
         return $this->notificationService->countForUser($user);
     }
 }

src/Infrastructure/Notification/WebPushService.php

@@ -7,7 +7,7 @@
 use Domain\Authentication\Entity\User;
 use Domain\Notification\Entity\Notification;
 use Domain\Notification\Entity\PushSubscription;
-use Domain\Notification\Repository\PushSubscriptionRepositoryInterface;
+use Infrastructure\Notification\Doctrine\Repository\PushSubscriptionRepository;
 use Minishlink\WebPush\Subscription;
 use Minishlink\WebPush\WebPush;
 use Psr\Log\LoggerInterface;
@@ -24,23 +24,23 @@ final class WebPushService
     private ?string $icon;
 
     public function __construct(
-        private readonly PushSubscriptionRepositoryInterface $repository,
+        private readonly PushSubscriptionRepository $repository,
         private readonly LoggerInterface $logger,
         RequestStack $stack
     ) {
         $this->webPush = new WebPush([
             'VAPID' => [
                 'subject' => 'mailto:[email protected]',
                 'publicKey' => $_ENV['VAPID_PUBLIC_KEY'],
-                'privateKey' => $_ENV['VAPID_PRIVATE_KEY']
-            ]
+                'privateKey' => $_ENV['VAPID_PRIVATE_KEY'],
+            ],
         ]);
         $this->icon = $stack->getCurrentRequest()?->getUriForPath('/images/logo_icon.png');
     }
 
     public function notifyChannel(Notification $notification): void
     {
-        /** @var PushSubscription[] $subscription */
+        /** @var PushSubscription[] $subscriptions */
         $subscriptions = $this->repository->findAll();
 
         try {
@@ -49,11 +49,8 @@ public function notifyChannel(Notification $notification): void
             }
 
             foreach ($this->webPush->flush() as $report) {
-                if (!$report->isSuccess()) {
-                    $this->repository->delete($subscription);
-                    dd($report);
-                } else {
-                    dd($report);
+                if (! $report->isSuccess()) {
+                    $this->repository->deleteSubscriptionByEndpoint($report->getEndpoint());
                 }
             }
         } catch (\Throwable $e) {
@@ -64,17 +61,19 @@ public function notifyChannel(Notification $notification): void
 
     public function notifyUser(Notification $notification, User $user): void
     {
-        /** @var PushSubscription[] $subscription */
-        $subscriptions = $this->repository->findBy(['user' => $user]);
+        /** @var PushSubscription[] $subscriptions */
+        $subscriptions = $this->repository->findBy([
+            'user' => $user,
+        ]);
 
         try {
             foreach ($subscriptions as $subscription) {
                 $this->push($subscription, $notification);
             }
 
             foreach ($this->webPush->flush() as $report) {
-                if (!$report->isSuccess()) {
-                    $this->repository->delete($subscription);
+                if (! $report->isSuccess()) {
+                    $this->repository->deleteSubscriptionByEndpoint($report->getEndpoint());
                 }
             }
         } catch (\Throwable $e) {
@@ -90,25 +89,28 @@ private function push(PushSubscription $subscription, Notification $notification
         $this->webPush->queueNotification(
             subscription: Subscription::create([
                 'endpoint' => $subscription->getEndpoint(),
-                'publicKey' => $subscription->getKeys()->p256dh,
-                'authToken' => $subscription->getKeys()->auth
+                'publicKey' => $subscription->getKeys()?->p256dh,
+                'authToken' => $subscription->getKeys()?->auth,
             ]),
             payload: json_encode([
                 'title' => 'UNH Rapport',
                 'options' => [
                     'body' => $notification->getMessage(),
                     'data' => [
-                        "url" => $notification->getUrl(),
+                        'url' => $notification->getUrl(),
                     ],
                     'actions' => [
-                        ["action" => "show", "title" => "Voir les détails"]
+                        [
+                            'action' => 'show',
+                            'title' => 'Voir les détails',
+                        ],
                     ],
-                    "icon" => $this->icon,
+                    'icon' => $this->icon,
                     'requireInteraction' => true,
-                    'timestamp' => $notification->getCreatedAt()->format('u'),
-                    'lang' => 'FR'
+                    'timestamp' => $notification->getCreatedAt()?->format('u'),
+                    'lang' => 'FR',
                 ],
-            ])
+            ]) ?: null
         );
     }
 }