Added methods UuidValueTrait::fromAggregateId() and `UuidValueTrait…

…::toAggregateId()`
68publishers · Apr 19, 2023 · e0e4f38 · e0e4f38
1 parent e1908b3
commit e0e4f38
Show file tree

Hide file tree

Showing 8 changed files with 21 additions and 13 deletions.
diff --git a/src/ArchitectureBundle/Domain/ValueObject/UuidValueTrait.php b/src/ArchitectureBundle/Domain/ValueObject/UuidValueTrait.php
@@ -23,7 +23,7 @@ public static function new(): static
         return new static(Uuid::uuid4());
     }
 
-    public static function fromUuid(UuidInterface $uuid): self
+    public static function fromUuid(UuidInterface $uuid): static
     {
         return new static($uuid);
     }
@@ -41,6 +41,11 @@ public static function fromNative(mixed $native): static
         }
     }
 
+    public static function fromAggregateId(AggregateId $aggregateId): static
+    {
+        return self::fromUuid($aggregateId->toUuid());
+    }
+
     public static function isValid(mixed $native): bool
     {
         return is_string($native) && Uuid::isValid($native);
@@ -56,6 +61,11 @@ public function toNative(): string
         return $this->value->toString();
     }
 
+    public function toAggregateId(): AggregateId
+    {
+        return AggregateId::fromUuid($this->toUuid());
+    }
+
     public function equals(ValueObjectInterface $object): bool
     {
         return $object instanceof static && $object->toUuid()->equals($this->toUuid());

diff --git a/src/ForgotPasswordBundle/Domain/PasswordRequest.php b/src/ForgotPasswordBundle/Domain/PasswordRequest.php
@@ -123,7 +123,7 @@ public function cancel(CancelPasswordRequestCommand $command): void
 
     public function getAggregateId(): AggregateId
     {
-        return AggregateId::fromUuid($this->id->toUuid());
+        return $this->id->toAggregateId();
     }
 
     public function isExpired(): bool
@@ -140,7 +140,7 @@ public function isExpired(): bool
      */
     protected function whenPasswordChangeRequested(PasswordChangeRequested $event): void
     {
-        $this->id = PasswordRequestId::fromUuid($event->getAggregateId()->toUuid());
+        $this->id = PasswordRequestId::fromAggregateId($event->getAggregateId());
         $this->emailAddress = $event->getEmailAddress();
         $this->status = Status::REQUESTED;
         $this->requestedAt = $event->getCreatedAt();

diff --git a/src/ForgotPasswordBundle/Infrastructure/Doctrine/PasswordRequestRepository.php b/src/ForgotPasswordBundle/Infrastructure/Doctrine/PasswordRequestRepository.php
@@ -4,7 +4,6 @@
 
 namespace SixtyEightPublishers\ForgotPasswordBundle\Infrastructure\Doctrine;
 
-use SixtyEightPublishers\ArchitectureBundle\Domain\ValueObject\AggregateId;
 use SixtyEightPublishers\ArchitectureBundle\Infrastructure\Doctrine\Repository\DoctrineAggregateRootRepositoryInterface;
 use SixtyEightPublishers\ForgotPasswordBundle\Domain\Exception\PasswordRequestNotFoundException;
 use SixtyEightPublishers\ForgotPasswordBundle\Domain\PasswordRequest;
@@ -24,7 +23,7 @@ public function save(PasswordRequest $passwordRequest): void
 
     public function get(PasswordRequestId $id): PasswordRequest
     {
-        $passwordRequest = $this->aggregateRootRepository->loadAggregateRoot(PasswordRequest::class, AggregateId::fromUuid($id->toUuid()));
+        $passwordRequest = $this->aggregateRootRepository->loadAggregateRoot(PasswordRequest::class, $id->toAggregateId());
 
         if (!$passwordRequest instanceof PasswordRequest) {
             throw PasswordRequestNotFoundException::withId($id);

diff --git a/...PasswordBundle/Subscribers/PasswordRequest/CancelPreviousPasswordRequestsEventHandler.php b/...PasswordBundle/Subscribers/PasswordRequest/CancelPreviousPasswordRequestsEventHandler.php
@@ -22,7 +22,7 @@ public function __construct(
 
     public function __invoke(PasswordChangeRequested $event): void
     {
-        $currentId = PasswordRequestId::fromUuid($event->getAggregateId()->toUuid());
+        $currentId = PasswordRequestId::fromAggregateId($event->getAggregateId());
 
         foreach ($this->queryBus->dispatch(new FindIdsOfRequestedPasswordChangesQuery($event->getEmailAddress()->toNative())) as $passwordRequestId) {
             assert($passwordRequestId instanceof PasswordRequestId);

diff --git a/src/MailingBundle/Domain/Mail.php b/src/MailingBundle/Domain/Mail.php
@@ -57,7 +57,7 @@ public static function create(
 
     public function getAggregateId(): AggregateId
     {
-        return AggregateId::fromUuid($this->id->toUuid());
+        return $this->id->toAggregateId();
     }
 
     public function changeCode(string $code, ?CodeGuardInterface $codeGuard = null): void
@@ -94,7 +94,7 @@ public function changeMessageBody(string $messageBody, string $locale): void
 
     protected function whenMailCreated(MailCreated $event): void
     {
-        $this->id = MailId::fromUuid($event->getAggregateId()->toUuid());
+        $this->id = MailId::fromAggregateId($event->getAggregateId());
         $this->code = $event->getCode();
         $this->translations = new ArrayCollection();
 

diff --git a/src/UserBundle/Domain/Exception/UserNotFoundException.php b/src/UserBundle/Domain/Exception/UserNotFoundException.php
@@ -14,7 +14,7 @@ public static function withId(UserId $id): self
     {
         return new self(sprintf(
             'User with the ID %s not found.',
-            $id->toUuid(),
+            $id->toNative(),
         ));
     }
 }
diff --git a/src/UserBundle/Domain/User.php b/src/UserBundle/Domain/User.php
@@ -110,7 +110,7 @@ public static function create(
 
     public function getAggregateId(): AggregateId
     {
-        return AggregateId::fromUuid($this->id->toUuid());
+        return $this->id->toAggregateId();
     }
 
     public function changeUsername(string $username, ?UsernameGuardInterface $usernameGuard = null): void
@@ -227,7 +227,7 @@ public function addAttributes(array $attributes, ?AttributesGuardInterface $attr
 
     protected function whenUserCreated(UserCreated $event): void
     {
-        $this->id = UserId::fromUuid($event->getAggregateId()->toUuid());
+        $this->id = UserId::fromAggregateId($event->getAggregateId());
         $this->createdAt = $event->getCreatedAt();
         $this->username = $event->getUsername();
         $this->password = $event->getPassword();

diff --git a/src/UserBundle/Infrastructure/Doctrine/UserRepository.php b/src/UserBundle/Infrastructure/Doctrine/UserRepository.php
@@ -4,7 +4,6 @@
 
 namespace SixtyEightPublishers\UserBundle\Infrastructure\Doctrine;
 
-use SixtyEightPublishers\ArchitectureBundle\Domain\ValueObject\AggregateId;
 use SixtyEightPublishers\ArchitectureBundle\Infrastructure\Doctrine\Repository\DoctrineAggregateRootRepositoryInterface;
 use SixtyEightPublishers\UserBundle\Domain\Exception\UserNotFoundException;
 use SixtyEightPublishers\UserBundle\Domain\User;
@@ -24,7 +23,7 @@ public function save(User $user): void
 
     public function get(UserId $id): User
     {
-        $user = $this->aggregateRootRepository->loadAggregateRoot(User::class, AggregateId::fromUuid($id->toUuid()));
+        $user = $this->aggregateRootRepository->loadAggregateRoot(User::class, $id->toAggregateId());
 
         if (!$user instanceof User) {
             throw UserNotFoundException::withId($id);