PS-916 novu: create topic even if no notification sent

Author: 4rthem

databox/api/src/Asset/ObjectNotifier.php

@@ -42,9 +42,10 @@ public function notifyObject(
                 }
 
                 if ($object->isAutoSubscribeOwner() && $object->getOwnerId()) {
-                    $this->notifier->addTopicSubscribers($topicKey, [$object->getOwnerId()]);
+                    $this->notifier->addTopicSubscribers($topicKey, [$object->getOwnerId()], direct: true);
                     $shouldNotify = true;
                 } else {
+                    $this->notifier->createTopic($topicKey);
                     $shouldNotify = false;
                 }
 

lib/php/notify-bundle/composer.json

@@ -7,9 +7,18 @@
     ],
     "homepage": "https://www.alchemy.fr/",
     "license": "MIT",
+    "repositories": [
+        {
+            "type": "path",
+            "url": "../auth-bundle",
+            "options": {
+                "symlink": true
+            }
+        }
+    ],
     "require": {
         "php": "^8.3",
-        "alchemy/auth-bundle": "*",
+        "alchemy/auth-bundle": "@dev",
         "symfony/notifier": "^6.4.13",
         "symfony/framework-bundle": "^6.4"
     },

lib/php/notify-bundle/src/AlchemyNotifyBundle.php

@@ -8,6 +8,8 @@
 use Alchemy\NotifyBundle\Command\TestNotificationCommand;
 use Alchemy\NotifyBundle\Controller\NotificationController;
 use Alchemy\NotifyBundle\Message\AddTopicSubscribersHandler;
+use Alchemy\NotifyBundle\Message\NotifyTopicHandler;
+use Alchemy\NotifyBundle\Message\RemoveTopicSubscribersHandler;
 use Alchemy\NotifyBundle\Message\UpdateSubscribersHandler;
 use Alchemy\NotifyBundle\Notification\MockNotifier;
 use Alchemy\NotifyBundle\Notification\NotifierInterface;
@@ -95,6 +97,8 @@ public function loadExtension(array $config, ContainerConfigurator $container, C
         $services->set(TestNotificationCommand::class);
         $services->set(NotificationController::class);
         $services->set(AddTopicSubscribersHandler::class);
+        $services->set(RemoveTopicSubscribersHandler::class);
+        $services->set(NotifyTopicHandler::class);
         $services->set(UpdateSubscribersHandler::class);
     }
 }

lib/php/notify-bundle/src/Message/NotifyTopic.php

@@ -0,0 +1,15 @@
+<?php
+
+namespace Alchemy\NotifyBundle\Message;
+
+final readonly class NotifyTopic
+{
+    public function __construct(
+        public string $topicKey,
+        public ?string $authorId,
+        public string $notificationId,
+        public array $parameters = [],
+        public array $options = [],
+    ) {
+    }
+}

lib/php/notify-bundle/src/Message/NotifyTopicHandler.php

@@ -0,0 +1,28 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Alchemy\NotifyBundle\Message;
+
+use Alchemy\NotifyBundle\Service\NovuClient;
+use Symfony\Component\Messenger\Attribute\AsMessageHandler;
+
+#[AsMessageHandler]
+readonly class NotifyTopicHandler
+{
+    public function __construct(
+        private NovuClient $novuClient,
+    ) {
+    }
+
+    public function __invoke(NotifyTopic $message): void
+    {
+        $this->novuClient->notifyTopic(
+            $message->topicKey,
+            $message->authorId,
+            $message->notificationId,
+            $message->parameters,
+            $message->options
+        );
+    }
+}

lib/php/notify-bundle/src/Message/RemoveTopicSubscribers.php

@@ -0,0 +1,22 @@
+<?php
+
+namespace Alchemy\NotifyBundle\Message;
+
+final readonly class RemoveTopicSubscribers
+{
+    public function __construct(
+        private string $topicKey,
+        private array $subscribers,
+    ) {
+    }
+
+    public function getTopicKey(): string
+    {
+        return $this->topicKey;
+    }
+
+    public function getSubscribers(): array
+    {
+        return $this->subscribers;
+    }
+}

lib/php/notify-bundle/src/Message/RemoveTopicSubscribersHandler.php

@@ -0,0 +1,22 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Alchemy\NotifyBundle\Message;
+
+use Alchemy\NotifyBundle\Service\NovuClient;
+use Symfony\Component\Messenger\Attribute\AsMessageHandler;
+
+#[AsMessageHandler]
+readonly class RemoveTopicSubscribersHandler
+{
+    public function __construct(
+        private NovuClient $novuClient,
+    ) {
+    }
+
+    public function __invoke(RemoveTopicSubscribers $message): void
+    {
+        $this->novuClient->removeTopicSubscribers($message->getTopicKey(), $message->getSubscribers());
+    }
+}

lib/php/notify-bundle/src/Notification/MockNotifier.php

@@ -52,7 +52,7 @@ public function notifyTopic(
         ];
     }
 
-    public function addTopicSubscribers(string $topicKey, array $subscribers): void
+    public function addTopicSubscribers(string $topicKey, array $subscribers, bool $direct = false): void
     {
     }
 

lib/php/notify-bundle/src/Notification/NotifierInterface.php

@@ -34,6 +34,7 @@ public function notifyTopic(
     public function addTopicSubscribers(
         string $topicKey,
         array $subscribers,
+        bool $direct = false,
     ): void;
 
     public function createTopic(

lib/php/notify-bundle/src/Notification/SymfonyNotifier.php

@@ -6,6 +6,8 @@
 
 use Alchemy\AuthBundle\Repository\UserRepository;
 use Alchemy\NotifyBundle\Message\AddTopicSubscribers;
+use Alchemy\NotifyBundle\Message\NotifyTopic;
+use Alchemy\NotifyBundle\Message\RemoveTopicSubscribers;
 use Alchemy\NotifyBundle\Message\UpdateSubscribers;
 use Alchemy\NotifyBundle\Service\NovuClient;
 use Psr\Log\LoggerAwareInterface;
@@ -73,12 +75,16 @@ public function notifyTopic(
         if ($this->notifyAuthor) {
             $authorId = null;
         }
-        $this->novuClient->notifyTopic($topicKey, $authorId, $notificationId, $parameters, $options);
+        $this->bus->dispatch(new NotifyTopic($topicKey, $authorId, $notificationId, $parameters, $options));
     }
 
-    public function addTopicSubscribers(string $topicKey, array $subscribers): void
+    public function addTopicSubscribers(string $topicKey, array $subscribers, bool $direct = false): void
     {
-        $this->bus->dispatch(new AddTopicSubscribers($topicKey, $subscribers));
+        if ($direct) {
+            $this->novuClient->addTopicSubscribers($topicKey, $subscribers);
+        } else {
+            $this->bus->dispatch(new AddTopicSubscribers($topicKey, $subscribers));
+        }
         $this->bus->dispatch(new UpdateSubscribers($subscribers));
     }
 
@@ -89,7 +95,7 @@ public function createTopic(string $topicKey): void
 
     public function removeTopicSubscribers(string $topicKey, array $subscribers): void
     {
-        $this->novuClient->removeTopicSubscribers($topicKey, $subscribers);
+        $this->bus->dispatch(new RemoveTopicSubscribers($topicKey, $subscribers));
     }
 
     public function getTopicSubscriptions(array $topicKeys, string $userId): array