Merge branch 'improve-sqs-message-content' of github.com:BenoitLeveque/enqueue-dev into improve-sqs-message-content

Author: Benoît Lévêque

pkg/sqs/SqsConsumer.php

@@ -207,6 +207,8 @@ protected function convertMessage(array $sqsMessage): SqsMessage
             $message->setProperties($headers[1]);
         }
 
+        $message->setMessageId($sqsMessage['MessageId']);
+
         return $message;
     }
 }

pkg/sqs/Tests/SqsConsumerTest.php

@@ -293,6 +293,7 @@ public function testShouldReceiveMessage()
         $expectedSqsMessage = [
             'Body' => 'The Body',
             'ReceiptHandle' => 'The Receipt',
+            'MessageId' => 'theMessageId',
             'Attributes' => [
                 'SenderId' => 'AROAX5IAWYILCTYIS3OZ5:foo@bar.com',
                 'ApproximateFirstReceiveTimestamp' => '1560512269481',
@@ -337,7 +338,7 @@ public function testShouldReceiveMessage()
 
         $this->assertInstanceOf(SqsMessage::class, $result);
         $this->assertEquals('The Body', $result->getBody());
-        $this->assertEquals(['hkey' => 'hvalue'], $result->getHeaders());
+        $this->assertEquals(['hkey' => 'hvalue', 'message_id' => 'theMessageId'], $result->getHeaders());
         $this->assertEquals(['key' => 'value'], $result->getProperties());
         $this->assertEquals([
             'SenderId' => 'AROAX5IAWYILCTYIS3OZ5:foo@bar.com',
@@ -347,6 +348,7 @@ public function testShouldReceiveMessage()
         ], $result->getAttributes());
         $this->assertTrue($result->isRedelivered());
         $this->assertEquals('The Receipt', $result->getReceiptHandle());
+        $this->assertEquals('theMessageId', $result->getMessageId());
     }
 
     public function testShouldReceiveMessageWithCustomRegion()
@@ -368,6 +370,7 @@ public function testShouldReceiveMessageWithCustomRegion()
             ->willReturn(new Result(['Messages' => [[
                 'Body' => 'The Body',
                 'ReceiptHandle' => 'The Receipt',
+                'MessageId' => 'theMessageId',
                 'Attributes' => [
                     'ApproximateReceiveCount' => 3,
                 ],