Merge pull request #69 from Lomkit/fix/relation-rules-triggered-on-attach-detach

Fix/relation rules triggered on attach detach

Author: GautierDele

src/Rules/CustomRulable.php

@@ -58,10 +58,13 @@ public function validate(string $attribute, mixed $value, Closure $fail): void
             $rules = $this->resource->createRules(
                 app()->make(RestRequest::class)
             );
-        } else {
+        } elseif ($value['operation'] === 'update') {
             $rules = $this->resource->updateRules(
                 app()->make(RestRequest::class)
             );
+        } else {
+            // No rules needed
+            return;
         }
 
         $rules = array_merge_recursive(

tests/Feature/Controllers/MutateUpdateOperationsTest.php

@@ -594,6 +594,60 @@ public function test_updating_a_resource_with_attaching_has_many_relation(): voi
         );
     }
 
+    public function test_updating_a_resource_with_attaching_has_many_relation_with_required_rules(): void
+    {
+        $modelToUpdate = ModelFactory::new()->createOne();
+        $hasManyRelationToAttach = HasManyRelationFactory::new()
+            ->createOne();
+
+        Gate::policy(Model::class, GreenPolicy::class);
+        Gate::policy(HasManyRelation::class, GreenPolicy::class);
+        Gate::policy(BelongsToManyRelation::class, GreenPolicy::class);
+
+        $response = $this->post(
+            '/api/constrained/mutate',
+            [
+                'mutate' => [
+                    [
+                        'operation'  => 'update',
+                        'key'        => $modelToUpdate->getKey(),
+                        'attributes' => [
+                            'name'   => 'new name',
+                            'number' => 5001,
+                        ],
+                        'relations' => [
+                            'belongsToManyRelation' => [
+                                [
+                                    'operation'  => 'create',
+                                    'attributes' => [],
+                                ],
+                            ],
+                            'hasManyRelation' => [
+                                [
+                                    'operation' => 'attach',
+                                    'key'       => $hasManyRelationToAttach->getKey(),
+                                ],
+                            ],
+                        ],
+                    ],
+                ],
+            ],
+            ['Accept' => 'application/json']
+        );
+
+        $this->assertMutatedResponse(
+            $response,
+            [],
+            [$modelToUpdate],
+        );
+
+        // Here we test that the relation is correctly linked
+        $this->assertEquals(
+            Model::find($response->json('updated.0'))->hasManyRelation()->count(),
+            1
+        );
+    }
+
     public function test_updating_a_resource_with_detaching_has_many_relation(): void
     {
         $modelToUpdate = ModelFactory::new()->createOne();
@@ -1191,6 +1245,60 @@ public function test_updating_a_resource_with_creating_belongs_to_many_relation_
         );
     }
 
+    public function test_updating_a_resource_with_updating_belongs_to_many_relation_pivot_fields(): void
+    {
+        $modelToUpdate = ModelFactory::new()->createOne();
+
+        $belongsToManyToUpdate = BelongsToManyRelationFactory::new()->createOne();
+
+        Gate::policy(Model::class, GreenPolicy::class);
+        Gate::policy(BelongsToManyRelation::class, GreenPolicy::class);
+
+        $response = $this->post(
+            '/api/models/mutate',
+            [
+                'mutate' => [
+                    [
+                        'operation'  => 'update',
+                        'key'        => $modelToUpdate->getKey(),
+                        'attributes' => [
+                            'name'   => 'new name',
+                            'number' => 5001,
+                        ],
+                        'relations' => [
+                            'belongsToManyRelation' => [
+                                [
+                                    'operation'  => 'update',
+                                    'key'        => $belongsToManyToUpdate->getKey(),
+                                    'pivot'      => [
+                                        'number' => 20,
+                                    ],
+                                ],
+                            ],
+                        ],
+                    ],
+                ],
+            ],
+            ['Accept' => 'application/json']
+        );
+
+        $this->assertMutatedResponse(
+            $response,
+            [],
+            [$modelToUpdate]
+        );
+
+        // Here we test that the relation is correctly linked
+        $this->assertEquals(
+            Model::find($response->json('updated.0'))->belongsToManyRelation()->count(),
+            1
+        );
+        $this->assertEquals(
+            Model::find($response->json('updated.0'))->belongsToManyRelation[0]->belongs_to_many_pivot->number,
+            20
+        );
+    }
+
     public function test_updating_a_resource_with_creating_multiple_belongs_to_many_relation(): void
     {
         $modelToUpdate = ModelFactory::new()->createOne();

tests/Support/Rest/Resources/ConstrainedHasManyResource.php

@@ -0,0 +1,34 @@
+<?php
+
+namespace Lomkit\Rest\Tests\Support\Rest\Resources;
+
+use Lomkit\Rest\Concerns\Resource\DisableAutomaticGates;
+use Lomkit\Rest\Http\Requests\RestRequest;
+use Lomkit\Rest\Http\Resource;
+use Lomkit\Rest\Tests\Support\Models\HasManyRelation;
+
+class ConstrainedHasManyResource extends Resource
+{
+    use DisableAutomaticGates;
+    public static $model = HasManyRelation::class;
+
+    public function rules(RestRequest $request)
+    {
+        return [
+            'number' => 'required',
+        ];
+    }
+
+    public function relations(RestRequest $request): array
+    {
+        return [];
+    }
+
+    public function fields(RestRequest $request): array
+    {
+        return [
+            'id',
+            'number',
+        ];
+    }
+}

tests/Support/Rest/Resources/ConstrainedResource.php

@@ -6,6 +6,7 @@
 use Lomkit\Rest\Http\Resource;
 use Lomkit\Rest\Relations\BelongsTo;
 use Lomkit\Rest\Relations\BelongsToMany;
+use Lomkit\Rest\Relations\HasMany;
 use Lomkit\Rest\Tests\Support\Models\Model;
 
 class ConstrainedResource extends Resource
@@ -21,6 +22,7 @@ public function relations(RestRequest $request): array
             BelongsTo::make('belongsToRelation', BelongsToResource::class)
                 ->prohibitedOnCreation()
                 ->prohibitedOnUpdate(),
+            HasMany::make('hasManyRelation', ConstrainedHasManyResource::class),
         ];
     }