Fix can't save the same model twice

spatie · Apr 23, 2024 · 9f5cb6d · 9f5cb6d
1 parent ce67a8b
commit 9f5cb6d
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 4 deletions.
diff --git a/src/Traits/HasPermissions.php b/src/Traits/HasPermissions.php
@@ -401,14 +401,16 @@ public function givePermissionTo(...$permissions)
             $model->unsetRelation('permissions');
         } else {
             $class = \get_class($model);
+            $saved = false;
 
             $class::saved(
-                function ($object) use ($permissions, $model, $teamPivot) {
-                    if ($model->getKey() != $object->getKey()) {
+                function ($object) use ($permissions, $model, $teamPivot, &$saved) {
+                    if ($saved || $model->getKey() != $object->getKey()) {
                         return;
                     }
                     $model->permissions()->attach($permissions, $teamPivot);
                     $model->unsetRelation('permissions');
+                    $saved = true;
                 }
             );
         }

diff --git a/src/Traits/HasRoles.php b/src/Traits/HasRoles.php
@@ -159,14 +159,16 @@ public function assignRole(...$roles)
             $model->unsetRelation('roles');
         } else {
             $class = \get_class($model);
+            $saved = false;
 
             $class::saved(
-                function ($object) use ($roles, $model, $teamPivot) {
-                    if ($model->getKey() != $object->getKey()) {
+                function ($object) use ($roles, $model, $teamPivot, &$saved) {
+                    if ($saved || $model->getKey() != $object->getKey()) {
                         return;
                     }
                     $model->roles()->attach($roles, $teamPivot);
                     $model->unsetRelation('roles');
+                    $saved = true;
                 }
             );
         }

diff --git a/tests/HasPermissionsTest.php b/tests/HasPermissionsTest.php
@@ -636,6 +636,7 @@ public function it_can_sync_permissions_to_a_model_that_is_not_persisted()
         $user = new User(['email' => 'test@user.com']);
         $user->syncPermissions('edit-articles');
         $user->save();
+        $user->save(); // test save same model twice 
 
         $this->assertTrue($user->hasPermissionTo('edit-articles'));
 

diff --git a/tests/HasRolesTest.php b/tests/HasRolesTest.php
@@ -341,6 +341,7 @@ public function it_will_sync_roles_to_a_model_that_is_not_persisted()
         $user = new User(['email' => 'test@user.com']);
         $user->syncRoles([$this->testUserRole]);
         $user->save();
+        $user->save(); // test save same model twice 
 
         $this->assertTrue($user->hasRole($this->testUserRole));