fixes, more tests

src/Fields/MorphTo.php

@@ -55,13 +55,13 @@ public function resolveRelatableQuery(Request $request, Model $model): Builder
      */
     public function resolveHydrate(Request $request, Model $model, mixed $value): void
     {
-        $value = explode(':', $value);
+        $value = is_null($value) ? $value : explode(':', $value);
 
-        $model->setAttribute($this->getRelation($model)->getMorphType(), $value[0]);
-
-        $related = tap(new $value[0], static function (Model $related) use ($value): void {
-            $related->forceFill([$related->getKeyName() => $value[1]]);
-        });
+        $related = is_null($value)
+            ? $value
+            : tap(new $value[0], static function (Model $related) use ($value): void {
+                $related->forceFill([$related->getKeyName() => $value[1]]);
+            });
 
         parent::resolveHydrate($request, $model, $related);
     }

src/Http/Controllers/MorphToController.php

@@ -12,11 +12,11 @@ class MorphToController extends Controller
     /**
      * Handle the incoming request.
      */
-    public function __invoke(Request $request, Model $model, ?Model $related = null): Response
+    public function __invoke(Request $request, Model $model): Response
     {
         $field = $request->route('field');
 
-        $data = $field->toInput($request, $related ?: $model);
+        $data = $field->toInput($request, $model);
 
         return ResponseFactory::view($data['template'], $data);
     }

tests/Http/MorphToControllerTest.php

@@ -0,0 +1,39 @@
+<?php
+
+namespace Cone\Root\Tests\Http;
+
+use Cone\Root\Fields\MorphTo;
+use Cone\Root\Root;
+use Cone\Root\Tests\TestCase;
+use Cone\Root\Tests\User;
+
+class MorphToControllerTest extends TestCase
+{
+    protected MorphTo $field;
+
+    protected User $admin;
+
+    public function setUp(): void
+    {
+        parent::setUp();
+
+        $this->field = Root::instance()
+            ->resources
+            ->resolve('users')
+            ->resolveFields($this->app['request'])
+            ->first(function ($field) {
+                return $field->getModelAttribute() === 'employer';
+            });
+
+        $this->admin = User::factory()->create();
+    }
+
+    public function test_a_relation_controller_handles_request(): void
+    {
+        $this->actingAs($this->admin)
+            ->get('/root/users/'.$this->admin->getKey().'/fields/employer')
+            ->assertOk()
+            ->assertViewIs('root::fields.morph-to')
+            ->assertViewHas($this->field->toInput($this->app['request'], $this->admin));
+    }
+}

tests/Http/ResourceControllerTest.php

@@ -84,6 +84,12 @@ public function test_a_resource_controller_handles_destroy(): void
     {
         $user = User::factory()->create();
 
+        $this->actingAs($this->admin)
+            ->delete($this->resource->getUri().'/'.$user->getKey())
+            ->assertRedirect();
+
+        $this->assertTrue($user->refresh()->trashed());
+
         $this->actingAs($this->admin)
             ->delete($this->resource->getUri().'/'.$user->getKey())
             ->assertRedirect();

tests/Resources/ResourceTest.php

@@ -53,7 +53,7 @@ public function test_a_resource_resolves_query(): void
         $this->assertSame(['documents'], array_keys($query->getEagerLoads()));
 
         $this->assertSame(
-            'select * from "users"',
+            'select * from "users" where "users"."deleted_at" is null',
             $query->toRawSql()
         );
     }
@@ -68,7 +68,7 @@ public function test_a_resource_resolves_filtered_query(): void
         $query = $this->resource->resolveFilteredQuery($this->app['request']);
 
         $this->assertSame(
-            'select * from "users" where ("users"."name" like \'%test%\' or "users"."email" like \'%test%\') order by "users"."id" asc',
+            'select * from "users" where ("users"."name" like \'%test%\' or "users"."email" like \'%test%\') and "users"."deleted_at" is null order by "users"."id" asc',
             $query->toRawSql()
         );
     }

tests/Resources/UserResource.php

@@ -7,10 +7,12 @@
 use Cone\Root\Fields\HasMany;
 use Cone\Root\Fields\ID;
 use Cone\Root\Fields\Media;
+use Cone\Root\Fields\MorphTo;
 use Cone\Root\Fields\Select;
 use Cone\Root\Fields\Text;
 use Cone\Root\Resources\Resource;
 use Cone\Root\Tests\Actions\SendPasswordResetNotification;
+use Cone\Root\Tests\Team;
 use Cone\Root\Tests\User;
 use Cone\Root\Tests\Widgets\UsersCount;
 use Cone\Root\Tests\Widgets\UsersTrend;
@@ -59,6 +61,14 @@ public function fields(Request $request): array
                             ]),
                     ];
                 }),
+
+            MorphTo::make('Employer')
+                ->display('name')
+                ->nullable()
+                ->types([
+                    User::class,
+                    Team::class,
+                ]),
         ];
     }
 

tests/User.php

@@ -8,13 +8,14 @@
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Relations\BelongsToMany;
 use Illuminate\Database\Eloquent\Relations\HasOne;
+use Illuminate\Database\Eloquent\Relations\MorphTo;
 use Illuminate\Database\Eloquent\Relations\MorphToMany;
 use Illuminate\Database\Eloquent\SoftDeletes;
 
 class User extends Model implements MustVerifyEmail
 {
     use HasFactory;
-    // use SoftDeletes;
+    use SoftDeletes;
 
     protected $guarded = [];
 
@@ -25,6 +26,15 @@ protected static function newFactory(): UserFactory
         return new class() extends UserFactory
         {
             protected $model = User::class;
+
+            public function definition(): array
+            {
+                return array_merge(parent::definition(), [
+                    'employer_id' => null,
+                    'employer_type' => null,
+                    'deleted_at' => null,
+                ]);
+            }
         };
     }
 
@@ -53,4 +63,9 @@ public function teams(): BelongsToMany
         return $this->belongsToMany(Team::class)
             ->withPivot(['id', 'role']);
     }
+
+    public function employer(): MorphTo
+    {
+        return $this->morphTo();
+    }
 }

tests/migrations/2024_06_14_213755_alter_users_table.php

@@ -0,0 +1,34 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::table('users', function (Blueprint $table) {
+            $table->after('id', function (Blueprint $table) {
+                $table->nullableMorphs('employer');
+            });
+            $table->after('updated_at', function (Blueprint $table) {
+                $table->softDeletes();
+            });
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('users', function (Blueprint $table) {
+            $table->dropMorphs('employer');
+            $table->dropSoftDeletes();
+        });
+    }
+};