Add current user to certain messages

src/Messenger/CurrentUserMiddleware.php

@@ -0,0 +1,30 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Gems\Messenger;
+
+use Gems\Legacy\CurrentUserRepository;
+use Gems\Messenger\Message\CurrentUserMessage;
+use Symfony\Component\Messenger\Envelope;
+use Symfony\Component\Messenger\Middleware\MiddlewareInterface;
+use Symfony\Component\Messenger\Middleware\StackInterface;
+
+class CurrentUserMiddleware implements MiddlewareInterface
+{
+    public function __construct(
+        private readonly CurrentUserRepository $currentUserRepository,
+    )
+    {}
+
+    public function handle(Envelope $envelope, StackInterface $stack): Envelope
+    {
+        $message = $envelope->getMessage();
+        if ($message instanceof CurrentUserMessage && $this->currentUserRepository->getCurrentLoginName() === null) {
+            $this->currentUserRepository->setCurrentUserCredentials($message->getUserName(), $message->getOrganizationId());
+            $this->currentUserRepository->getCurrentUser();
+        }
+
+        return $stack->next()->handle($envelope, $stack);
+    }
+}

src/Messenger/Message/CurrentUserMessage.php

@@ -0,0 +1,31 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Gems\Messenger\Message;
+
+class CurrentUserMessage
+{
+    public function __construct(
+        protected readonly string $userName,
+        protected readonly int $organizationId
+    )
+    {
+    }
+
+    /**
+     * @return string
+     */
+    public function getUserName(): string
+    {
+        return $this->userName;
+    }
+
+    /**
+     * @return int
+     */
+    public function getOrganizationId(): int
+    {
+        return $this->organizationId;
+    }
+}

src/Messenger/MessengerFactory.php

@@ -2,9 +2,12 @@
 
 namespace Gems\Messenger;
 
+
+use Gems\Legacy\CurrentUserRepository;
 use Laminas\ServiceManager\Factory\FactoryInterface;
 use Psr\Container\ContainerInterface;
 use Psr\EventDispatcher\EventDispatcherInterface;
+use Symfony\Component\Messenger\EventListener\SendFailedMessageToFailureTransportListener;
 use Symfony\Component\Messenger\MessageBus;
 use Symfony\Component\Messenger\MessageBusInterface;
 use Symfony\Component\Messenger\Middleware\AddBusNameStampMiddleware;
@@ -37,7 +40,7 @@ public function __invoke(ContainerInterface $container, $requestedName, ?array $
             $customMiddleware = $config['messenger']['buses'][$this->busName]['middleware'];
         }
 
-        $eventDispatcher = $container->get(EventDispatcherInterface::class);
+        $eventDispatcher = $this->getEventDispatcher($container);
 
         $sendMessageLocator = $this->getSendMessageLocator($config['messenger']['buses'][$this->busName], $container);
         $sendMessageMiddleware = new SendMessageMiddleware($sendMessageLocator, $eventDispatcher);
@@ -57,6 +60,7 @@ public function __invoke(ContainerInterface $container, $requestedName, ?array $
         }
 
         $middleware = [
+            new CurrentUserMiddleware($container->get(CurrentUserRepository::class)),
             new AddBusNameStampMiddleware($this->busName),
             new RejectRedeliveredMessageMiddleware(),
             new DispatchAfterCurrentBusMiddleware(),
@@ -69,6 +73,38 @@ public function __invoke(ContainerInterface $container, $requestedName, ?array $
         return new MessageBus($middleware);
     }
 
+    protected function addFailedMessageListener(EventDispatcherInterface $eventDispatcher, ContainerInterface $container): void
+    {
+        $config = $container->get('config');
+        $failureTransportName = $config['messenger']['failure_transport'] ?? null;
+        if (!$failureTransportName) {
+            return;
+        }
+        if (!$container->has($failureTransportName)) {
+            return;
+        }
+
+        new SendFailedMessageToFailureTransportListener(
+            $container->get($failureTransportName),
+            null// $logger
+        );
+
+    }
+
+    protected function getEventDispatcher(ContainerInterface $container): EventDispatcherInterface
+    {
+        $eventDispatcher = $container->get(EventDispatcherInterface::class);
+
+        //$this->addFailedMessageListener($eventDispatcher, $container);
+
+        /*new SendFailedMessageToFailureTransportListener(
+            $container->get($failureTransportName),
+            $logger ? $container->get($logger) : null
+        );*/
+
+        return $eventDispatcher;
+    }
+
     protected function getHandleMessageLocator(array $config, ContainerInterface $container): Psr11HandlersLocator
     {
         if (!isset($config['handlers'])) {