From b3a467172358153e9d2b0125baf0d355bf3dedca Mon Sep 17 00:00:00 2001
From: David Badura <david.badura@patchlevel.de>
Date: Mon, 29 Jul 2024 10:12:15 +0200
Subject: [PATCH] add streamName method into aggregate header

---
 src/Aggregate/AggregateHeader.php                    |  5 +++++
 src/Console/OutputStyle.php                          | 12 +-----------
 .../Translator/RecalculatePlayheadTranslator.php     |  7 +------
 3 files changed, 7 insertions(+), 17 deletions(-)

diff --git a/src/Aggregate/AggregateHeader.php b/src/Aggregate/AggregateHeader.php
index d4e9b515d..9fe5f1ec3 100644
--- 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
index e00faf909..20b44dbee 100644
--- 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
index b9084567f..27185baaa 100644
--- 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);