Merge pull request #782 from patchlevel/recorded-on-resolver-with-recorded-on-header

The `RecordedOnArgumentResolver` can now also handle message with `RecordedOnHeader`

Author: DanielBadura

src/Subscription/Subscriber/ArgumentResolver/RecordedOnArgumentResolver.php

@@ -8,11 +8,16 @@
 use Patchlevel\EventSourcing\Aggregate\AggregateHeader;
 use Patchlevel\EventSourcing\Message\Message;
 use Patchlevel\EventSourcing\Metadata\Subscriber\ArgumentMetadata;
+use Patchlevel\EventSourcing\Store\Header\RecordedOnHeader;
 
 final class RecordedOnArgumentResolver implements ArgumentResolver
 {
     public function resolve(ArgumentMetadata $argument, Message $message): DateTimeImmutable
     {
+        if ($message->hasHeader(RecordedOnHeader::class)) {
+            return $message->header(RecordedOnHeader::class)->recordedOn;
+        }
+
         return $message->header(AggregateHeader::class)->recordedOn;
     }
 

tests/Unit/Subscription/Subscriber/ArgumentResolver/RecordedOnArgumentResolverTest.php

@@ -8,6 +8,7 @@
 use Patchlevel\EventSourcing\Aggregate\AggregateHeader;
 use Patchlevel\EventSourcing\Message\Message;
 use Patchlevel\EventSourcing\Metadata\Subscriber\ArgumentMetadata;
+use Patchlevel\EventSourcing\Store\Header\RecordedOnHeader;
 use Patchlevel\EventSourcing\Subscription\Subscriber\ArgumentResolver\RecordedOnArgumentResolver;
 use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
@@ -35,7 +36,7 @@ public function testSupport(): void
         );
     }
 
-    public function testResolve(): void
+    public function testResolveFromAggregateHeader(): void
     {
         $date = new DateTimeImmutable();
 
@@ -57,4 +58,20 @@ public function testResolve(): void
             ),
         );
     }
+
+    public function testResolveFromRecordedOnHeader(): void
+    {
+        $date = new DateTimeImmutable();
+
+        $resolver = new RecordedOnArgumentResolver();
+        $message = (new Message(new stdClass()))->withHeader(new RecordedOnHeader($date));
+
+        self::assertSame(
+            $date,
+            $resolver->resolve(
+                new ArgumentMetadata('foo', DateTimeImmutable::class),
+                $message,
+            ),
+        );
+    }
 }