WIP

alchemy-fr · Apr 22, 2024 · 598e5af · 598e5af
1 parent 9121a93
commit 598e5af
Show file tree

Hide file tree

Showing 50 changed files with 361 additions and 553 deletions.
diff --git a/databox/api/config/packages/messenger.yaml b/databox/api/config/packages/messenger.yaml
@@ -29,16 +29,22 @@ framework:
 
         routing:
             Alchemy\ESBundle\Message\ESIndex: p1
+            Alchemy\Workflow\Message\JobConsumer: p1
         buses:
             command_bus:
                 middleware:
                     - doctrine_ping_connection
 
-when@dev: &dev
+when@dev:
     framework:
         messenger:
             transports:
                 p1: 'sync://'
                 p2: 'sync://'
 
-when@test: *dev
+when@test:
+    framework:
+        messenger:
+            transports:
+                p1: 'test://'
+                p2: 'test://'
diff --git a/databox/api/config/services.yaml b/databox/api/config/services.yaml
@@ -26,8 +26,6 @@ services:
     _instanceof:
         Alchemy\Workflow\Executor\Action\ActionInterface:
             tags: ['alchemy_workflow.action']
-        Arthem\Bundle\RabbitBundle\Consumer\Event\EventMessageHandlerInterface:
-            tags: ['arthem_rabbit.event_handler']
         Symfony\Component\EventDispatcher\EventSubscriberInterface:
             tags: ['kernel.event_subscriber']
         App\Attribute\Type\AttributeTypeInterface:

diff --git a/databox/api/src/Border/Consumer/Handler/Uploader/UploaderNewCommit.php b/databox/api/src/Border/Consumer/Handler/Uploader/UploaderNewCommit.php
@@ -2,6 +2,9 @@
 
 namespace App\Border\Consumer\Handler\Uploader;
 
