Make role model sync atomic

Author: amrachraf6699

src/Traits/HasAssignedModels.php

@@ -63,19 +63,21 @@ public function removeFromModels(array|Collection|Model|int|string $models, ?str
      */
     public function syncModels(array|Collection|Model|int|string $models, ?string $modelClass = null): static
     {
-        if ($this->exists) {
-            $this->newPivotQueryForRole()->delete();
-        }
+        return $this->getConnection()->transaction(function () use ($models, $modelClass) {
+            if ($this->exists) {
+                $this->newPivotQueryForRole()->delete();
+            }
 
-        $teamPivot = $this->teamPivot();
+            $teamPivot = $this->teamPivot();
 
-        foreach ($this->groupModelsByMorphClass($models, $modelClass) as $morphClass => $ids) {
-            $this->relationForModel($morphClass)->attach($ids, $teamPivot);
-        }
+            foreach ($this->groupModelsByMorphClass($models, $modelClass) as $morphClass => $ids) {
+                $this->relationForModel($morphClass)->attach($ids, $teamPivot);
+            }
 
-        $this->unsetRelation('users');
+            $this->unsetRelation('users');
 
-        return $this;
+            return $this;
+        });
     }
 
     /**

tests/Traits/HasAssignedModelsTest.php

@@ -1,6 +1,7 @@
 <?php
 
 use Illuminate\Support\Facades\DB;
+use Illuminate\Database\QueryException;
 use Spatie\Permission\Models\Role;
 use Spatie\Permission\PermissionRegistrar;
 use Spatie\Permission\Support\Config;
@@ -62,6 +63,17 @@
     expect($user1->fresh()->hasRole($this->testUserRole))->toBeTrue();
 });
 
+it('does not detach models when syncing an unsaved model', function () {
+    $user = User::create(['email' => 'user@test.com']);
+    $this->testUserRole->syncModels($user);
+
+    $unsavedUser = new User(['email' => 'unsaved-user@test.com']);
+
+    expect(fn () => $this->testUserRole->syncModels($unsavedUser))->toThrow(QueryException::class);
+
+    expect($user->fresh()->hasRole($this->testUserRole))->toBeTrue();
+});
+
 it('can sync models using IDs', function () {
     $user1 = User::create(['email' => 'user1@test.com']);
     $user2 = User::create(['email' => 'user2@test.com']);