Merge pull request #89 from Lomkit/fix/morph-to-relation

GautierDele · web-flow · commit 6063ef960b30 · 2023-12-22T19:45:52.000+01:00
Fix/morph to relation
diff --git a/src/Concerns/Resource/Relationable.php b/src/Concerns/Resource/Relationable.php
@@ -34,18 +34,6 @@ public function relation($name)
         return $relation;
     }
 
-    /**
-     * Get the resource associated with a relation by name.
-     *
-     * @param string $name
-     *
-     * @return \Lomkit\Rest\Http\Resource
-     */
-    public function relationResource($name)
-    {
-        return $this->relation($name)?->resource();
-    }
-
     /**
      * The calculated relations if already done in this request.
      *
diff --git a/src/Query/Traits/PerformSearch.php b/src/Query/Traits/PerformSearch.php
@@ -192,7 +192,7 @@ public function applyInstructions($instructions)
     public function include($include)
     {
         return $this->queryBuilder->with($include['relation'], function (Relation $query) use ($include) {
-            $resource = $this->resource->relationResource($include['relation']);
+            $resource = $this->resource->relation($include['relation'])?->resource();
 
             $queryBuilder = $this->newQueryBuilder(['resource' => $resource, 'query' => $query]);
 
@@ -220,7 +220,7 @@ public function applyIncludes($includes)
     public function aggregate($aggregate)
     {
         return $this->queryBuilder->withAggregate([$aggregate['relation'] => function (Builder $query) use ($aggregate) {
-            $resource = $this->resource->relationResource($aggregate['relation']);
+            $resource = $this->resource->relation($aggregate['relation'])?->resource();
 
             $queryBuilder = $this->newQueryBuilder(['resource' => $resource, 'query' => $query]);
 
diff --git a/src/Relations/MorphTo.php b/src/Relations/MorphTo.php
@@ -3,25 +3,11 @@
 namespace Lomkit\Rest\Relations;
 
 use Illuminate\Database\Eloquent\Model;
-use Illuminate\Validation\Rule;
 use Lomkit\Rest\Contracts\QueryBuilder;
 use Lomkit\Rest\Contracts\RelationResource;
-use Lomkit\Rest\Http\Resource;
 
 class MorphTo extends MorphRelation implements RelationResource
 {
-    /**
-     * Create a new MorphTo instance.
-     *
-     * @param string $relation The name of the relation.
-     * @param array  $types    An array of allowed types for the relation.
-     */
-    public function __construct($relation, array $types)
-    {
-        $this->relation = $relation;
-        $this->types = $types;
-    }
-
     /**
      * Perform actions before mutating the MorphTo relation.
      *
@@ -34,29 +20,8 @@ public function beforeMutating(Model $model, Relation $relation, array $mutation
         $model
             ->{$relation->relation}()
             ->{$mutationRelations[$relation->relation]['operation'] === 'detach' ? 'dissociate' : 'associate'}(
-                app()->make(QueryBuilder::class, ['resource' => new $mutationRelations[$relation->relation]['type']()])
+                app()->make(QueryBuilder::class, ['resource' => $relation->resource()])
                     ->applyMutation($mutationRelations[$relation->relation])
             );
     }
-
-    /**
-     * Define validation rules for the MorphTo relation.
-     *
-     * @param resource $resource The resource associated with the relation.
-     * @param string   $prefix   The prefix used for validation rules.
-     *
-     * @return array An array of validation rules.
-     */
-    public function rules(Resource $resource, string $prefix)
-    {
-        return [
-            ...parent::rules($resource, $prefix),
-            $prefix.'.type' => [
-                'required_with:'.$prefix,
-                Rule::in(
-                    $this->types
-                ),
-            ],
-        ];
-    }
 }
diff --git a/src/Relations/Relation.php b/src/Relations/Relation.php
@@ -18,7 +18,7 @@ class Relation implements \JsonSerializable
     use Mutates;
     use Constrained;
     public string $relation;
