add streamName method into aggregate header

patchlevel · Jul 29, 2024 · b3a4671 · b3a4671
1 parent 362f1d9
commit b3a4671
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 17 deletions.
diff --git a/src/Aggregate/AggregateHeader.php b/src/Aggregate/AggregateHeader.php
@@ -19,4 +19,9 @@ public function __construct(
         public readonly DateTimeImmutable $recordedOn,
     ) {
     }
+
+    public function streamName(): string
+    {
+        return StreamNameTranslator::streamName($this->aggregateName, $this->aggregateId);
+    }
 }
diff --git a/src/Console/OutputStyle.php b/src/Console/OutputStyle.php
@@ -5,7 +5,6 @@
 namespace Patchlevel\EventSourcing\Console;
 
 use Patchlevel\EventSourcing\Aggregate\AggregateHeader;
-use Patchlevel\EventSourcing\Aggregate\StreamNameTranslator;
 use Patchlevel\EventSourcing\Message\HeaderNotFound;
 use Patchlevel\EventSourcing\Message\Message;
 use Patchlevel\EventSourcing\Message\Serializer\HeadersSerializer;
@@ -71,7 +70,7 @@ public function message(
             ],
             [
                 [
-                    $this->streamName($metaHeader),
+                    $metaHeader instanceof AggregateHeader ? $metaHeader->streamName() : $metaHeader->streamName,
                     $metaHeader->playhead,
                     $metaHeader->recordedOn?->format('Y-m-d H:i:s'),
                     $streamStart ? 'yes' : 'no',
@@ -108,13 +107,4 @@ private function metaHeader(Message $message): AggregateHeader|StreamHeader
             return $message->header(StreamHeader::class);
         }
     }
-
-    private function streamName(AggregateHeader|StreamHeader $header): string
-    {
-        if ($header instanceof AggregateHeader) {
-            return StreamNameTranslator::streamName($header->aggregateName, $header->aggregateId);
-        }
-
-        return $header->streamName;
-    }
 }
diff --git a/src/Message/Translator/RecalculatePlayheadTranslator.php b/src/Message/Translator/RecalculatePlayheadTranslator.php
@@ -5,7 +5,6 @@
 namespace Patchlevel\EventSourcing\Message\Translator;
 
 use Patchlevel\EventSourcing\Aggregate\AggregateHeader;
-use Patchlevel\EventSourcing\Aggregate\StreamNameTranslator;
 use Patchlevel\EventSourcing\Message\HeaderNotFound;
 use Patchlevel\EventSourcing\Message\Message;
 use Patchlevel\EventSourcing\Store\StreamHeader;
@@ -30,11 +29,7 @@ public function __invoke(Message $message): array
             }
         }
 
-        if ($header instanceof StreamHeader) {
-            $stream = $header->streamName;
-        } else {
-            $stream = StreamNameTranslator::streamName($header->aggregateName, $header->aggregateId);
-        }
+        $stream = $header instanceof StreamHeader ? $header->streamName : $header->streamName();
 
         $playhead = $this->nextPlayhead($stream);