Merge pull request #8 from spatie/review

Review
spatie · Jan 16, 2023 · 2a64f82 · 2a64f82
2 parents 4898e19 + c824daa
commit 2a64f82
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 6 deletions.
diff --git a/database/migrations/create_deleted_models_table.php b/database/migrations/create_deleted_models_table.php
@@ -16,6 +16,8 @@ public function up()
             $table->json('values');
 
             $table->timestamps();
+
+            $table->unique(['model', 'key']);
         });
     }
 };
diff --git a/resources/views/.gitkeep b/resources/views/.gitkeep
diff --git a/src/Models/DeletedModel.php b/src/Models/DeletedModel.php
@@ -8,6 +8,7 @@
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\Relation;
 use Illuminate\Support\Arr;
+use Illuminate\Support\Facades\DB;
 use Spatie\DeletedModels\Events\DeletedModelRestoredEvent;
 use Spatie\DeletedModels\Events\RestoringDeletedModelEvent;
 use Spatie\DeletedModels\Exceptions\CouldNotRestoreModel;
@@ -30,6 +31,8 @@ class DeletedModel extends Model
 
     public function restore(Closure $beforeSaving = null): Model
     {
+        DB::beginTransaction();
+
         event(new RestoringDeletedModelEvent($this));
 
         try {
@@ -44,15 +47,17 @@ public function restore(Closure $beforeSaving = null): Model
             $this->saveRestoredModel($restoredModel);
 
             $this->afterSavingRestoredModel();
-        } catch (Exception $exception) {
-            $this->handleExceptionDuringRestore($exception);
 
-            throw $exception;
-        }
+            event(new DeletedModelRestoredEvent($this, $restoredModel));
 
-        $this->deleteDeletedModel();
+            $this->deleteDeletedModel();
 
-        event(new DeletedModelRestoredEvent($this, $restoredModel));
+            DB::commit();
+        } catch (Exception $exception) {
+            DB::rollBack();
+
+            $this->handleExceptionDuringRestore($exception);
+        }
 
         return $restoredModel;
     }