Merge pull request #1631 from mark-fajardo/feature/PNM-685-update-sqs…

…-queue-transport-to-handle-fifo-queues-new [EasyNotification] Update SqsQueueTransport.php to handle FIFO queues
eonx-com · Jan 28, 2025 · 664b8ae · 664b8ae
2 parents 602c78b + f28054f
commit 664b8ae
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 2 deletions.
diff --git a/packages/EasyNotification/composer.json b/packages/EasyNotification/composer.json
@@ -8,7 +8,8 @@
         "aws/aws-sdk-php": "^3.134",
         "eonx-com/easy-utils": "^4.6",
         "nette/utils": "^3.1",
-        "symfony/http-client": "^5.4 || ^6.0"
+        "symfony/http-client": "^5.4 || ^6.0",
+        "symfony/uid": "^5.4 || ^6.0"
     },
     "require-dev": {
         "phpunit/phpunit": "^9.5 || ^10.0",

diff --git a/packages/EasyNotification/src/Queue/SqsQueueTransport.php b/packages/EasyNotification/src/Queue/SqsQueueTransport.php
@@ -7,6 +7,7 @@
 use Aws\Sqs\SqsClient;
 use EonX\EasyNotification\Interfaces\QueueMessageInterface;
 use EonX\EasyNotification\Interfaces\QueueTransportInterface;
+use Symfony\Component\Uid\Uuid;
 
 final class SqsQueueTransport implements QueueTransportInterface
 {
@@ -22,10 +23,19 @@ public function __construct(SqsClient $sqs)
 
     public function send(QueueMessageInterface $queueMessage): void
     {
+        $queueUrl = $queueMessage->getQueueUrl();
+
+        if (\str_ends_with($queueUrl, '.fifo')) {
+            $messageDeduplicationId = (string)Uuid::v4();
+            $messageGroupId = (string)Uuid::v4();
+        }
+
         $this->sqs->sendMessage([
-            'QueueUrl' => $queueMessage->getQueueUrl(),
+            'QueueUrl' => $queueUrl,
             'MessageAttributes' => $this->formatHeaders($queueMessage->getHeaders()),
             'MessageBody' => $queueMessage->getBody(),
+            'MessageDeduplicationId' => $messageDeduplicationId ?? null,
+            'MessageGroupId' => $messageGroupId ?? null,
         ]);
     }
 

diff --git a/packages/EasyNotification/tests/NotificationClientTest.php b/packages/EasyNotification/tests/NotificationClientTest.php
@@ -118,6 +118,8 @@ public function testSend(): void
                 ],
             ],
             'MessageBody' => '{"body":"{\"name\":\"nathan\"}","topics":["topic"]}',
+            'MessageDeduplicationId' => null,
+            'MessageGroupId' => null,
         ];
 
         self::assertEquals($expected, $sqsClientStub->getCalls()[0]);

diff --git a/packages/EasyNotification/tests/Queue/SqsQueueTransportTest.php b/packages/EasyNotification/tests/Queue/SqsQueueTransportTest.php
@@ -30,8 +30,25 @@ public function testSend(): void
                 ],
             ],
             'MessageBody' => 'my-body',
+            'MessageDeduplicationId' => null,
+            'MessageGroupId' => null,
         ];
 
         self::assertEquals($expected, $stub->getCalls()[0]);
     }
+
+    public function testSendFifo(): void
+    {
+        $queueUrl = 'https://sqs.my-queue.fifo';
+        $stub = new SqsClientStub();
+        $queueMessage = (new QueueMessage())
+            ->addHeader('my-header', 'my-value')
+            ->setBody('my-body')
+            ->setQueueUrl($queueUrl);
+
+        (new SqsQueueTransport($stub))->send($queueMessage);
+
+        self::assertNotNull($stub->getCalls()[0]['MessageDeduplicationId']);
+        self::assertNotNull($stub->getCalls()[0]['MessageGroupId']);
+    }
 }