-    protected array $types;
+    protected string $type;
 
     /**
      * The displayable name of the relation.
@@ -32,7 +32,7 @@ class Relation implements \JsonSerializable
     public function __construct($relation, $type)
     {
         $this->relation = $relation;
-        $this->types = [$type];
+        $this->type = $type;
     }
 
     /**
@@ -103,7 +103,7 @@ public function hasMultipleEntries()
      */
     public function resource()
     {
-        $resource = $this->types[0];
+        $resource = $this->type;
 
         // If the resource isn't registered, do it
         if (!app()->has($resource)) {
@@ -164,7 +164,7 @@ public function jsonSerialize(): mixed
         $request = app(RestRequest::class);
 
         return [
-            'resources'   => $this->types,
+            'resource'    => $this->type,
             'relation'    => $this->relation,
             'constraints' => [
                 'required_on_creation'   => $this->isRequiredOnCreation($request),
diff --git a/src/Rules/AggregateField.php b/src/Rules/AggregateField.php
@@ -86,7 +86,7 @@ public function passes($attribute, $value)
      */
     protected function buildValidationRules($attribute, $value)
     {
-        $relationResource = $this->resource->relationResource($value['relation']);
+        $relationResource = $this->resource->relation($value['relation'])?->resource();
 
         if (is_null($relationResource)) {
             return [];
diff --git a/src/Rules/Includable.php b/src/Rules/Includable.php
@@ -56,20 +56,18 @@ public function setValidator(\Illuminate\Validation\Validator $validator): stati
      */
     public function validate(string $attribute, mixed $value, Closure $fail): void
     {
-        $relationResource = $this->resource->relationResource($value['relation']);
+        $resource = $this->resource->relation($value['relation'])?->resource();
 
-        if (is_null($relationResource)) {
+        if (is_null($resource)) {
             return;
         }
 
         $this
             ->validator
             ->setRules(
-                is_null($relationResource) ?
-                    [] :
-                    [
-                        $attribute => [new SearchRules($relationResource, app(RestRequest::class), false)],
-                    ]
+                [
+                    $attribute => [new SearchRules($resource, app(RestRequest::class), false)],
+                ]
             )
             ->validate();
     }
diff --git a/src/Rules/NestedRelation.php b/src/Rules/NestedRelation.php
@@ -60,7 +60,7 @@ public function validate(string $attribute, mixed $value, Closure $fail): void
         $relationResource = $this->resource;
 
         do {
-            $relationResource = $relationResource->relationResource(Str::before($relation, '.'));
+            $relationResource = $relationResource->relation(Str::before($relation, '.'))?->resource();
 
             if ($relationResource === null) {
                 $fail('The relation is not allowed');
diff --git a/tests/Feature/Controllers/MutateCreateMorphOperationsTest.php b/tests/Feature/Controllers/MutateCreateMorphOperationsTest.php
@@ -17,7 +17,6 @@
 use Lomkit\Rest\Tests\Support\Models\MorphToManyRelation;
 use Lomkit\Rest\Tests\Support\Models\MorphToRelation;
 use Lomkit\Rest\Tests\Support\Policies\GreenPolicy;
-use Lomkit\Rest\Tests\Support\Rest\Resources\MorphedByManyResource;
 use Lomkit\Rest\Tests\Support\Rest\Resources\MorphToResource;
 
 class MutateCreateMorphOperationsTest extends TestCase
@@ -61,45 +60,6 @@ public function test_creating_a_resource_with_creating_first_morph_to_relation()
         $this->assertNotNull(Model::first()->morph_to_relation_type);
     }
 
-    public function test_creating_a_resource_with_creating_second_morph_to_relation(): void
-    {
-        $modelToCreate = ModelFactory::new()->makeOne();
-
-        Gate::policy(Model::class, GreenPolicy::class);
-        Gate::policy(MorphedByManyRelation::class, GreenPolicy::class);
-
-        $response = $this->post(
-            '/api/models/mutate',
-            [
-                'mutate' => [
-                    [
-                        'operation'  => 'create',
-                        'attributes' => [
-                            'name'   => $modelToCreate->name,
-                            'number' => $modelToCreate->number,
-                        ],
-                        'relations' => [
-                            'morphToRelation' => [
-                                'operation'  => 'create',
-                                'type'       => MorphedByManyResource::class,
-                                'attributes' => [],
-                            ],
-                        ],
-                    ],
-                ],
-            ],
-            ['Accept' => 'application/json']
-        );
-
-        $this->assertMutatedResponse(
-            $response,
-            [$modelToCreate],
-        );
-
-        $this->assertNotNull(Model::first()->morph_to_relation_id);
-        $this->assertNotNull(Model::first()->morph_to_relation_type);
-    }
-
     public function test_creating_a_resource_with_attaching_morph_to_relation(): void
     {
         $modelToCreate = ModelFactory::new()->makeOne();
diff --git a/tests/Feature/Controllers/MutateUpdateMorphOperationsTest.php b/tests/Feature/Controllers/MutateUpdateMorphOperationsTest.php
@@ -17,7 +17,6 @@
 use Lomkit\Rest\Tests\Support\Models\MorphToManyRelation;
 use Lomkit\Rest\Tests\Support\Models\MorphToRelation;
 use Lomkit\Rest\Tests\Support\Policies\GreenPolicy;
-use Lomkit\Rest\Tests\Support\Rest\Resources\MorphToResource;
 
 class MutateUpdateMorphOperationsTest extends TestCase
 {
@@ -66,7 +65,6 @@ public function test_updating_a_resource_with_creating_morph_to_relation(): void
                         'relations' => [
                             'morphToRelation' => [
                                 'operation'  => 'create',
-                                'type'       => MorphToResource::class,
                                 'attributes' => [],
                             ],
                         ],
@@ -116,7 +114,6 @@ public function test_updating_a_resource_with_attaching_morph_to_relation(): voi
                         'relations' => [
                             'morphToRelation' => [
                                 'operation' => 'attach',
-                                'type'      => MorphToResource::class,
                                 'key'       => $morphToRelationToAttach->getKey(),
                             ],
                         ],
@@ -163,7 +160,6 @@ public function test_updating_a_resource_with_detaching_morph_to_relation(): voi
                         'relations' => [
                             'morphToRelation' => [
                                 'operation' => 'detach',
-                                'type'      => MorphToResource::class,
                                 'key'       => $morphToRelationToDetach->getKey(),
                             ],
                         ],
@@ -205,7 +201,6 @@ public function test_updating_a_resource_with_updating_morph_to_relation(): void
                         'relations' => [
                             'morphToRelation' => [
                                 'operation'  => 'update',
-                                'type'       => MorphToResource::class,
                                 'key'        => $morphToRelationToUpdate->getKey(),
                                 'attributes' => ['number' => 5001], // 5001 because with factory it can't exceed 5000
                             ],
diff --git a/tests/Support/Rest/Resources/ModelResource.php b/tests/Support/Rest/Resources/ModelResource.php
@@ -64,7 +64,7 @@ public function relations(RestRequest $request): array
             HasManyThrough::make('hasManyThroughRelation', HasManyThroughResource::class),
 
             // Morph relationships
-            MorphTo::make('morphToRelation', [MorphToResource::class, MorphedByManyResource::class]),
+            MorphTo::make('morphToRelation', MorphToResource::class),
             MorphOne::make('morphOneRelation', MorphOneResource::class),
             MorphOneOfMany::make('morphOneOfManyRelation', MorphOneOfManyResource::class),
             MorphMany::make('morphManyRelation', MorphManyResource::class),

Original file line number	Diff line number	Diff line change
`@@ -192,7 +192,7 @@ public function applyInstructions($instructions)`
`192`	`192`	`public function include($include)`
`193`	`193`	`{`
`194`	`194`	`return $this->queryBuilder->with($include['relation'], function (Relation $query) use ($include) {`
`195`		`- $resource = $this->resource->relationResource($include['relation']);`
	`195`	`+ $resource = $this->resource->relation($include['relation'])?->resource();`
`196`	`196`
`197`	`197`	`$queryBuilder = $this->newQueryBuilder(['resource' => $resource, 'query' => $query]);`
`198`	`198`
`@@ -220,7 +220,7 @@ public function applyIncludes($includes)`
`220`	`220`	`public function aggregate($aggregate)`
`221`	`221`	`{`
`222`	`222`	`return $this->queryBuilder->withAggregate([$aggregate['relation'] => function (Builder $query) use ($aggregate) {`
`223`		`- $resource = $this->resource->relationResource($aggregate['relation']);`
	`223`	`+ $resource = $this->resource->relation($aggregate['relation'])?->resource();`
`224`	`224`
`225`	`225`	`$queryBuilder = $this->newQueryBuilder(['resource' => $resource, 'query' => $query]);`
`226`	`226`
Original file line number	Diff line number	Diff line change
`@@ -86,7 +86,7 @@ public function passes($attribute, $value)`
`86`	`86`	`*/`
`87`	`87`	`protected function buildValidationRules($attribute, $value)`
`88`	`88`	`{`
`89`		`- $relationResource = $this->resource->relationResource($value['relation']);`
	`89`	`+ $relationResource = $this->resource->relation($value['relation'])?->resource();`
`90`	`90`
`91`	`91`	`if (is_null($relationResource)) {`
`92`	`92`	`return [];`
Original file line number	Diff line number	Diff line change
`@@ -56,20 +56,18 @@ public function setValidator(\Illuminate\Validation\Validator $validator): stati`
`56`	`56`	`*/`
`57`	`57`	`public function validate(string $attribute, mixed $value, Closure $fail): void`
`58`	`58`	`{`
`59`		`- $relationResource = $this->resource->relationResource($value['relation']);`
	`59`	`+ $resource = $this->resource->relation($value['relation'])?->resource();`
`60`	`60`
`61`		`- if (is_null($relationResource)) {`
	`61`	`+ if (is_null($resource)) {`
`62`	`62`	`return;`
`63`	`63`	`}`
`64`	`64`
`65`	`65`	`$this`
`66`	`66`	`->validator`
`67`	`67`	`->setRules(`
`68`		`- is_null($relationResource) ?`
`69`		`- [] :`
`70`		`- [`
`71`		`- $attribute => [new SearchRules($relationResource, app(RestRequest::class), false)],`
`72`		`- ]`
	`68`	`+ [`
	`69`	`+ $attribute => [new SearchRules($resource, app(RestRequest::class), false)],`
	`70`	`+ ]`
`73`	`71`	`)`
`74`	`72`	`->validate();`
`75`	`73`	`}`