wip

Author: brendt

packages/database/src/IsDatabaseModel.php

@@ -11,21 +11,17 @@
 use Tempest\Database\Exceptions\ValueWasMissing;
 use Tempest\Reflection\ClassReflector;
 use Tempest\Reflection\PropertyReflector;
+use Tempest\Router\IsBindingValue;
 use Tempest\Validation\SkipValidation;
 
 use function Tempest\Support\arr;
 use function Tempest\Support\str;
 
 trait IsDatabaseModel
 {
-    #[SkipValidation]
+    #[IsBindingValue, SkipValidation]
     public PrimaryKey $id;
 
-    #[Virtual]
-    public int|string $bindingValue {
-        get => $this->id->value;
-    }
-
     /**
      * Returns a builder for selecting records using this model's table.
      *

packages/router/src/Bindable.php

@@ -4,13 +4,5 @@
 
 interface Bindable
 {
-    /**
-     * @var int|string
-     * The value being used to generate URIs when passed into the `\Tempest\Router\uri` function
-     */
-    public int|string $bindingValue {
-        get;
-    }
-
     public static function resolve(string $input): self;
 }

packages/router/src/GenericRouter.php

@@ -6,6 +6,7 @@
 
 use BackedEnum;
 use Psr\Http\Message\ServerRequestInterface as PsrRequest;
+use ReflectionClass;
 use Tempest\Container\Container;
 use Tempest\Core\AppConfig;
 use Tempest\Database\PrimaryKey;
@@ -128,7 +129,14 @@ public function toUri(array|string $action, ...$params): string
             if ($value instanceof BackedEnum) {
                 $value = $value->value;
             } elseif ($value instanceof Bindable) {
-                $value = $value->bindingValue;
+                foreach (new ClassReflector($value)->getPublicProperties() as $property) {
+                    if (! $property->hasAttribute(IsBindingValue::class)) {
+                        continue;
+                    }
+
+                    $value = $property->getValue($value);
+                    break;
+                }
             }
 
             $uri = $uri->replaceRegex(

packages/router/src/IsBindingValue.php

@@ -0,0 +1,10 @@
+<?php
+
+namespace Tempest\Router;
+
+use Attribute;
+
+#[Attribute(Attribute::TARGET_PROPERTY)]
+final class IsBindingValue
+{
+}

tests/Fixtures/Modules/Books/Models/Book.php

@@ -19,11 +19,11 @@ final class Book implements Bindable
     #[HasLength(min: 1, max: 120)]
     public string $title;
 
-    public Author $author;
+    public ?Author $author = null;
 
     /** @var \Tests\Tempest\Fixtures\Modules\Books\Models\Chapter[] */
-    public array $chapters;
+    public array $chapters = [];
 
     #[HasOne]
-    public Isbn $isbn;
+    public ?Isbn $isbn = null;
 }

tests/Integration/Database/RefreshModelTest.php

@@ -5,6 +5,7 @@
 use Tempest\Database\Migrations\CreateMigrationsTable;
 use Tests\Tempest\Fixtures\Migrations\CreateAuthorTable;
 use Tests\Tempest\Fixtures\Migrations\CreateBookTable;
+use Tests\Tempest\Fixtures\Migrations\CreateChapterTable;
 use Tests\Tempest\Fixtures\Modules\Books\Models\Author;
 use Tests\Tempest\Fixtures\Modules\Books\Models\Book;
 use Tests\Tempest\Integration\FrameworkIntegrationTestCase;
@@ -19,6 +20,7 @@ public function test_refresh_works_for_models_with_unloaded_relation(): void
             CreateMigrationsTable::class,
             CreateBookTable::class,
             CreateAuthorTable::class,
+            CreateChapterTable::class,
         );
 
         $author = Author::create(