poc replace child aggregates with micro aggregates

src/Aggregate/StreamNameTranslator.php

@@ -4,6 +4,9 @@
 
 namespace Patchlevel\EventSourcing\Aggregate;
 
+use Patchlevel\EventSourcing\Metadata\AggregateRoot\AggregateRootMetadata;
+
+use function str_replace;
 use function strpos;
 use function substr;
 
@@ -15,20 +18,13 @@ private function __construct()
     }
 
     /** @pure */
-    public static function streamName(string $aggregate, string $aggregateId): string
-    {
-        return $aggregate . '-' . $aggregateId;
-    }
-
-    public static function aggregateName(string $stream): string
+    public static function streamName(string|AggregateRootMetadata $aggregate, string $aggregateId): string
     {
-        $pos = strpos($stream, '-');
-
-        if ($pos === false) {
-            throw new InvalidAggregateStreamName($stream);
+        if ($aggregate instanceof AggregateRootMetadata && $aggregate->streamName !== null) {
+            return str_replace('{id}', $aggregateId, $aggregate->streamName);
         }
 
-        return substr($stream, 0, $pos);
+        return $aggregate . '-' . $aggregateId;
     }
 
     public static function aggregateId(string $stream): string

src/Attribute/Stream.php

@@ -0,0 +1,18 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Patchlevel\EventSourcing\Attribute;
+
+use Attribute;
+use Patchlevel\EventSourcing\Aggregate\AggregateRoot;
+
+#[Attribute(Attribute::TARGET_CLASS)]
+final class Stream
+{
+    /** @param string|class-string<AggregateRoot> $name */
+    public function __construct(
+        public readonly string $name,
+    ) {
+    }
+}

src/Metadata/AggregateRoot/AggregateRootMetadata.php

@@ -22,6 +22,7 @@ public function __construct(
         public readonly Snapshot|null $snapshot,
         /** @var list<string> */
         public readonly array $childAggregates = [],
+        public readonly string|null $streamName = null,
     ) {
     }
 }

src/Metadata/AggregateRoot/AttributeAggregateRootMetadataFactory.php

@@ -10,6 +10,7 @@
 use Patchlevel\EventSourcing\Attribute\ChildAggregate;
 use Patchlevel\EventSourcing\Attribute\Id;
 use Patchlevel\EventSourcing\Attribute\Snapshot as AttributeSnapshot;
+use Patchlevel\EventSourcing\Attribute\Stream;
 use Patchlevel\EventSourcing\Attribute\SuppressMissingApply;
 use ReflectionClass;
 use ReflectionIntersectionType;
@@ -50,6 +51,7 @@ public function metadata(string $aggregate): AggregateRootMetadata
         [$suppressEvents, $suppressAll] = $this->findSuppressMissingApply($reflectionClass);
         $applyMethods = $this->findApplyMethods($reflectionClass, $aggregate, $childAggregates);
         $snapshot = $this->findSnapshot($reflectionClass);
+        $streamName = $this->findStreamName($reflectionClass);
 
         $metadata = new AggregateRootMetadata(
             $aggregate,
@@ -60,6 +62,7 @@ public function metadata(string $aggregate): AggregateRootMetadata
             $suppressAll,
             $snapshot,
             array_map(static fn (array $list) => $list[0], $childAggregates),
+            $streamName ?? $aggregateName . '-{id}',
         );
 
         $this->aggregateMetadata[$aggregate] = $metadata;
@@ -139,6 +142,23 @@ private function findSnapshot(ReflectionClass $reflector): Snapshot|null
         );
     }
 
