refactor: use client id rule in id field

laravel-json-api · Mar 29, 2024 · aeedead · aeedead
1 parent d6c1087
commit aeedead
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/src/Fields/ID.php b/src/Fields/ID.php
@@ -19,6 +19,7 @@
 use LaravelJsonApi\Core\Schema\Concerns\Sortable;
 use LaravelJsonApi\Eloquent\Contracts\Fillable;
 use LaravelJsonApi\Validation\Fields\IsValidated;
+use LaravelJsonApi\Validation\Rules\ClientId;
 
 class ID implements IDContract, Fillable, IsValidated
 {
@@ -126,7 +127,7 @@ public function nullable(): self
     public function rulesForCreation(?Request $request): array|null
     {
         if ($this->acceptsClientIds()) {
-            return [$this->validationModifier, "regex:/^{$this->pattern}$/{$this->flags}"];
+            return [$this->validationModifier, new ClientId($this)];
         }
 
         return null;

diff --git a/tests/lib/Integration/Fields/IdTest.php b/tests/lib/Integration/Fields/IdTest.php
@@ -17,6 +17,7 @@
 use LaravelJsonApi\Eloquent\Fields\ID;
 use LaravelJsonApi\Eloquent\Tests\Integration\TestCase;
 use LaravelJsonApi\Validation\Fields\IsValidated;
+use LaravelJsonApi\Validation\Rules\ClientId;
 
 class IdTest extends TestCase
 {
@@ -61,7 +62,7 @@ public function testIsValidatedWhenClientId(): void
         $id = ID::make()->clientIds();
 
         $this->assertInstanceOf(IsValidated::class, $id);
-        $this->assertSame(['required', 'regex:/^[0-9]+$/iD'], $id->rulesForCreation(null));
+        $this->assertEquals(['required', new ClientId($id)], $id->rulesForCreation(null));
         $this->assertNull($id->rulesForUpdate(null, new \stdClass()));
     }
 
@@ -70,7 +71,7 @@ public function testIsValidatedWhenNullableClientId(): void
         $id = ID::make()->clientIds()->nullable();
 
         $this->assertInstanceOf(IsValidated::class, $id);
-        $this->assertSame(['nullable', 'regex:/^[0-9]+$/iD'], $id->rulesForCreation(null));
+        $this->assertEquals(['nullable', new ClientId($id)], $id->rulesForCreation(null));
         $this->assertNull($id->rulesForUpdate(null, new \stdClass()));
     }