Merge pull request #630 from patchlevel/fix-child-aggregates-with-snapshots

DanielBadura · web-flow · commit b3cc8061cb8e · 2024-09-18T14:39:36.000+02:00
fix child aggregates with snapshots
diff --git a/composer.json b/composer.json
@@ -22,7 +22,7 @@
     "php": "~8.1.0 || ~8.2.0 || ~8.3.0",
     "doctrine/dbal": "^4.0.0",
     "doctrine/migrations": "^3.3.2",
-    "patchlevel/hydrator": "^1.4.1",
+    "patchlevel/hydrator": "^1.5.0",
     "patchlevel/worker": "^1.2.0",
     "psr/cache": "^2.0.0|^3.0.0",
     "psr/clock": "^1.0",
diff --git a/composer.lock b/composer.lock
diff --git a/src/Aggregate/AggregateRootAttributeBehaviour.php b/src/Aggregate/AggregateRootAttributeBehaviour.php
@@ -5,6 +5,7 @@
 namespace Patchlevel\EventSourcing\Aggregate;
 
 use Patchlevel\Hydrator\Attribute\Ignore;
+use Patchlevel\Hydrator\Attribute\PostHydrate;
 use ReflectionProperty;
 
 use function array_key_exists;
@@ -43,8 +44,6 @@ protected function apply(object $event): void
             return;
         }
 
-        $this->recorder ??= $this->recordThat(...);
-
         $parts = explode('.', $method);
 
         if (count($parts) === 2) {
@@ -57,6 +56,15 @@ protected function apply(object $event): void
             $this->$method($event);
         }
 
+        $this->passRecorderToChildAggregates();
+    }
+
+    #[PostHydrate]
+    private function passRecorderToChildAggregates(): void
+    {
+        $metadata = static::metadata();
+        $this->recorder ??= $this->recordThat(...);
+
         foreach ($metadata->childAggregates as $property) {
             if (!isset($this->{$property})) {
                 continue;
diff --git a/src/Aggregate/BasicChildAggregate.php b/src/Aggregate/BasicChildAggregate.php
@@ -4,7 +4,10 @@
 
 namespace Patchlevel\EventSourcing\Aggregate;
 
+use Patchlevel\Hydrator\Normalizer\ObjectNormalizer;
+
 /** @experimental  */
+#[ObjectNormalizer]
 abstract class BasicChildAggregate implements ChildAggregate
 {
     use ChildAggregateBehaviour;
diff --git a/src/Aggregate/ChildAggregateBehaviour.php b/src/Aggregate/ChildAggregateBehaviour.php
@@ -4,10 +4,13 @@
 
 namespace Patchlevel\EventSourcing\Aggregate;
 
+use Patchlevel\Hydrator\Attribute\Ignore;
+
 /** @experimental  */
 trait ChildAggregateBehaviour
 {
     /** @var callable(object $event): void */
+    #[Ignore]
     private $recorder;
 
     protected function recordThat(object $event): void
diff --git a/tests/Integration/ChildAggregate/ChildAggregateIntegrationTest.php b/tests/Integration/ChildAggregate/ChildAggregateIntegrationTest.php
@@ -146,11 +146,21 @@ public function testSnapshot(): void
         self::assertSame('John', $result['name']);
 
         $repository = $manager->get(Profile::class);
+
+        // create snapshot
+        $repository->load($profileId);
+
+        // load from snapshot
+        $profile = $repository->load($profileId);
+
+        $profile->changeName('Snow');
+        $repository->save($profile);
+
         $profile = $repository->load($profileId);
 
         self::assertInstanceOf(Profile::class, $profile);
         self::assertEquals($profileId, $profile->aggregateRootId());
-        self::assertSame(1, $profile->playhead());
-        self::assertSame('John', $profile->name());
+        self::assertSame(2, $profile->playhead());
+        self::assertSame('Snow', $profile->name());
     }
 }
diff --git a/tests/Integration/ChildAggregate/Profile.php b/tests/Integration/ChildAggregate/Profile.php
@@ -13,7 +13,7 @@
 use Patchlevel\EventSourcing\Tests\Integration\ChildAggregate\Events\ProfileCreated;
 
 #[Aggregate('profile')]
-#[Snapshot('default', 100)]
+#[Snapshot('default', 1)]
 final class Profile extends BasicAggregateRoot
 {
     #[Id]

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,10 @@`
`4`	`4`
`5`	`5`	`namespace Patchlevel\EventSourcing\Aggregate;`
`6`	`6`
	`7`	`+use Patchlevel\Hydrator\Normalizer\ObjectNormalizer;`
	`8`	`+`
`7`	`9`	`/** @experimental */`
	`10`	`+#[ObjectNormalizer]`
`8`	`11`	`abstract class BasicChildAggregate implements ChildAggregate`
`9`	`12`	`{`
`10`	`13`	`use ChildAggregateBehaviour;`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@`
`13`	`13`	`use Patchlevel\EventSourcing\Tests\Integration\ChildAggregate\Events\ProfileCreated;`
`14`	`14`
`15`	`15`	`#[Aggregate('profile')]`
`16`		`-#[Snapshot('default', 100)]`
	`16`	`+#[Snapshot('default', 1)]`
`17`	`17`	`final class Profile extends BasicAggregateRoot`
`18`	`18`	`{`
`19`	`19`	`#[Id]`