+    private function findStreamName(ReflectionClass $reflector): string|null
+    {
+        $attributes = $reflector->getAttributes(Stream::class);
+
+        if ($attributes === []) {
+            return null;
+        }
+
+        $streamName = $attributes[0]->newInstance()->name;
+
+        if (class_exists($streamName) && is_a($streamName, AggregateRoot::class, true)) {
+            return $this->metadata($streamName)->streamName;
+        }
+
+        return $attributes[0]->newInstance()->name;
+    }
+
     /** @return list<array{string, ReflectionClass}> */
     private function findChildAggregates(ReflectionClass $reflector): array
     {

src/Repository/DefaultRepository.php

@@ -113,7 +113,7 @@ public function load(AggregateRootId $id): AggregateRoot
 
         if ($this->useStreamHeader) {
             $criteria = (new CriteriaBuilder())
-                ->streamName(StreamNameTranslator::streamName($this->metadata->name, $id->toString()))
+                ->streamName(StreamNameTranslator::streamName($this->metadata, $id->toString()))
                 ->archived(false)
                 ->build();
         } else {
@@ -178,7 +178,7 @@ public function has(AggregateRootId $id): bool
     {
         if ($this->useStreamHeader) {
             $criteria = (new CriteriaBuilder())
-                ->streamName(StreamNameTranslator::streamName($this->metadata->name, $id->toString()))
+                ->streamName(StreamNameTranslator::streamName($this->metadata, $id->toString()))
                 ->build();
         } else {
             $criteria = (new CriteriaBuilder())
@@ -242,8 +242,7 @@ public function save(AggregateRoot $aggregate): void
             $clock = $this->clock;
 
             $aggregateName = $this->metadata->name;
-
-            $streamName = $this->useStreamHeader ? StreamNameTranslator::streamName($aggregateName, $aggregateId) : null;
+            $streamName = $this->useStreamHeader ? StreamNameTranslator::streamName($this->metadata, $aggregateId) : null;
 
             $messages = array_map(
                 static function (object $event) use (
@@ -338,7 +337,7 @@ private function loadFromSnapshot(string $aggregateClass, AggregateRootId $id):
 
         if ($this->useStreamHeader) {
             $criteria = (new CriteriaBuilder())
-                ->streamName(StreamNameTranslator::streamName($this->metadata->name, $id->toString()))
+                ->streamName(StreamNameTranslator::streamName($this->metadata, $id->toString()))
                 ->fromPlayhead($aggregate->playhead())
                 ->build();
         } else {

tests/Integration/ChildAggregate/ChildAggregateIntegrationTest.php

@@ -11,7 +11,7 @@
 use Patchlevel\EventSourcing\Serializer\DefaultEventSerializer;
 use Patchlevel\EventSourcing\Snapshot\Adapter\InMemorySnapshotAdapter;
 use Patchlevel\EventSourcing\Snapshot\DefaultSnapshotStore;
-use Patchlevel\EventSourcing\Store\DoctrineDbalStore;
+use Patchlevel\EventSourcing\Store\StreamDoctrineDbalStore;
 use Patchlevel\EventSourcing\Subscription\Engine\DefaultSubscriptionEngine;
 use Patchlevel\EventSourcing\Subscription\Engine\ThrowOnErrorSubscriptionEngine;
 use Patchlevel\EventSourcing\Subscription\Repository\RunSubscriptionEngineRepositoryManager;
@@ -39,7 +39,7 @@ public function tearDown(): void
 
     public function testSuccessful(): void
     {
-        $store = new DoctrineDbalStore(
+        $store = new StreamDoctrineDbalStore(
             $this->connection,
             DefaultEventSerializer::createFromPaths([__DIR__ . '/Events']),
         );
@@ -54,15 +54,19 @@ public function testSuccessful(): void
 
         $manager = new RunSubscriptionEngineRepositoryManager(
             new DefaultRepositoryManager(
-                new AggregateRootRegistry(['profile' => Profile::class]),
+                new AggregateRootRegistry([
+                    'profile' => Profile::class,
+                    'personal_information' => PersonalInformation::class,
+                ]),
                 $store,
                 null,
                 null,
             ),
             $engine,
         );
 
-        $repository = $manager->get(Profile::class);
+        $profileRepository = $manager->get(Profile::class);
+        $personalInformationRepository = $manager->get(PersonalInformation::class);
 
         $schemaDirector = new DoctrineSchemaDirector(
             $this->connection,
@@ -74,8 +78,11 @@ public function testSuccessful(): void
 
         $profileId = ProfileId::generate();
         $profile = Profile::create($profileId, 'John');
-        $profile->changeName('Snow');
-        $repository->save($profile);
+        $profileRepository->save($profile);
+
+        $personalInformation = $personalInformationRepository->load($profileId);
+        $personalInformation->changeName('Snow');
+        $personalInformationRepository->save($personalInformation);
 
         $result = $this->connection->fetchAssociative(
             'SELECT * FROM projection_profile WHERE id = ?',
@@ -87,18 +94,18 @@ public function testSuccessful(): void
         self::assertSame($profileId->toString(), $result['id']);
         self::assertSame('Snow', $result['name']);
 
-        $repository = $manager->get(Profile::class);
-        $profile = $repository->load($profileId);
+        $profile = $profileRepository->load($profileId);
+        $personalInformation = $personalInformationRepository->load($profileId);
 
         self::assertInstanceOf(Profile::class, $profile);
         self::assertEquals($profileId, $profile->aggregateRootId());
         self::assertSame(2, $profile->playhead());
-        self::assertSame('Snow', $profile->name());
+        self::assertSame('Snow', $personalInformation->name());
     }
 
     public function testSnapshot(): void
     {
-        $store = new DoctrineDbalStore(
+        $store = new StreamDoctrineDbalStore(
             $this->connection,
             DefaultEventSerializer::createFromPaths([__DIR__ . '/Events']),
         );
@@ -113,15 +120,19 @@ public function testSnapshot(): void
 
         $manager = new RunSubscriptionEngineRepositoryManager(
             new DefaultRepositoryManager(
-                new AggregateRootRegistry(['profile' => Profile::class]),
+                new AggregateRootRegistry([
+                    'profile' => Profile::class,
+                    'personal_information' => PersonalInformation::class,
+                ]),
                 $store,
                 null,
                 new DefaultSnapshotStore(['default' => new InMemorySnapshotAdapter()]),
             ),
             $engine,
         );
 
-        $repository = $manager->get(Profile::class);
+        $profileRepository = $manager->get(Profile::class);
+        $personalInformationRepository = $manager->get(PersonalInformation::class);
 
         $schemaDirector = new DoctrineSchemaDirector(
             $this->connection,
@@ -133,7 +144,7 @@ public function testSnapshot(): void
 
         $profileId = ProfileId::generate();
         $profile = Profile::create($profileId, 'John');
-        $repository->save($profile);
+        $profileRepository->save($profile);
 
         $result = $this->connection->fetchAssociative(
             'SELECT * FROM projection_profile WHERE id = ?',
@@ -145,22 +156,22 @@ public function testSnapshot(): void
         self::assertSame($profileId->toString(), $result['id']);
         self::assertSame('John', $result['name']);
 
-        $repository = $manager->get(Profile::class);
-
         // create snapshot
-        $repository->load($profileId);
+        $profileRepository->load($profileId);
+        $personalInformationRepository->load($profileId);
 
         // load from snapshot
-        $profile = $repository->load($profileId);
+        $personalInformation = $personalInformationRepository->load($profileId);
 
-        $profile->changeName('Snow');
-        $repository->save($profile);
+        $personalInformation->changeName('Snow');
+        $personalInformationRepository->save($personalInformation);
 
-        $profile = $repository->load($profileId);
+        $profile = $profileRepository->load($profileId);
+        $personalInformation = $personalInformationRepository->load($profileId);
 
         self::assertInstanceOf(Profile::class, $profile);
         self::assertEquals($profileId, $profile->aggregateRootId());
         self::assertSame(2, $profile->playhead());
-        self::assertSame('Snow', $profile->name());
+        self::assertSame('Snow', $personalInformation->name());
     }
 }

tests/Integration/ChildAggregate/PersonalInformation.php

@@ -4,19 +4,32 @@
 
 namespace Patchlevel\EventSourcing\Tests\Integration\ChildAggregate;
 
-use Patchlevel\EventSourcing\Aggregate\BasicChildAggregate;
+use Patchlevel\EventSourcing\Aggregate\BasicAggregateRoot;
+use Patchlevel\EventSourcing\Attribute\Aggregate;
 use Patchlevel\EventSourcing\Attribute\Apply;
+use Patchlevel\EventSourcing\Attribute\Id;
+use Patchlevel\EventSourcing\Attribute\Stream;
 use Patchlevel\EventSourcing\Tests\Integration\ChildAggregate\Events\NameChanged;
+use Patchlevel\EventSourcing\Tests\Integration\ChildAggregate\Events\ProfileCreated;
 
-final class PersonalInformation extends BasicChildAggregate
+#[Aggregate('personal_information')]
+#[Stream(Profile::class)]
+final class PersonalInformation extends BasicAggregateRoot
 {
-    public function __construct(
-        private string $name,
-    ) {
+    #[Id]
+    private ProfileId $id;
+
+    private string $name;
+
+    #[Apply(ProfileCreated::class)]
+    protected function applyProfileCreated(ProfileCreated $event): void
+    {
+        $this->id = $event->profileId;
+        $this->name = $event->name;
     }
 
     #[Apply(NameChanged::class)]
-    public function applyNameChanged(NameChanged $event): void
+    protected function applyNameChanged(NameChanged $event): void
     {
         $this->name = $event->name;
     }

tests/Integration/ChildAggregate/Profile.php

@@ -7,21 +7,20 @@
 use Patchlevel\EventSourcing\Aggregate\BasicAggregateRoot;
 use Patchlevel\EventSourcing\Attribute\Aggregate;
 use Patchlevel\EventSourcing\Attribute\Apply;
-use Patchlevel\EventSourcing\Attribute\ChildAggregate;
 use Patchlevel\EventSourcing\Attribute\Id;
 use Patchlevel\EventSourcing\Attribute\Snapshot;
+use Patchlevel\EventSourcing\Attribute\SuppressMissingApply;
+use Patchlevel\EventSourcing\Tests\Integration\ChildAggregate\Events\NameChanged;
 use Patchlevel\EventSourcing\Tests\Integration\ChildAggregate\Events\ProfileCreated;
 
 #[Aggregate('profile')]
 #[Snapshot('default', 1)]
+#[SuppressMissingApply([NameChanged::class])]
 final class Profile extends BasicAggregateRoot
 {
     #[Id]
     private ProfileId $id;
 
-    #[ChildAggregate]
-    protected PersonalInformation $personalInformation;
-
     public static function create(ProfileId $id, string $name): self
     {
         $self = new self();
@@ -34,16 +33,5 @@ public static function create(ProfileId $id, string $name): self
     protected function applyProfileCreated(ProfileCreated $event): void
     {
         $this->id = $event->profileId;
-        $this->personalInformation = new PersonalInformation($event->name);
-    }
-
-    public function name(): string
-    {
-        return $this->personalInformation->name();
-    }
-
-    public function changeName(string $name): void
-    {
-        $this->personalInformation->changeName($name);
     }
 }