Ensure that the DomainMessage recordedOn has microseconds and is always timezone UTC

Author: boekkooi-fresh

src/Domain/DomainMessage.php

@@ -37,12 +37,12 @@ public function __construct($id, $version, $payload, \DateTimeImmutable $recorde
     {
         $this->id = $id;
         $this->payload = $payload;
-        $this->recordedOn = $recordedOn;
+        $this->recordedOn = $recordedOn->setTimezone(new \DateTimeZone('UTC'));
         $this->version = $version;
     }
 
     /**
-     * @return AggregateIdInterface
+     * @return string
      */
     public function getId()
     {
@@ -81,7 +81,9 @@ public function getType()
      */
     public static function recordNow($id, $version, DomainEventInterface $payload)
     {
-        return new DomainMessage($id, $version, $payload, new \DateTimeImmutable('now', new \DateTimeZone('UTC')));
+        $recordedOn = \DateTimeImmutable::createFromFormat('U.u', sprintf('%.6F', microtime(true)));
+
+        return new DomainMessage($id, $version, $payload, $recordedOn);
     }
 
     /**

tests/Domain/DomainMessageTest.php

@@ -25,10 +25,11 @@ public function itShouldCreateAUuidFromConstructor(
     ) {
         $message = new DomainMessage($aggregateId, $version, $payload, $date);
         $this->assertInstanceOf(DomainMessage::class, $message);
-        $this->assertEquals($aggregateId, $message->getId());
-        $this->assertEquals($version, $message->getVersion());
-        $this->assertEquals($payload, $message->getPayload());
+        $this->assertSame($aggregateId, $message->getId());
+        $this->assertSame($version, $message->getVersion());
+        $this->assertSame($payload, $message->getPayload());
         $this->assertEquals($date, $message->getRecordedOn());
+        $this->assertEquals(new \DateTimeZone('UTC'), $message->getRecordedOn()->getTimezone());
     }
 
     /**
@@ -47,14 +48,23 @@ public function itShouldCreateAUuidFromNamedConstructor(
     ) {
         $message = DomainMessage::recordNow($aggregateId, $version, $payload);
         $this->assertInstanceOf(DomainMessage::class, $message);
+
+        $this->assertNotEmpty((int)$message->getRecordedOn()->format('u'), 'Expected microseconds to be set');
+        $this->assertEquals(new \DateTimeZone('UTC'), $message->getRecordedOn()->getTimezone());
     }
 
     public function messageProvider()
     {
         return [
             [AggregateId::generate(), 1, new SomethingHappened(), new \DateTimeImmutable()],
             [AggregateId::generate(), 100, new SomethingHappened(), new \DateTimeImmutable()],
-            [AggregateId::generate(), 9999999, new SomethingHappened(), new \DateTimeImmutable()]
+            [AggregateId::generate(), 9999999, new SomethingHappened(), new \DateTimeImmutable()],
+            [
+                AggregateId::generate(),
+                9999999,
+                new SomethingHappened(),
+                \DateTimeImmutable::createFromFormat('U.u', sprintf('%.6F', microtime(true)))
+            ]
         ];
     }
 }