[client] Fix SetRouterProeprtiesExtension should skip no topic messages.

makasim · makasim · commit 9c475a6e9659 · 2018-12-20T14:13:19.000+02:00
diff --git a/pkg/enqueue/Client/ConsumptionExtension/SetRouterPropertiesExtension.php b/pkg/enqueue/Client/ConsumptionExtension/SetRouterPropertiesExtension.php
@@ -25,6 +25,9 @@ public function __construct(DriverInterface $driver)
     public function onMessageReceived(MessageReceived $context): void
     {
         $message = $context->getMessage();
+        if (false == $message->getProperty(Config::TOPIC)) {
+            return;
+        }
         if ($message->getProperty(Config::PROCESSOR)) {
             return;
         }
diff --git a/pkg/enqueue/Tests/Client/ConsumptionExtension/SetRouterPropertiesExtensionTest.php b/pkg/enqueue/Tests/Client/ConsumptionExtension/SetRouterPropertiesExtensionTest.php
@@ -49,6 +49,7 @@ public function testShouldSetRouterProcessorPropertyIfNotSetAndOnRouterQueue()
         ;
 
         $message = new NullMessage();
+        $message->setProperty(Config::TOPIC, 'aTopic');
 
         $messageReceived = new MessageReceived(
             $this->createContextMock(),
@@ -64,6 +65,7 @@ public function testShouldSetRouterProcessorPropertyIfNotSetAndOnRouterQueue()
 
         $this->assertEquals([
             Config::PROCESSOR => 'router-processor-name',
+            Config::TOPIC => 'aTopic',
         ], $message->getProperties());
     }
 
@@ -86,6 +88,7 @@ public function testShouldNotSetRouterProcessorPropertyIfNotSetAndNotOnRouterQue
         ;
 
         $message = new NullMessage();
+        $message->setProperty(Config::TOPIC, 'aTopic');
 
         $messageReceived = new MessageReceived(
             $this->createContextMock(),
@@ -99,7 +102,9 @@ public function testShouldNotSetRouterProcessorPropertyIfNotSetAndNotOnRouterQue
         $extension = new SetRouterPropertiesExtension($driver);
         $extension->onMessageReceived($messageReceived);
 
-        $this->assertEquals([], $message->getProperties());
+        $this->assertEquals([
+            Config::TOPIC => 'aTopic',
+        ], $message->getProperties());
     }
 
     public function testShouldNotSetAnyPropertyIfProcessorNamePropertyAlreadySet()
@@ -130,6 +135,31 @@ public function testShouldNotSetAnyPropertyIfProcessorNamePropertyAlreadySet()
         ], $message->getProperties());
     }
 
+    public function testShouldSkipMessagesWithoutTopicPropertySet()
+    {
+        $driver = $this->createDriverMock();
+        $driver
+            ->expects($this->never())
+            ->method('getConfig')
+        ;
+
+        $message = new NullMessage();
+
+        $messageReceived = new MessageReceived(
+            $this->createContextMock(),
+            $this->createConsumerStub(null),
+            $message,
+            $this->createProcessorMock(),
+            1,
+            new NullLogger()
+        );
+
+        $extension = new SetRouterPropertiesExtension($driver);
+        $extension->onMessageReceived($messageReceived);
+
+        $this->assertEquals([], $message->getProperties());
+    }
+
     /**
      * @return \PHPUnit_Framework_MockObject_MockObject|InteropContext
      */

Original file line number	Diff line number	Diff line change
`@@ -25,6 +25,9 @@ public function __construct(DriverInterface $driver)`
`25`	`25`	`public function onMessageReceived(MessageReceived $context): void`
`26`	`26`	`{`
`27`	`27`	`$message = $context->getMessage();`
	`28`	`+ if (false == $message->getProperty(Config::TOPIC)) {`
	`29`	`+ return;`
	`30`	`+ }`
`28`	`31`	`if ($message->getProperty(Config::PROCESSOR)) {`
`29`	`32`	`return;`
`30`	`33`	`}`