Merge branch 'handle-soft-delete' of https://github.com/MetaDone/laravel-scout-postgres into MetaDone-handle-soft-delete

Author: pmatseykanets

src/PostgresEngine.php

@@ -238,7 +238,10 @@ protected function performSearch(Builder $builder, $perPage = 0, $page = 1)
             ->whereRaw("$indexColumn @@ query")
             ->orderBy('rank', 'desc')
             ->orderBy($builder->model->getKeyName());
-
+        //if model use soft delete - without trashed
+        if (method_exists($builder->model, 'getDeletedAtColumn')) {
+            $query->where($builder->model->getDeletedAtColumn(), null);
+        }
         if ($perPage > 0) {
             $query->skip(($page - 1) * $perPage)
                 ->limit($perPage);

tests/PostgresEngineTest.php

@@ -8,6 +8,7 @@
 use Illuminate\Database\Eloquent\Model;
 use ScoutEngines\Postgres\PostgresEngine;
 use Illuminate\Database\Eloquent\Collection;
+use Illuminate\Database\Eloquent\SoftDeletes;
 use Illuminate\Database\ConnectionResolverInterface;
 
 class PostgresEngineTest extends AbstractTestCase
@@ -40,6 +41,7 @@ public function test_update_adds_object_to_index()
         $table->shouldReceive('where')
             ->with('id', '=', 1)
             ->andReturnSelf();
+
         $table->shouldReceive('update')
             ->with(['searchable' => 'foo']);
 
@@ -152,6 +154,25 @@ public function test_search_with_model_config()
         $engine->search($builder);
     }
 
+    public function test_search_with_soft_delete()
+    {
+        list($engine, $db) = $this->getEngine();
+
+        $table = $this->setDbExpectations($db);
+
+        $table->shouldReceive('skip')->with(0)->andReturnSelf()
+            ->shouldReceive('limit')->with(5)->andReturnSelf()
+            ->shouldReceive('where')->with('bar', 1)->andReturnSelf()
+            ->shouldReceive('where')->with('deleted_at', null);
+
+        $db->shouldReceive('select')->with(null, [null, 'foo', 1]);
+
+        $builder = new Builder(new SoftDeletableTestModel(), 'foo');
+        $builder->where('bar', 1)->take(5);
+
+        $engine->search($builder);
+    }
+
     public function test_map_correctly_maps_results_to_models()
     {
         list($engine) = $this->getEngine();
@@ -244,8 +265,6 @@ class TestModel extends Model
 {
     public $id = 1;
 
-//    public $text = 'Foo';
-
     public $searchableOptions = [
         'rank' => [
             'fields' => [
@@ -296,3 +315,8 @@ public function searchableAdditionalArray()
         return $this->searchableAdditionalArray;
     }
 }
+
+class SoftDeletableTestModel extends TestModel
+{
+    use SoftDeletes;
+}