Merge pull request #9 from hexadog/develop

fix(traits): allow null user
hexadog · Apr 8, 2023 · a48abb6 · a48abb6
2 parents 9ccd827 + 5dc8323
commit a48abb6
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 7 deletions.
diff --git a/src/Models/Traits/CreatedBy.php b/src/Models/Traits/CreatedBy.php
@@ -2,6 +2,7 @@
 
 namespace Hexadog\Auditable\Models\Traits;
 
+use App\Models\User;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
@@ -22,10 +23,10 @@ public function createdBy(): BelongsTo
      *
      * @return $this
      */
-    public function setCreatedByAttribute(Model|string|int $user)
+    public function setCreatedByAttribute(Model|string|int|null $user)
     {
-        if (Schema::hasColumn($this->getTable(), 'created_by')) {
-            $userClass = config('auditable.models.user');
+        if (!is_null($user) && Schema::hasColumn($this->getTable(), 'created_by')) {
+            $userClass = config('auditable.models.user', User::class);
             $userId = $user instanceof $userClass ? $user->getKey() : $user;
 
             if (!is_null($userId)) {

diff --git a/src/Models/Traits/DeletedBy.php b/src/Models/Traits/DeletedBy.php
@@ -2,6 +2,7 @@
 
 namespace Hexadog\Auditable\Models\Traits;
 
+use App\Models\User;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
@@ -26,7 +27,7 @@ public function setDeletedByAttribute(Model|string|int $user)
         if (Schema::hasColumn($this->getTable(), 'deleted_by')) {
             $events = $this->getEventDispatcher();
 
-            $userClass = config('auditable.models.user');
+            $userClass = config('auditable.models.user', User::class);
             $userId = $user instanceof $userClass ? $user->getKey() : $user;
 
             $this->unsetEventDispatcher();

diff --git a/src/Models/Traits/UpdatedBy.php b/src/Models/Traits/UpdatedBy.php
@@ -2,6 +2,7 @@
 
 namespace Hexadog\Auditable\Models\Traits;
 
+use App\Models\User;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
@@ -21,10 +22,10 @@ public function updatedBy(): BelongsTo
      *
      * @return $this
      */
-    public function setUpdatedByAttribute(Model|string|int $user)
+    public function setUpdatedByAttribute(Model|string|int|null $user)
     {
-        if (Schema::hasColumn($this->getTable(), 'updated_by')) {
-            $userClass = config('auditable.models.user');
+        if (!is_null($user) && Schema::hasColumn($this->getTable(), 'updated_by')) {
+            $userClass = config('auditable.models.user', User::class);
             $userId = $user instanceof $userClass ? $user->getKey() : $user;
 
             if (!is_null($userId)) {