refactor: adapt to orm changes and support normal tables

Author: innocenzi

packages/database/src/Builder/QueryBuilders/QueryBuilder.php

@@ -152,7 +152,7 @@ public function new(mixed ...$params): object
      *
      * @return TModel
      */
-    public function findById(string|int|PrimaryKey $id): object
+    public function findById(string|int|PrimaryKey $id): ?object
     {
         if (! inspect($this->model)->hasPrimaryKey()) {
             throw ModelDidNotHavePrimaryColumn::neededForMethod($this->model, 'findById');

packages/validation/src/Rules/Exists.php

@@ -6,43 +6,59 @@
 
 use Attribute;
 use InvalidArgumentException;
-use Tempest\Database\Id;
+use Tempest\Database\PrimaryKey;
+use Tempest\Validation\HasTranslationVariables;
 use Tempest\Validation\Rule;
 
+use function Tempest\Database\inspect;
 use function Tempest\Database\query;
 
+/**
+ * Ensures that for the given model, the primary key value associated to this rule exists in the database.
+ */
 #[Attribute(Attribute::TARGET_PROPERTY)]
-final readonly class Exists implements Rule
+final readonly class Exists implements Rule, HasTranslationVariables
 {
+    /**
+     * @param class-string|non-empty-string $table
+     */
     public function __construct(
-        private string $model,
+        private string $table,
+        private ?string $column = null,
     ) {
-        if (! class_exists($this->model)) {
-            throw new InvalidArgumentException("Model {$this->model} does not exist");
+        if (! class_exists($table) && $column === null) {
+            throw new InvalidArgumentException('A column must be specified when the table is not a model class.');
         }
     }
 
     public function isValid(mixed $value): bool
     {
-        if ((! is_numeric($value) || is_float($value)) && ! is_object($value)) {
+        if (! is_object($value) && ! is_numeric($value) && ! is_string($value)) {
             return false;
         }
 
-        $id = is_object($value) ? $value : new Id($value);
-
-        if ($id->id >= PHP_INT_MAX) {
+        if (is_float($value)) {
             return false;
         }
 
-        $model = query($this->model)
-            ->select()
-            ->get(id: $id);
+        $column = match (is_null($this->column)) {
+            false => $this->column,
+            true => match ($key = inspect($this->table)->getPrimaryKey()) {
+                null => throw new InvalidArgumentException("Model `{$this->table}` does not have a primary key, and a column was not specified."),
+                default => $key,
+            },
+        };
 
-        return $model !== null;
+        return query($this->table)
+            ->count()
+            ->whereField($column, $value)
+            ->execute() > 0;
     }
 
-    public function message(): string
+    public function getTranslationVariables(): array
     {
-        return sprintf('Record for model %1$s does not exist', $this->model);
+        return [
+            'model' => $this->table,
+        ];
     }
 }

packages/validation/src/localization.en.yml

@@ -79,6 +79,9 @@ validation_error:
     .input {$field :string}
     .input {$needle :string}
     {$field} must end with "{$needle}"
+  exists: |
+    .input {$field :string}
+    {$field} could not be found
   is_even_number: |
     .input {$field :string}
     {$field} must be even

packages/validation/tests/Fixtures/ValidateExistsModel.php

@@ -7,50 +7,47 @@
 use InvalidArgumentException;
 use PHPUnit\Framework\Attributes\Test;
 use PHPUnit\Framework\TestCase;
+use Tempest\Database\PrimaryKey;
 use Tempest\Validation\Rules\Exists;
-use Tempest\Validation\Tests\Fixtures\ValidateExistsModel;
 
 /**
  * @internal
  */
 final class ExistsTest extends TestCase
 {
     #[Test]
-    public function throws_exception_for_invalid_model_class(): void
+    public function throws_exception_for_table_without_column(): void
     {
         $this->expectException(InvalidArgumentException::class);
-        $this->expectExceptionMessage('Model NonExistentModel does not exist');
+        $this->expectExceptionMessage('A column must be specified when the table is not a model class.');
 
-        new Exists('NonExistentModel');
+        new Exists('random-table');
     }
 
     #[Test]
     public function returns_false_for_null_or_non_integer_values(): void
     {
         $rule = new Exists(ValidateExistsModel::class);
 
-        $this->assertFalse($rule->isValid('string'));
         $this->assertFalse($rule->isValid(1.5));
         $this->assertFalse($rule->isValid([]));
         $this->assertFalse($rule->isValid(true));
+        $this->assertFalse($rule->isValid(false));
         $this->assertFalse($rule->isValid(null));
     }
 
-    #[Test]
-    public function returns_correct_error_message(): void
-    {
-        $rule = new Exists(ValidateExistsModel::class);
-
-        $expectedMessage = sprintf('Record for model %s does not exist', ValidateExistsModel::class);
-        $this->assertSame($expectedMessage, $rule->message());
-    }
-
     #[Test]
     public function can_be_constructed_with_valid_model_class(): void
     {
-        $rule = new Exists(ValidateExistsModel::class);
-
-        $this->assertInstanceOf(Exists::class, $rule);
-        $this->assertStringContainsString(ValidateExistsModel::class, $rule->message());
+        $this->assertInstanceOf(Exists::class, new Exists(ValidateExistsModel::class));
     }
 }
+
+/** @internal */
+final class ValidateExistsModel
+{
+    public function __construct(
+        public PrimaryKey $id,
+        public string $name,
+    ) {}
+}

packages/validation/tests/Rules/ExistsTest.php

@@ -7,6 +7,7 @@
 use Tempest\Database\HasOne;
 use Tempest\Http\IsRequest;
 use Tempest\Http\Request;
+use Tempest\Validation\Rules\Exists;
 use Tempest\Validation\Rules\HasLength;
 use Tests\Tempest\Fixtures\Modules\Books\Models\Author;
 use Tests\Tempest\Fixtures\Modules\Books\Models\Isbn;