Fix can't save the same model twice

spatie · Apr 19, 2024 · 8b0fb75 · 8b0fb75
1 parent ce67a8b
commit 8b0fb75
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 2 deletions.
diff --git a/src/Traits/HasPermissions.php b/src/Traits/HasPermissions.php
@@ -404,7 +404,7 @@ public function givePermissionTo(...$permissions)
 
             $class::saved(
                 function ($object) use ($permissions, $model, $teamPivot) {
-                    if ($model->getKey() != $object->getKey()) {
+                    if (!$object->wasRecentlyCreated || $model->getKey() != $object->getKey()) {
                         return;
                     }
                     $model->permissions()->attach($permissions, $teamPivot);

diff --git a/src/Traits/HasRoles.php b/src/Traits/HasRoles.php
@@ -162,7 +162,7 @@ public function assignRole(...$roles)
 
             $class::saved(
                 function ($object) use ($roles, $model, $teamPivot) {
-                    if ($model->getKey() != $object->getKey()) {
+                    if (!$object->wasRecentlyCreated || $model->getKey() != $object->getKey()) {
                         return;
                     }
                     $model->roles()->attach($roles, $teamPivot);

diff --git a/tests/HasPermissionsTest.php b/tests/HasPermissionsTest.php
@@ -636,6 +636,8 @@ 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 = $user->fresh();
+        $user->save();
 
         $this->assertTrue($user->hasPermissionTo('edit-articles'));
 

diff --git a/tests/HasRolesTest.php b/tests/HasRolesTest.php
@@ -341,6 +341,8 @@ 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 = $user->fresh();
+        $user->save();
 
         $this->assertTrue($user->hasRole($this->testUserRole));