Model validation

Author: brendt

src/Tempest/Database/src/Builder/ModelInspector.php

@@ -6,6 +6,8 @@
 use Tempest\Database\Config\DatabaseConfig;
 use Tempest\Database\Table;
 use Tempest\Reflection\ClassReflector;
+use Tempest\Validation\Exceptions\ValidationException;
+use Tempest\Validation\Validator;
 
 use function Tempest\get;
 
@@ -73,4 +75,25 @@ public function getPropertyValues(): array
 
         return $values;
     }
+
+    public function validate(mixed ...$data): void
+    {
+        if ($this->modelClass === null) {
+            return;
+        }
+
+        $validator = new Validator();
+        $failingRules = [];
+
+        foreach ($data as $key => $value) {
+            $failingRules = [...$failingRules, ...$validator->validateValueForProperty(
+                    $this->modelClass->getProperty($key),
+                    $value,
+                )];
+        }
+
+        if ($failingRules !== []) {
+            throw new ValidationException(self::class, $failingRules);
+        }
+    }
 }

src/Tempest/Database/src/IsDatabaseModel.php

@@ -62,6 +62,8 @@ public static function find(mixed ...$conditions): SelectQueryBuilder
 
     public static function create(mixed ...$params): self
     {
+        model(self::class)->validate(...$params);
+
         return self::new(...$params)->save();
     }
 
@@ -138,6 +140,8 @@ public function save(): self
 
     public function update(mixed ...$params): self
     {
+        model(self::class)->validate(...$params);
+
         foreach ($params as $key => $value) {
             $this->{$key} = $value;
         }

src/Tempest/Router/src/GenericRouter.php

@@ -80,7 +80,7 @@ private function processRequest(Request|PsrRequest $request): Response
             } catch (NotFoundException) {
                 return new NotFound();
             } catch (ValidationException $validationException) {
-                return new Invalid($validationException->object, $validationException->failingRules);
+                return new Invalid($validationException->subject, $validationException->failingRules);
             }
         } else {
             $request = $this->resolveRequest($request, $matchedRoute);

src/Tempest/Validation/src/Exceptions/ValidationException.php

@@ -12,7 +12,7 @@
 final class ValidationException extends Exception
 {
     public function __construct(
-        public readonly object $object,
+        public readonly object|string $subject,
         public readonly array $failingRules,
     ) {
         $messages = [];
@@ -24,6 +24,10 @@ public function __construct(
             }
         }
 
-        parent::__construct($object::class . PHP_EOL . json_encode($messages, JSON_PRETTY_PRINT));
+        if (is_object($subject)) {
+            $subject = $subject::class;
+        }
+
+        parent::__construct($subject . PHP_EOL . json_encode($messages, JSON_PRETTY_PRINT));
     }
 }

src/Tempest/Validation/src/Validator.php

@@ -7,13 +7,15 @@
 use Closure;
 use Tempest\Reflection\ClassReflector;
 use Tempest\Reflection\PropertyReflector;
+use Tempest\Support\Arr\ImmutableArray;
 use Tempest\Validation\Exceptions\ValidationException;
 use Tempest\Validation\Rules\IsBoolean;
 use Tempest\Validation\Rules\IsEnum;
 use Tempest\Validation\Rules\IsFloat;
 use Tempest\Validation\Rules\IsInteger;
 use Tempest\Validation\Rules\IsString;
 use Tempest\Validation\Rules\NotNull;
+use UnitEnum;
 
 use function Tempest\Support\arr;
 
@@ -49,7 +51,7 @@ public function validateValuesForClass(ClassReflector|string $class, ?array $val
 
         $failingRules = [];
 
-        $values = arr($values)->undot();
+        $values = $this->resolveValues($values);
 
         foreach ($class->getPublicProperties() as $property) {
             if ($property->hasAttribute(SkipValidation::class)) {
@@ -163,4 +165,19 @@ public function message(): string
             }
         };
     }
+
+    private function resolveValues(mixed $values): mixed
+    {
+        if (is_object($values) && ! ($values instanceof UnitEnum)) {
+            return new ImmutableArray((array) $values);
+        }
+
+        if (is_array($values)) {
+            return arr($values)
+                ->undot()
+                ->map(fn (mixed $value) => $this->resolveValues($value));
+        }
+
+        return $values;
+    }
 }

tests/Integration/ORM/IsDatabaseModelTest.php

@@ -13,6 +13,7 @@
 use Tempest\Database\Migrations\CreateMigrationsTable;
 use Tempest\Mapper\CasterFactory;
 use Tempest\Mapper\SerializerFactory;
+use Tempest\Validation\Exceptions\ValidationException;
 use Tests\Tempest\Fixtures\Migrations\CreateAuthorTable;
 use Tests\Tempest\Fixtures\Migrations\CreateBookTable;
 use Tests\Tempest\Fixtures\Models\A;
@@ -42,6 +43,7 @@
 use Tests\Tempest\Integration\ORM\Models\CasterEnum;
 use Tests\Tempest\Integration\ORM\Models\CasterModel;
 use Tests\Tempest\Integration\ORM\Models\ChildModel;
+use Tests\Tempest\Integration\ORM\Models\ModelWithValidation;
 use Tests\Tempest\Integration\ORM\Models\ParentModel;
 use Tests\Tempest\Integration\ORM\Models\StaticMethodTableNameModel;
 use Tests\Tempest\Integration\ORM\Models\ThroughModel;
@@ -540,4 +542,27 @@ public function test_table_name_overrides(): void
         $this->assertEquals('custom_attribute_table_name', new ModelDefinition(AttributeTableNameModel::class)->getTableDefinition()->name);
         $this->assertEquals('custom_static_method_table_name', new ModelDefinition(StaticMethodTableNameModel::class)->getTableDefinition()->name);
     }
+
+    public function test_validation_on_create(): void
+    {
+        $this->expectException(ValidationException::class);
+
+        ModelWithValidation::create(
+            index: -1,
+        );
+    }
+
+    public function test_validation_on_update(): void
+    {
+        $model = ModelWithValidation::new(
+            id: new Id(1),
+            index: 1,
+        );
+
+        $this->expectException(ValidationException::class);
+
+        $model->update(
+            index: -1,
+        );
+    }
 }

tests/Integration/ORM/Models/ModelWithValidation.php

@@ -0,0 +1,14 @@
+<?php
+
+namespace Tests\Tempest\Integration\ORM\Models;
+
+use Tempest\Database\IsDatabaseModel;
+use Tempest\Validation\Rules\Between;
+
+final class ModelWithValidation
+{
+    use IsDatabaseModel;
+
+    #[Between(min: 1, max: 10)]
+    public int $index;
+}