take care of soft deletes (#14)

* soft deleting
julianstark999 · Aug 2, 2021 · ca98395 · ca98395
1 parent 7abc5d8
commit ca98395
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 All notable changes to `laravel-model-iid` will be documented in this file
 
+## 0.1.1 - 2021-08-02
+### added
+- take care of soft deleting
+
 ## 0.1.0 - 2021-03-04
 ### added
 - now using [Spatie Laravel Package Tools](https://github.com/spatie/laravel-package-tools)

diff --git a/src/Traits/HasIidColumn.php b/src/Traits/HasIidColumn.php
@@ -3,6 +3,7 @@
 namespace JulianStark999\LaravelModelIid\Traits;
 
 use Exception;
+use Illuminate\Database\Eloquent\Builder;
 use JulianStark999\LaravelModelIid\Exceptions\SchemaDoesNotHasIidColumn;
 
 trait HasIidColumn
@@ -25,7 +26,11 @@ protected static function boot(): void
                 return;
             }
 
-            $latestModel = $model->where($model->iidColumn, '=', $model[$model->iidColumn])
+            $latestModel = $model->when(
+                method_exists($model, 'forceDelete'),
+                fn (Builder $query) => $query->whereNull('deleted_at')->orWhereNotNull('deleted_at')
+            )
+                ->where($model->iidColumn, '=', $model[$model->iidColumn])
                 ->where('iid', '!=', 'NULL')
                 ->orderBy('iid', 'DESC')
                 ->first();