Only inject a message id when there is none (#21)

* only inject a message id when there is none
genkgo · Aug 24, 2017 · 66e63f3 · 66e63f3
1 parent 90efa43
commit 66e63f3
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 5 deletions.
diff --git a/src/Transport/InjectMessageIdHeaderTransport.php b/src/Transport/InjectMessageIdHeaderTransport.php
@@ -35,10 +35,10 @@ public function __construct(TransportInterface $transport, string $domainName)
      */
     public function send(MessageInterface $message): void
     {
-        $this->decoratedTransport->send(
-            $message->withHeader(
-                MessageId::newRandom($this->domainName)
-            )
-        );
+        if (!$message->hasHeader('Message-ID')) {
+            $message = $message->withHeader(MessageId::newRandom($this->domainName));
+        }
+
+        $this->decoratedTransport->send($message);
     }
 }
diff --git a/test/Unit/Transport/InjectMessageIdHeaderTransportTest.php b/test/Unit/Transport/InjectMessageIdHeaderTransportTest.php
@@ -3,6 +3,7 @@
 namespace Genkgo\TestMail\Unit\Transport;
 
 use Genkgo\Mail\Header\MessageId;
+use Genkgo\Mail\HeaderInterface;
 use Genkgo\Mail\Transport\InjectMessageIdHeaderTransport;
 use Genkgo\TestMail\AbstractTestCase;;
 use Genkgo\Mail\GenericMessage;
@@ -29,4 +30,29 @@ public function it_injects_message_id_header_in_message()
         $this->assertInstanceOf(MessageId::class, $storage[0]->getHeader('message-id')[0]);
     }
 
+    /**
+     * @test
+     */
+    public function it_does_not_inject_a_message_id_header_when_there_is_one()
+    {
+        $message = (new GenericMessage())
+            ->withHeader(new MessageId('left', 'right'));
+
+        $storage = new \ArrayObject();
+
+        $transport = new InjectMessageIdHeaderTransport(
+            new ArrayObjectTransport($storage),
+            'domain'
+        );
+        $transport->send($message);
+
+        $this->assertCount(1, $storage);
+        $this->assertTrue($storage[0]->hasHeader('message-id'));
+        $this->assertInstanceOf(MessageId::class, $storage[0]->getHeader('message-id')[0]);
+
+        /** @var HeaderInterface $header */
+        $header = $storage[0]->getHeader('message-id')[0];
+        $this->assertEquals('<left@right>', (string)$header->getValue());
+    }
+
 }