Replaced MongodbMessage::fromArrrayDbResult() with MongodbContext::convertMessage()

Author: rosamarsky

MongodbConsumer.php

@@ -137,7 +137,7 @@ private function receiveMessage(): ?MongodbMessage
             return null;
         }
         if (empty($message['time_to_live']) || $message['time_to_live'] > time()) {
-            return MongodbMessage::fromArrayDbResult($message);
+            return $this->context->convertMessage($message);
         }
 
         return null;

MongodbContext.php

@@ -109,6 +109,25 @@ public function createSubscriptionConsumer(): SubscriptionConsumer
         return new MongodbSubscriptionConsumer($this);
     }
 
+    /**
+     * @internal It must be used here and in the consumer only
+     */
+    public function convertMessage(array $mongodbMessage): MongodbMessage
+    {
+        $mongodbMessageObj = new MongodbMessage(
+            $mongodbMessage['body'],
+            JSON::decode($mongodbMessage['properties']),
+            JSON::decode($mongodbMessage['headers'])
+        );
+
+        $mongodbMessageObj->setId((string) $mongodbMessage['_id']);
+        $mongodbMessageObj->setPriority((int) $mongodbMessage['priority']);
+        $mongodbMessageObj->setRedelivered((bool) $mongodbMessage['redelivered']);
+        $mongodbMessageObj->setPublishedAt((int) $mongodbMessage['published_at']);
+
+        return $mongodbMessageObj;
+    }
+
     /**
      * @param MongodbDestination $queue
      */

MongodbMessage.php

@@ -65,22 +65,6 @@ public function __construct(string $body = '', array $properties = [], array $he
         $this->redelivered = false;
     }
 
-    public static function fromArrayDbResult(array $arrayResult): self
-    {
-        $message = new self(
-            $arrayResult['body'],
-            JSON::decode($arrayResult['properties']),
-            JSON::decode($arrayResult['headers'])
-        );
-
-        $message->setId((string) $arrayResult['_id']);
-        $message->setPriority((int) $arrayResult['priority']);
-        $message->setRedelivered((bool) $arrayResult['redelivered']);
-        $message->setPublishedAt((int) $arrayResult['published_at']);
-
-        return $message;
-    }
-
     public function setId(string $id = null): void
     {
         $this->id = $id;

MongodbSubscriptionConsumer.php

@@ -67,7 +67,7 @@ public function consume(int $timeout = 0): void
             if ($result) {
                 list($consumer, $callback) = $this->subscribers[$result['queue']];
 
-                $message = MongodbMessage::fromArrayDbResult($result);
+                $message = $this->context->convertMessage($result);
 
                 if (false === call_user_func($callback, $message, $consumer)) {
                     return;

Tests/MongodbContextTest.php

@@ -70,6 +70,32 @@ public function testShouldCreateMessage()
         $this->assertFalse($message->isRedelivered());
     }
 
+    public function testShouldConvertFromArrayToMongodbMessage()
+    {
+        $arrayData = [
+            '_id' => 'stringId',
+            'body' => 'theBody',
+            'properties' => json_encode(['barProp' => 'barPropVal']),
+            'headers' => json_encode(['fooHeader' => 'fooHeaderVal']),
+            'priority' => '12',
+            'published_at' => 1525935820,
+            'redelivered' => false,
+        ];
+
+        $context = new MongodbContext($this->createClientMock());
+        $message = $context->convertMessage($arrayData);
+
+        $this->assertInstanceOf(MongodbMessage::class, $message);
+
+        $this->assertEquals('stringId', $message->getId());
+        $this->assertEquals('theBody', $message->getBody());
+        $this->assertEquals(['barProp' => 'barPropVal'], $message->getProperties());
+        $this->assertEquals(['fooHeader' => 'fooHeaderVal'], $message->getHeaders());
+        $this->assertEquals(12, $message->getPriority());
+        $this->assertEquals(1525935820, $message->getPublishedAt());
+        $this->assertFalse($message->isRedelivered());
+    }
+
     public function testShouldCreateTopic()
     {
         $context = new MongodbContext($this->createClientMock());