+use Alchemy\MessengerBundle\Attribute\MessengerMessage;
+
+#[MessengerMessage('p1')]
 final readonly class UploaderNewCommit
 {
     public function __construct(

diff --git a/databox/api/src/Consumer/Handler/Asset/AssetCopy.php b/databox/api/src/Consumer/Handler/Asset/AssetCopy.php
@@ -2,6 +2,9 @@
 
 namespace App\Consumer\Handler\Asset;
 
+use Alchemy\MessengerBundle\Attribute\MessengerMessage;
+
+#[MessengerMessage('p1')]
 final readonly class AssetCopy
 {
     public function __construct(

diff --git a/databox/api/src/Consumer/Handler/Asset/AssetDelete.php b/databox/api/src/Consumer/Handler/Asset/AssetDelete.php
@@ -2,6 +2,9 @@
 
 namespace App\Consumer\Handler\Asset;
 
+use Alchemy\MessengerBundle\Attribute\MessengerMessage;
+
+#[MessengerMessage('p1')]
 final readonly class AssetDelete
 {
     public function __construct(

diff --git a/databox/api/src/Consumer/Handler/Asset/AssetMove.php b/databox/api/src/Consumer/Handler/Asset/AssetMove.php
@@ -2,6 +2,9 @@
 
 namespace App\Consumer\Handler\Asset;
 
+use Alchemy\MessengerBundle\Attribute\MessengerMessage;
+
+#[MessengerMessage('p1')]
 readonly class AssetMove
 {
     public function __construct(

diff --git a/databox/api/src/Consumer/Handler/Asset/AttributeChanged.php b/databox/api/src/Consumer/Handler/Asset/AttributeChanged.php
@@ -2,6 +2,9 @@
 
 namespace App\Consumer\Handler\Asset;
 
+use Alchemy\MessengerBundle\Attribute\MessengerMessage;
+
+#[MessengerMessage('p1')]
 final readonly class AttributeChanged
 {
     public function __construct(

diff --git a/databox/api/src/Consumer/Handler/Collection/DeleteCollection.php b/databox/api/src/Consumer/Handler/Collection/DeleteCollection.php
@@ -2,6 +2,9 @@
 
 namespace App\Consumer\Handler\Collection;
 
+use Alchemy\MessengerBundle\Attribute\MessengerMessage;
+
+#[MessengerMessage('p1')]
 final readonly class DeleteCollection
 {
     public function __construct(

diff --git a/databox/api/src/Consumer/Handler/File/CopyFileToAsset.php b/databox/api/src/Consumer/Handler/File/CopyFileToAsset.php
@@ -2,6 +2,9 @@
 
 namespace App\Consumer\Handler\File;
 
+use Alchemy\MessengerBundle\Attribute\MessengerMessage;
+
+#[MessengerMessage('p1')]
 final readonly class CopyFileToAsset
 {
     public function __construct(

diff --git a/databox/api/src/Consumer/Handler/File/CopyFileToRendition.php b/databox/api/src/Consumer/Handler/File/CopyFileToRendition.php
@@ -2,6 +2,9 @@
 
 namespace App\Consumer\Handler\File;
 
+use Alchemy\MessengerBundle\Attribute\MessengerMessage;
+
+#[MessengerMessage('p1')]
 final readonly class CopyFileToRendition
 {
     public function __construct(

diff --git a/databox/api/src/Consumer/Handler/File/FileDelete.php b/databox/api/src/Consumer/Handler/File/FileDelete.php
@@ -2,6 +2,9 @@
 
 namespace App\Consumer\Handler\File;
 
+use Alchemy\MessengerBundle\Attribute\MessengerMessage;
+
+#[MessengerMessage('p2')]
 final readonly class FileDelete
 {
     public function __construct(

diff --git a/databox/api/src/Consumer/Handler/File/ImportFile.php b/databox/api/src/Consumer/Handler/File/ImportFile.php
@@ -2,6 +2,9 @@
 
 namespace App\Consumer\Handler\File;
 
+use Alchemy\MessengerBundle\Attribute\MessengerMessage;
+
+#[MessengerMessage('p1')]
 final readonly class ImportFile
 {
     public function __construct(

diff --git a/databox/api/src/Consumer/Handler/File/NewAssetFromBorder.php b/databox/api/src/Consumer/Handler/File/NewAssetFromBorder.php
@@ -2,6 +2,9 @@
 
 namespace App\Consumer\Handler\File;
 
+use Alchemy\MessengerBundle\Attribute\MessengerMessage;
+
+#[MessengerMessage('p1')]
 final readonly class NewAssetFromBorder
 {
     public function __construct(

diff --git a/databox/api/src/Consumer/Handler/Phraseanet/PhraseanetDownloadSubdef.php b/databox/api/src/Consumer/Handler/Phraseanet/PhraseanetDownloadSubdef.php
@@ -2,6 +2,9 @@
 
 namespace App\Consumer\Handler\Phraseanet;
 
+use Alchemy\MessengerBundle\Attribute\MessengerMessage;
+
+#[MessengerMessage('p1')]
 final readonly class PhraseanetDownloadSubdef
 {
     public function __construct(

diff --git a/databox/api/src/Consumer/Handler/Search/ESPopulate.php b/databox/api/src/Consumer/Handler/Search/ESPopulate.php
@@ -2,6 +2,9 @@
 
 namespace App\Consumer\Handler\Search;
 
+use Alchemy\MessengerBundle\Attribute\MessengerMessage;
+
+#[MessengerMessage('p2')]
 final readonly class ESPopulate
 {
 }
diff --git a/databox/api/src/Consumer/Handler/Search/IndexAllAssets.php b/databox/api/src/Consumer/Handler/Search/IndexAllAssets.php
@@ -2,6 +2,9 @@
 
 namespace App\Consumer\Handler\Search;
 
+use Alchemy\MessengerBundle\Attribute\MessengerMessage;
+
+#[MessengerMessage('p1')]
 final readonly class IndexAllAssets
 {
 

diff --git a/databox/api/src/Consumer/Handler/Search/IndexAllCollections.php b/databox/api/src/Consumer/Handler/Search/IndexAllCollections.php
@@ -2,6 +2,9 @@
 
 namespace App\Consumer\Handler\Search;
 
+use Alchemy\MessengerBundle\Attribute\MessengerMessage;
+
+#[MessengerMessage('p1')]
 final readonly class IndexAllCollections
 {
 

diff --git a/databox/api/src/Consumer/Handler/Search/IndexCollectionBranch.php b/databox/api/src/Consumer/Handler/Search/IndexCollectionBranch.php
@@ -2,6 +2,9 @@
 
 namespace App\Consumer\Handler\Search;
 
+use Alchemy\MessengerBundle\Attribute\MessengerMessage;
+
+#[MessengerMessage('p1')]
 final readonly class IndexCollectionBranch
 {
     public function __construct(

diff --git a/databox/api/src/Consumer/Handler/Search/Mapping/UpdateAttributesMapping.php b/databox/api/src/Consumer/Handler/Search/Mapping/UpdateAttributesMapping.php
@@ -2,6 +2,9 @@
 
 namespace App\Consumer\Handler\Search\Mapping;
 
+use Alchemy\MessengerBundle\Attribute\MessengerMessage;
+
+#[MessengerMessage('p1')]
 final readonly class UpdateAttributesMapping
 {
     public function __construct(private string $id)

diff --git a/databox/api/src/Consumer/Handler/Workspace/DeleteWorkspace.php b/databox/api/src/Consumer/Handler/Workspace/DeleteWorkspace.php
@@ -2,6 +2,9 @@
 
 namespace App\Consumer\Handler\Workspace;
 
+use Alchemy\MessengerBundle\Attribute\MessengerMessage;
+
+#[MessengerMessage('p2')]
 final readonly class DeleteWorkspace
 {
     public function __construct(

diff --git a/databox/api/src/Consumer/Handler/Workspace/OnWorkspaceDelete.php b/databox/api/src/Consumer/Handler/Workspace/OnWorkspaceDelete.php
@@ -2,6 +2,9 @@
 
 namespace App\Consumer\Handler\Workspace;
 
+use Alchemy\MessengerBundle\Attribute\MessengerMessage;
+
+#[MessengerMessage('p1')]
 final readonly class OnWorkspaceDelete
 {
     public function __construct(

diff --git a/databox/api/src/Integration/Aws/Transcribe/Consumer/AwsTranscribeEvent.php b/databox/api/src/Integration/Aws/Transcribe/Consumer/AwsTranscribeEvent.php
@@ -2,6 +2,9 @@
 
 namespace App\Integration\Aws\Transcribe\Consumer;
 
+use Alchemy\MessengerBundle\Attribute\MessengerMessage;
+
+#[MessengerMessage('p1')]
 final readonly class AwsTranscribeEvent
 {
     public function __construct(private string $integrationId, private string $body)

diff --git a/databox/api/src/Integration/Aws/Transcribe/Consumer/AwsTranscribeEventHandler.php b/databox/api/src/Integration/Aws/Transcribe/Consumer/AwsTranscribeEventHandler.php
@@ -41,7 +41,7 @@ public function __invoke(AwsTranscribeEvent $message): void
         if ('Notification' === $payload['Type']) {
             $msg = json_decode($payload['Message'], true, 512, JSON_THROW_ON_ERROR);
 
-            if ('aws.transcribe' === $message['source']) {
+            if ('aws.transcribe' === $msg['source']) {
                 $this->bus->dispatch(new TranscribeJobStatusChanged(
                     $workspaceIntegration->getId(),
                     $msg

diff --git a/databox/api/src/Integration/Aws/Transcribe/Consumer/ConfirmSnsSubscription.php b/databox/api/src/Integration/Aws/Transcribe/Consumer/ConfirmSnsSubscription.php
@@ -2,6 +2,9 @@
 
 namespace App\Integration\Aws\Transcribe\Consumer;
 
+use Alchemy\MessengerBundle\Attribute\MessengerMessage;
+
+#[MessengerMessage('p1')]
 final readonly class ConfirmSnsSubscription
 {
     public function __construct(private string $url)

diff --git a/databox/api/src/Integration/Aws/Transcribe/Consumer/TranscribeJobStatusChanged.php b/databox/api/src/Integration/Aws/Transcribe/Consumer/TranscribeJobStatusChanged.php
@@ -0,0 +1,23 @@
+<?php
+
+namespace App\Integration\Aws\Transcribe\Consumer;
+
+use Alchemy\MessengerBundle\Attribute\MessengerMessage;
+
+#[MessengerMessage('p1')]
+final readonly class TranscribeJobStatusChanged
+{
+    public function __construct(private string $integrationId, private array $message)
+    {
+    }
+
+    public function getIntegrationId(): string
+    {
+        return $this->integrationId;
+    }
+
+    public function getMessage(): array
+    {
+        return $this->message;
+    }
+}
diff --git a/databox/api/src/Integration/Aws/Transcribe/Consumer/TranscribeJobStatusChangedHandler.php b/databox/api/src/Integration/Aws/Transcribe/Consumer/TranscribeJobStatusChangedHandler.php
@@ -5,8 +5,6 @@
 namespace App\Integration\Aws\Transcribe\Consumer;
 
 use App\Integration\IntegrationManager;
-use Arthem\Bundle\RabbitBundle\Consumer\Event\AbstractEntityManagerHandler;
-use Arthem\Bundle\RabbitBundle\Consumer\Event\EventMessage;
 use Symfony\Component\Messenger\Attribute\AsMessageHandler;
 
 #[AsMessageHandler]
@@ -100,20 +98,3 @@ public function __invoke(TranscribeJobStatusChanged $message): void
          */
     }
 }
-
-final readonly class TranscribeJobStatusChanged
-{
-    public function __construct(private string $integrationId, private array $message)
-    {
-    }
-
-    public function getIntegrationId(): string
-    {
-        return $this->integrationId;
-    }
-
-    public function getMessage(): array
-    {
-        return $this->message;
-    }
-}
diff --git a/databox/api/tests/Integration/Aws/Transcribe/AwsTranscribeEventTest.php b/databox/api/tests/Integration/Aws/Transcribe/AwsTranscribeEventTest.php
@@ -12,8 +12,8 @@
 use App\Entity\Integration\IntegrationData;
 use App\Entity\Integration\WorkspaceIntegration;
 use App\Integration\Aws\Transcribe\AwsTranscribeIntegration;
+use App\Integration\Aws\Transcribe\Consumer\AwsTranscribeEvent;
 use App\Integration\Aws\Transcribe\Consumer\AwsTranscribeEventHandler;
-use Arthem\Bundle\RabbitBundle\Producer\EventProducer;
 use Symfony\Component\HttpKernel\KernelInterface;
 use Symfony\Contracts\HttpClient\ResponseInterface;
 
@@ -29,6 +29,8 @@ public function testSubscriptionUrlWillBeConfirmed(): void
         $apiClient = static::createClient();
         $apiClient->disableReboot();
 
+        $inMemoryTransport = $this->interceptMessengerEvents();
+
         $wsIntegration = $this->createIntegration();
 
         $payload = <<<EOL
@@ -48,6 +50,11 @@ public function testSubscriptionUrlWillBeConfirmed(): void
 
         $this->triggerEvent($apiClient, $wsIntegration->getId(), $payload);
         $this->assertResponseStatusCodeSame(200);
+
+        $envelope = $inMemoryTransport->getSent()[0];
+        self::assertInstanceOf(AwsTranscribeEvent::class, $envelope->getMessage());
+        $this->consumeEvent($envelope);
+
         $this->assertHasData($wsIntegration->getId(), AwsTranscribeEventHandler::DATA_EVENT_MESSAGE, 1);
     }
 
@@ -111,8 +118,7 @@ public function testNotificationWillBeHandled(): void
     {
         self::enableFixtures();
 
-        $eventProducer = self::getService(EventProducer::class);
-        $eventProducer->interceptEvents();
+        $inMemoryTransport = $this->interceptMessengerEvents();
 
         $apiClient = static::createClient();
         $apiClient->disableReboot();
@@ -136,9 +142,9 @@ public function testNotificationWillBeHandled(): void
         $this->triggerEvent($apiClient, $wsIntegration->getId(), $payload);
         $this->assertResponseStatusCodeSame(200);
 
-        $eventMessage = $eventProducer->shiftEvent();
-        self::assertEquals(AwsTranscribeEventHandler::EVENT, $eventMessage->getType());
-        $this->consumeEvent($eventMessage);
+        $envelope = $inMemoryTransport->get()[0];
+        self::assertInstanceOf(AwsTranscribeEvent::class, $envelope->getMessage());
+        $this->consumeEvent($envelope);
 
         $this->assertHasData($wsIntegration->getId(), AwsTranscribeEventHandler::DATA_EVENT_MESSAGE, 1);
     }