handle soft deletes

laravel · Jun 29, 2021 · f04927d · f04927d
1 parent ad60f5b
commit f04927d
Showing 1 changed file with 18 additions and 4 deletions.
diff --git a/src/Engines/CollectionEngine.php b/src/Engines/CollectionEngine.php
@@ -2,6 +2,8 @@
 
 namespace Laravel\Scout\Engines;
 
+use Illuminate\Database\Eloquent\SoftDeletes;
+use Illuminate\Support\Arr;
 use Illuminate\Support\LazyCollection;
 use Illuminate\Support\Str;
 use Laravel\Scout\Builder;
@@ -82,16 +84,28 @@ public function paginate(Builder $builder, $perPage, $page)
      */
     protected function searchModels(Builder $builder)
     {
-        $models = $builder->model->query()
+        $query = $builder->model->query()
                         ->when(count($builder->wheres) > 0, function ($query) use ($builder) {
                             foreach ($builder->wheres as $key => $value) {
+                                if ($key === '__soft_deleted') {
+                                    continue;
+                                }
+
                                 $query->where($key, $value);
                             }
                         })
-                        ->orderBy($builder->model->getKeyName(), 'desc')
-                        ->get();
+                        ->orderBy($builder->model->getKeyName(), 'desc');
+
+        if (Arr::get($builder->wheres, '__soft_deleted') === 0) {
+            $query = $query->withoutTrashed();
+        } elseif (Arr::get($builder->wheres, '__soft_deleted') === 1) {
+            $query = $query->onlyTrashed();
+        } elseif (in_array(SoftDeletes::class, class_uses_recursive(get_class($builder->model))) &&
+                  config('scout.soft_delete', false)) {
+            $query = $query->withTrashed();
+        }
 
-        $models = $models->values();
+        $models = $query->get()->values();
 
         if (count($models) === 0) {
             return $models;