Merge pull request #22 from run-as-root/develop

Improves the retry limit query

Author: cristiano-pacheco

Diff for: composer.json

@@ -3,7 +3,7 @@
     "description": "Provides message queue retry processing functionality via RabbitMQ's dead letter exchange.",
     "type": "magento2-module",
     "license": "MIT",
-    "version": "2.0.0",
+    "version": "2.0.1",
     "authors": [
         {
             "name": "Cristiano Pacheco",

Diff for: composer.lock

@@ -15,14 +15,20 @@ public function __construct(private DataInterface $configStorage)
 
     public function execute(string $topicName): ?int
     {
-        $configKey = QueueRetryConfigInterface::CONFIG_KEY_NAME . '/' . $topicName;
-        $queueRetryTopic = $this->configStorage->get($configKey);
+        $topics = $this->configStorage->get(QueueRetryConfigInterface::CONFIG_KEY_NAME);
+
+        if (!$topics) {
+            return null;
+        }
+
+        $queueRetryTopic = $topics[$topicName] ??  null;
 
         if (!$queueRetryTopic) {
             return null;
         }
 
-        $retryLimitKey = QueueRetryConfigInterface::RETRY_LIMIT;
-        return isset($queueRetryTopic[$retryLimitKey]) ? (int)$queueRetryTopic[$retryLimitKey] : null;
+        $retryLimit = $queueRetryTopic[QueueRetryConfigInterface::RETRY_LIMIT] ?? null;
+
+        return $retryLimit ? (int)$retryLimit : null;
     }
 }

Diff for: src/Repository/Query/FindQueueRetryLimitByTopicNameQuery.php

@@ -24,7 +24,7 @@ protected function setUp(): void
      */
     public function testExecute($expected, $topicName, $config): void
     {
-        $configKey = QueueRetryConfigInterface::CONFIG_KEY_NAME . '/' . $topicName;
+        $configKey = QueueRetryConfigInterface::CONFIG_KEY_NAME;
         $this->configStorageMock->expects($this->once())->method('get')->with($configKey)->willReturn($config);
 
         $result = $this->sut->execute($topicName);
@@ -35,9 +35,36 @@ public function testExecute($expected, $topicName, $config): void
     public function dataProvider(): array
     {
         return [
-            [3, 'sample_topic', ['retry_limit' => '3']],
-            [null, 'sample_topic', ['some_key' => '3']],
-            [null, 'sample_topic', null],
+            [
+                5,
+                'sample_topic',
+                [
+                    'sample_topic' => ['retry_limit' => '5'],
+                    'sample_topic2' => ['retry_limit' => '3'],
+                    'sample_topic3' => ['retry_limit' => '8']
+                ],
+            ],
+            [
+                3,
+                'sample_topic2',
+                [
+                    'sample_topic' => ['retry_limit' => '5'],
+                    'sample_topic2' => ['retry_limit' => '3'],
+                    'sample_topic3' => ['retry_limit' => '8']
+                ],
+            ],
+            [
+                null,
+                'sample_topic2',
+                [
+                    'sample_topic' => ['retry_limit' => '5'],
+                ],
+            ],
+            [
+                null,
+                'sample_topic2',
+                null,
+            ],
         ];
     }
 }