Update RecordActivity.php

amdad121 · Dec 31, 2023 · f32f031 · f32f031
1 parent 82d8c94
commit f32f031
Showing 1 changed file with 12 additions and 15 deletions.
diff --git a/src/RecordActivity.php b/src/RecordActivity.php
@@ -4,33 +4,30 @@
 
 namespace AmdadulHaq\RecordActivity;
 
-use Illuminate\Support\Facades\Auth;
-
 trait RecordActivity
 {
-    public static function bootRecordActivity()
+    public static function bootRecordActivity(): void
     {
+        // updating created_by and updated_by when model is created
         static::creating(function ($model) {
-            $user = Auth::user();
-            if ($user) {
-                $model->created_by = $user->id;
-                $model->save();
+            if (! $model->isDirty('created_by')) {
+                $model->created_by = auth()->user()->id;
+            }
+
+            if (! $model->isDirty('updated_by')) {
+                $model->updated_by = auth()->user()->id;
             }
         });
 
         static::updating(function ($model) {
-            $user = Auth::user();
-            if ($user) {
-                $model->updated_by = $user->id;
-                $model->save();
+            if (! $model->isDirty('updated_by')) {
+                $model->updated_by = auth()->user()->id;
             }
         });
 
         static::deleting(function ($model) {
-            $user = Auth::user();
-            if ($user) {
-                $model->deleted_by = $user->id;
-                $model->save();
+            if (! $model->isDirty('deleted_by')) {
+                $model->deleted_by = auth()->user()->id;
             }
         });
     }