♻️ type changed to resource from model

GautierDele · GautierDele · commit 5ffbb5871cbc · 2023-08-12T12:42:20.000+02:00
diff --git a/src/Relations/MorphTo.php b/src/Relations/MorphTo.php
@@ -23,9 +23,7 @@ public function beforeMutating(Model $model, Relation $relation, array $mutation
         $model
             ->{$relation->relation}()
             ->{$mutationRelations[$relation->relation]['operation'] === 'detach' ? 'dissociate' : 'associate'}(
-                app()->make(QueryBuilder::class, ['resource' => $relation->resourceForModel(
-                    $mutationRelations[$relation->relation]['type']
-                )])
+                app()->make(QueryBuilder::class, ['resource' => new $mutationRelations[$relation->relation]['type']])
                     ->applyMutation($mutationRelations[$relation->relation])
             );
     }
@@ -37,7 +35,7 @@ public function rules(Resource $resource, string $prefix)
             $prefix.'.type' => [
                 'required_with:'.$prefix,
                 Rule::in(
-                    array_map(function ($type) {return (new $type)::$model;}, $this->types)
+                    $this->types
                 )
             ]
         ];
diff --git a/src/Relations/Relation.php b/src/Relations/Relation.php
@@ -59,18 +59,6 @@ public function resource() {
         return new $this->types[0];
     }
 
