uuidv7 and reuse pattern

Author: dominikzogg

src/Pet/Model/Pet.php

@@ -28,7 +28,7 @@ final class Pet implements ModelInterface
 
     public function __construct()
     {
-        $this->id = Uuid::uuid4()->toString();
+        $this->id = Uuid::uuid7()->toString();
         $this->createdAt = new \DateTimeImmutable();
         $this->vaccinations = new ArrayCollection();
     }

tests/Helper/PatternHelper.php

@@ -0,0 +1,11 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Tests\Helper;
+
+final class PatternHelper
+{
+    public const string DATE_PATTERN = '/^\d{4}-\d{2}-\d{2}T\d{2}\:\d{2}\:\d{2}\+\d{2}\:\d{2}$/';
+    public const string UUID_PATTERN = '/^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/i';
+}

tests/Integration/AbstractIntegrationTestCase.php

@@ -14,9 +14,6 @@ abstract class AbstractIntegrationTestCase extends TestCase
      */
     public const DEFAULT_INTEGRATION_ENDPOINT = 'http://localhost:%d';
 
-    public const DATE_PATTERN = '/^\d{4}-\d{2}-\d{2}T\d{2}\:\d{2}\:\d{2}\+\d{2}\:\d{2}$/';
-    public const UUID_PATTERN = '/^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/';
-
     private ?\CurlHandle $curl = null;
 
     /**

tests/Integration/Pet/PetCrudRequestHandlerTest.php

@@ -4,6 +4,7 @@
 
 namespace App\Tests\Integration\Pet;
 
+use App\Tests\Helper\PatternHelper;
 use App\Tests\Integration\AbstractIntegrationTestCase;
 
 /**
@@ -569,11 +570,11 @@ private static function assertPet(array $pet, array $expectedPet, bool $updated)
         self::assertArrayHasKey('delete', $pet['_links']);
         self::assertArrayHasKey('_type', $pet);
 
-        self::assertMatchesRegularExpression(self::UUID_PATTERN, $pet['id']);
-        self::assertMatchesRegularExpression(self::DATE_PATTERN, $pet['createdAt']);
+        self::assertMatchesRegularExpression(PatternHelper::UUID_PATTERN, $pet['id']);
+        self::assertMatchesRegularExpression(PatternHelper::DATE_PATTERN, $pet['createdAt']);
 
         if ($updated) {
-            self::assertMatchesRegularExpression(self::DATE_PATTERN, $pet['updatedAt']);
+            self::assertMatchesRegularExpression(PatternHelper::DATE_PATTERN, $pet['updatedAt']);
         } else {
             self::assertNull($pet['updatedAt']);
         }

tests/Unit/Pet/Dto/Model/PetRequestTest.php

@@ -7,6 +7,7 @@
 use App\Pet\Dto\Model\PetRequest;
 use App\Pet\Dto\Model\VaccinationRequest;
 use App\Pet\Model\Pet;
+use App\Tests\Helper\PatternHelper;
 use PHPUnit\Framework\TestCase;
 
 /**
@@ -34,7 +35,7 @@ public function testCreateModel(): void
 
         $petData = $pet->jsonSerialize();
 
-        self::assertMatchesRegularExpression('/^[0-9a-f]{8}-[0-9a-f]{4}-4[0-9a-f]{3}-(8|9|a|b)[0-9a-f]{3}-[0-9a-f]{12}$/i', $petData['id']);
+        self::assertMatchesRegularExpression(PatternHelper::UUID_PATTERN, $petData['id']);
         self::assertMatchesRegularExpression('/^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\+\d{2}:\d{2}$/', $petData['createdAt']->format('c'));
         self::assertNull($petData['updatedAt']);
         self::assertSame('jerry', $petData['name']);
@@ -65,7 +66,7 @@ public function testUpdateModel(): void
 
         $petData = $pet->jsonSerialize();
 
-        self::assertMatchesRegularExpression('/^[0-9a-f]{8}-[0-9a-f]{4}-4[0-9a-f]{3}-(8|9|a|b)[0-9a-f]{3}-[0-9a-f]{12}$/i', $petData['id']);
+        self::assertMatchesRegularExpression(PatternHelper::UUID_PATTERN, $petData['id']);
         self::assertMatchesRegularExpression('/^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\+\d{2}:\d{2}$/', $petData['createdAt']->format('c'));
         self::assertMatchesRegularExpression('/^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\+\d{2}:\d{2}$/', $petData['updatedAt']->format('c'));
         self::assertSame('jerry', $petData['name']);

tests/Unit/Pet/Model/PetTest.php

@@ -7,6 +7,7 @@
 use App\Pet\Model\Pet;
 use App\Pet\Model\Vaccination;
 use App\Tests\Helper\AssertHelper;
+use App\Tests\Helper\PatternHelper;
 use Chubbyphp\Api\Model\ModelInterface;
 use PHPUnit\Framework\TestCase;
 
@@ -23,7 +24,7 @@ public function testGetSet(): void
 
         self::assertInstanceOf(ModelInterface::class, $pet);
 
-        self::assertMatchesRegularExpression('/[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}/', $pet->getId());
+        self::assertMatchesRegularExpression(PatternHelper::UUID_PATTERN, $pet->getId());
         self::assertInstanceOf(\DateTimeImmutable::class, $pet->getCreatedAt());
         self::assertNull($pet->getUpdatedAt());
         self::assertNull($pet->getTag());