feat: separates uuid v4 and v6 logic

matiux · Oct 6, 2022 · d0a05a8 · d0a05a8
1 parent 2b62723
commit d0a05a8
Show file tree

Hide file tree

Showing 5 changed files with 40 additions and 14 deletions.
diff --git a/src/Matiux/DDDStarterPack/Aggregate/Domain/UuidEntityId.php b/src/Matiux/DDDStarterPack/Aggregate/Domain/UuidEntityId.php
@@ -11,9 +11,11 @@
 /**
  * @extends  BasicEntityId<string>
  */
-class UuidEntityId extends BasicEntityId
+abstract class UuidEntityId extends BasicEntityId
 {
-    public const UUID_PATTERN = '/^[0-9a-f]{8}-[0-9a-f]{4}-4[0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/';
+    // public const UUID_PATTERN = '/^[0-9a-f]{8}-[0-9a-f]{4}-4[0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/';
+    // See https://github.com/ramsey/uuid/blob/4.x/src/Validator/GenericValidator.php#L32
+    public const UUID_PATTERN = '/\A[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-[0-9A-Fa-f]{4}-[0-9A-Fa-f]{4}-[0-9A-Fa-f]{12}\z/';
 
     public function __toString(): string
     {
@@ -25,10 +27,7 @@ public function __toString(): string
      *
      * @return static
      */
-    public static function create(): static
-    {
-        return new static(Uuid::uuid4()->toString());
-    }
+    abstract public static function create(): static;
 
     /**
      * @param string $id

diff --git a/src/Matiux/DDDStarterPack/Aggregate/Domain/UuidV4EntityId.php b/src/Matiux/DDDStarterPack/Aggregate/Domain/UuidV4EntityId.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace DDDStarterPack\Aggregate\Domain;
+
+use Ramsey\Uuid\Uuid;
+
+class UuidV4EntityId extends UuidEntityId
+{
+    public static function create(): static
+    {
+        return new static(Uuid::uuid4()->toString());
+    }
+}
diff --git a/src/Matiux/DDDStarterPack/Aggregate/Domain/UuidV6EntityId.php b/src/Matiux/DDDStarterPack/Aggregate/Domain/UuidV6EntityId.php
@@ -0,0 +1,14 @@
+<?php
+
+namespace DDDStarterPack\Aggregate\Domain;
+
+use Ramsey\Uuid\Uuid;
+
+class UuidV6EntityId extends UuidEntityId
+{
+
+    public static function create(): static
+    {
+        return new static(Uuid::uuid6()->toString());
+    }
+}
diff --git a/tests/Support/Model/PersonId.php b/tests/Support/Model/PersonId.php
@@ -4,8 +4,8 @@
 
 namespace Tests\Support\Model;
 
-use DDDStarterPack\Aggregate\Domain\UuidEntityId;
+use DDDStarterPack\Aggregate\Domain\UuidV4EntityId;
 
-class PersonId extends UuidEntityId
+class PersonId extends UuidV4EntityId
 {
 }
diff --git a/tests/Unit/DDDStarterPack/Aggregate/Domain/UuidEntityIdTest.php b/tests/Unit/DDDStarterPack/Aggregate/Domain/UuidEntityIdTest.php
@@ -4,7 +4,7 @@
 
 namespace Tests\Unit\DDDStarterPack\Aggregate\Domain;
 
-use DDDStarterPack\Aggregate\Domain\UuidEntityId;
+use DDDStarterPack\Aggregate\Domain\UuidV4EntityId;
 use InvalidArgumentException;
 use PHPUnit\Framework\TestCase;
 
@@ -15,15 +15,15 @@ class UuidEntityIdTest extends TestCase
      */
     public function create_randomic_uuid(): void
     {
-        self::assertMatchesRegularExpression(UuidEntityId::UUID_PATTERN, (string) UuidEntityId::create());
+        self::assertMatchesRegularExpression(UuidV4EntityId::UUID_PATTERN, (string) UuidV4EntityId::create());
     }
 
     /**
      * @test
      */
     public function create_specific_uuid(): void
     {
-        $myId = UuidEntityId::createFrom('79fe4c6b-87f6-4093-98f9-ce6a193ab2a5');
+        $myId = UuidV4EntityId::createFrom('79fe4c6b-87f6-4093-98f9-ce6a193ab2a5');
 
         self::assertEquals('79fe4c6b-87f6-4093-98f9-ce6a193ab2a5', $myId->id());
         self::assertIsString($myId->id());
@@ -47,15 +47,15 @@ public function it_should_throw_exception_if_input_id_is_invalid(): void
     {
         self::expectException(InvalidArgumentException::class);
 
-        UuidEntityId::createFrom('');
+        UuidV4EntityId::createFrom('');
     }
 
     /**
      * @test
      */
     public function is_should_verify_if_id_is_in_uuid_v4_format(): void
     {
-        self::assertTrue(UuidEntityId::isValidUuid('79fe4c6b-87f6-4093-98f9-ce6a193ab2a5'));
-        self::assertFalse(UuidEntityId::isValidUuid('12345'));
+        self::assertTrue(UuidV4EntityId::isValidUuid('79fe4c6b-87f6-4093-98f9-ce6a193ab2a5'));
+        self::assertFalse(UuidV4EntityId::isValidUuid('12345'));
     }
 }