-    public function resourceForModel(string $model) {
-        $array =
-            array_filter(
-                $this->types,
-                function ($type) use ($model) {
-                    return (new $type)::$model === $model;
-                }
-            );
-        return new (reset($array));
-
-    }
-
     public function fromResource(Resource $fromResource) {
         return tap($this, function () use ($fromResource) {
             $this->fromResource = $fromResource;
diff --git a/tests/Feature/Controllers/MutateCreateMorphOperationsTest.php b/tests/Feature/Controllers/MutateCreateMorphOperationsTest.php
@@ -26,6 +26,8 @@
 use Lomkit\Rest\Tests\Support\Models\MorphToRelation;
 use Lomkit\Rest\Tests\Support\Policies\GreenPolicy;
 use Lomkit\Rest\Tests\Support\Rest\Resources\ModelResource;
+use Lomkit\Rest\Tests\Support\Rest\Resources\MorphedByManyResource;
+use Lomkit\Rest\Tests\Support\Rest\Resources\MorphToResource;
 
 class MutateCreateMorphOperationsTest extends TestCase
 {
@@ -49,7 +51,7 @@ public function test_creating_a_resource_with_creating_first_morph_to_relation()
                         'relations' => [
                             'morphToRelation' => [
                                 'operation' => 'create',
-                                'type' => MorphToRelation::class,
+                                'type' => MorphToResource::class,
                                 'attributes' => []
                             ]
                         ]
@@ -89,7 +91,7 @@ public function test_creating_a_resource_with_creating_second_morph_to_relation(
                         'relations' => [
                             'morphToRelation' => [
                                 'operation' => 'create',
-                                'type' => MorphedByManyRelation::class,
+                                'type' => MorphedByManyResource::class,
                                 'attributes' => []
                             ]
                         ]
@@ -130,7 +132,7 @@ public function test_creating_a_resource_with_attaching_morph_to_relation(): voi
                         'relations' => [
                             'morphToRelation' => [
                                 'operation' => 'attach',
-                                'type' => MorphToRelation::class,
+                                'type' => MorphToResource::class,
                                 'key' => $morphToRelationToAttach->getKey()
                             ]
                         ]
@@ -177,7 +179,7 @@ public function test_creating_a_resource_with_updating_morph_to_relation(): void
                             'morphToRelation' => [
                                 'operation' => 'update',
                                 'key' => $morphToRelationToUpdate->getKey(),
-                                'type' => MorphToRelation::class,
+                                'type' => MorphToResource::class,
                                 'attributes' => ['number' => 5001] // 5001 because with factory it can't exceed 5000
                             ]
                         ]
diff --git a/tests/Feature/Controllers/MutateUpdateMorphOperationsTest.php b/tests/Feature/Controllers/MutateUpdateMorphOperationsTest.php
@@ -26,6 +26,7 @@
 use Lomkit\Rest\Tests\Support\Models\MorphToRelation;
 use Lomkit\Rest\Tests\Support\Policies\GreenPolicy;
 use Lomkit\Rest\Tests\Support\Rest\Resources\ModelResource;
+use Lomkit\Rest\Tests\Support\Rest\Resources\MorphToResource;
 
 class MutateUpdateMorphOperationsTest extends TestCase
 {
@@ -50,7 +51,7 @@ public function test_updating_a_resource_with_creating_morph_to_relation(): void
                         'relations' => [
                             'morphToRelation' => [
                                 'operation' => 'create',
-                                'type' => MorphToRelation::class,
+                                'type' => MorphToResource::class,
                                 'attributes' => []
                             ]
                         ]
@@ -100,7 +101,7 @@ public function test_updating_a_resource_with_attaching_morph_to_relation(): voi
                         'relations' => [
                             'morphToRelation' => [
                                 'operation' => 'attach',
-                                'type' => MorphToRelation::class,
+                                'type' => MorphToResource::class,
                                 'key' => $morphToRelationToAttach->getKey()
                             ]
                         ]
@@ -147,7 +148,7 @@ public function test_updating_a_resource_with_detaching_morph_to_relation(): voi
                         'relations' => [
                             'morphToRelation' => [
                                 'operation' => 'detach',
-                                'type' => MorphToRelation::class,
+                                'type' => MorphToResource::class,
                                 'key' => $morphToRelationToDetach->getKey()
                             ]
                         ]
@@ -189,7 +190,7 @@ public function test_updating_a_resource_with_updating_morph_to_relation(): void
                         'relations' => [
                             'morphToRelation' => [
                                 'operation' => 'update',
-                                'type' => MorphToRelation::class,
+                                'type' => MorphToResource::class,
                                 'key' => $morphToRelationToUpdate->getKey(),
                                 'attributes' => ['number' => 5001] // 5001 because with factory it can't exceed 5000
                             ]

Original file line number	Diff line number	Diff line change
`@@ -23,9 +23,7 @@ public function beforeMutating(Model $model, Relation $relation, array $mutation`
`23`	`23`	`$model`
`24`	`24`	`->{$relation->relation}()`
`25`	`25`	`->{$mutationRelations[$relation->relation]['operation'] === 'detach' ? 'dissociate' : 'associate'}(`
`26`		`- app()->make(QueryBuilder::class, ['resource' => $relation->resourceForModel(`
`27`		`- $mutationRelations[$relation->relation]['type']`
`28`		`- )])`
	`26`	`+ app()->make(QueryBuilder::class, ['resource' => new $mutationRelations[$relation->relation]['type']])`
`29`	`27`	`->applyMutation($mutationRelations[$relation->relation])`
`30`	`28`	`);`
`31`	`29`	`}`
`@@ -37,7 +35,7 @@ public function rules(Resource $resource, string $prefix)`
`37`	`35`	`$prefix.'.type' => [`
`38`	`36`	`'required_with:'.$prefix,`
`39`	`37`	`Rule::in(`
`40`		`- array_map(function ($type) {return (new $type)::$model;}, $this->types)`
	`38`	`+ $this->types`
`41`	`39`	`)`
`42`	`40`	`]`
`43`	`41`	`];`
Original file line number	Diff line number	Diff line change
`@@ -26,6 +26,8 @@`
`26`	`26`	`use Lomkit\Rest\Tests\Support\Models\MorphToRelation;`
`27`	`27`	`use Lomkit\Rest\Tests\Support\Policies\GreenPolicy;`
`28`	`28`	`use Lomkit\Rest\Tests\Support\Rest\Resources\ModelResource;`
	`29`	`+use Lomkit\Rest\Tests\Support\Rest\Resources\MorphedByManyResource;`
	`30`	`+use Lomkit\Rest\Tests\Support\Rest\Resources\MorphToResource;`
`29`	`31`
`30`	`32`	`class MutateCreateMorphOperationsTest extends TestCase`
`31`	`33`	`{`
`@@ -49,7 +51,7 @@ public function test_creating_a_resource_with_creating_first_morph_to_relation()`
`49`	`51`	`'relations' => [`
`50`	`52`	`'morphToRelation' => [`
`51`	`53`	`'operation' => 'create',`
`52`		`- 'type' => MorphToRelation::class,`
	`54`	`+ 'type' => MorphToResource::class,`
`53`	`55`	`'attributes' => []`
`54`	`56`	`]`
`55`	`57`	`]`
`@@ -89,7 +91,7 @@ public function test_creating_a_resource_with_creating_second_morph_to_relation(`
`89`	`91`	`'relations' => [`
`90`	`92`	`'morphToRelation' => [`
`91`	`93`	`'operation' => 'create',`
`92`		`- 'type' => MorphedByManyRelation::class,`
	`94`	`+ 'type' => MorphedByManyResource::class,`
`93`	`95`	`'attributes' => []`
`94`	`96`	`]`
`95`	`97`	`]`
`@@ -130,7 +132,7 @@ public function test_creating_a_resource_with_attaching_morph_to_relation(): voi`
`130`	`132`	`'relations' => [`
`131`	`133`	`'morphToRelation' => [`
`132`	`134`	`'operation' => 'attach',`
`133`		`- 'type' => MorphToRelation::class,`
	`135`	`+ 'type' => MorphToResource::class,`
`134`	`136`	`'key' => $morphToRelationToAttach->getKey()`
`135`	`137`	`]`
`136`	`138`	`]`
`@@ -177,7 +179,7 @@ public function test_creating_a_resource_with_updating_morph_to_relation(): void`
`177`	`179`	`'morphToRelation' => [`
`178`	`180`	`'operation' => 'update',`
`179`	`181`	`'key' => $morphToRelationToUpdate->getKey(),`
`180`		`- 'type' => MorphToRelation::class,`
	`182`	`+ 'type' => MorphToResource::class,`
`181`	`183`	`'attributes' => ['number' => 5001] // 5001 because with factory it can't exceed 5000`
`182`	`184`	`]`
`183`	`185`	`]`
Original file line number	Diff line number	Diff line change
`@@ -26,6 +26,7 @@`
`26`	`26`	`use Lomkit\Rest\Tests\Support\Models\MorphToRelation;`
`27`	`27`	`use Lomkit\Rest\Tests\Support\Policies\GreenPolicy;`
`28`	`28`	`use Lomkit\Rest\Tests\Support\Rest\Resources\ModelResource;`
	`29`	`+use Lomkit\Rest\Tests\Support\Rest\Resources\MorphToResource;`
`29`	`30`
`30`	`31`	`class MutateUpdateMorphOperationsTest extends TestCase`
`31`	`32`	`{`
`@@ -50,7 +51,7 @@ public function test_updating_a_resource_with_creating_morph_to_relation(): void`
`50`	`51`	`'relations' => [`
`51`	`52`	`'morphToRelation' => [`
`52`	`53`	`'operation' => 'create',`
`53`		`- 'type' => MorphToRelation::class,`
	`54`	`+ 'type' => MorphToResource::class,`
`54`	`55`	`'attributes' => []`
`55`	`56`	`]`
`56`	`57`	`]`
`@@ -100,7 +101,7 @@ public function test_updating_a_resource_with_attaching_morph_to_relation(): voi`
`100`	`101`	`'relations' => [`
`101`	`102`	`'morphToRelation' => [`
`102`	`103`	`'operation' => 'attach',`
`103`		`- 'type' => MorphToRelation::class,`
	`104`	`+ 'type' => MorphToResource::class,`
`104`	`105`	`'key' => $morphToRelationToAttach->getKey()`
`105`	`106`	`]`
`106`	`107`	`]`
`@@ -147,7 +148,7 @@ public function test_updating_a_resource_with_detaching_morph_to_relation(): voi`
`147`	`148`	`'relations' => [`
`148`	`149`	`'morphToRelation' => [`
`149`	`150`	`'operation' => 'detach',`
`150`		`- 'type' => MorphToRelation::class,`
	`151`	`+ 'type' => MorphToResource::class,`
`151`	`152`	`'key' => $morphToRelationToDetach->getKey()`
`152`	`153`	`]`
`153`	`154`	`]`
`@@ -189,7 +190,7 @@ public function test_updating_a_resource_with_updating_morph_to_relation(): void`
`189`	`190`	`'relations' => [`
`190`	`191`	`'morphToRelation' => [`
`191`	`192`	`'operation' => 'update',`
`192`		`- 'type' => MorphToRelation::class,`
	`193`	`+ 'type' => MorphToResource::class,`
`193`	`194`	`'key' => $morphToRelationToUpdate->getKey(),`
`194`	`195`	`'attributes' => ['number' => 5001] // 5001 because with factory it can't exceed 5000`
`195`	`196`	`]`