Add soft delete support / bump to 6.1 (#3)

* Add soft delete support
* Update to 6.1

composer.json

@@ -11,7 +11,7 @@
     ],
     "require": {
         "php": ">=7.0",
-        "laravel/scout": "^5.0"
+        "laravel/scout": "^6.1"
     },
      "require-dev": {
         "mockery/mockery": "~1.0",

src/DatabaseEngine.php

@@ -3,6 +3,7 @@
 namespace BoxedCode\Laravel\Scout;
 
 use Illuminate\Database\DatabaseManager;
+use Illuminate\Database\Eloquent\SoftDeletes;
 use Illuminate\Support\Collection;
 use Laravel\Scout\Builder;
 use Laravel\Scout\Engines\Engine;
@@ -33,9 +34,15 @@ public function __construct(DatabaseManager $database)
      */
     public function update($models)
     {
+        if ($this->usesSoftDelete($models->first()) && config('scout.soft_delete', false)) {
+            $models->each->pushSoftDeleteMetadata();
+        }
+
         $models
             ->map(function ($model) {
-                $array = array_values($model->toSearchableArray());
+                $array = array_merge(
+                    $model->toSearchableArray(), $model->scoutMetadata()
+                );
 
                 if (empty($array)) {
                     return;
@@ -154,6 +161,21 @@ public function getTotalCount($results)
         return $results['total'];
     }
 
+    /**
+     * Flush all of the model's records from the engine.
+     *
+     * @param  \Illuminate\Database\Eloquent\Model  $model
+     * @return void
+     */
+    public function flush($model)
+    {
+        $index = $model->searchableAs();
+
+        $this->query()
+            ->where('index', $index)
+            ->delete();
+    }
+
     /**
      * Pluck and return the primary keys of the given results.
      *
@@ -203,11 +225,22 @@ protected function performSearch(Builder $builder, array $options = [])
             ->where('entry', 'like', '%' . $builder->query . '%');
 
         foreach ($builder->wheres as $column => $value) {
-            $search = sprintf('%%"%s":"%s"%%', $column, $value);
+            $search = preg_replace('/^\{|\}$/', '%', json_encode([$column => $value]));
 
             $query->where('entry', 'like', $search);
         }
 
         return $query;
     }
+
+    /**
+     * Determine if the given model uses soft deletes.
+     *
+     * @param  \Illuminate\Database\Eloquent\Model  $model
+     * @return bool
+     */
+    protected function usesSoftDelete($model)
+    {
+        return in_array(SoftDeletes::class, class_uses_recursive($model));
+    }
 }

tests/DatabaseEngineTest.php

@@ -20,14 +20,15 @@ public function test_update_adds_objects_to_index()
         $queryBuilder = Mockery::mock('Illuminate\Database\Query\Builder');
         $modelReturningEmpty = Mockery::mock('Testing\Fixtures\TestModel');
         $modelReturningEmpty->shouldReceive('toSearchableArray')->andReturn([]);
+        $modelReturningEmpty->shouldReceive('scoutMetadata')->andReturn([]);
         $manager->shouldReceive('table')->with('scout_index')->andReturn($queryBuilder);
         $queryBuilder->shouldReceive('updateOrInsert')->with([
             'index'    => 'table',
             'objectID' => 1,
         ], [
             'objectID' => 1,
             'index'    => 'table',
-            'entry'    => '[1]',
+            'entry'    => '{"id":1}',
         ]);
 
         $engine = new DatabaseEngine($manager);
@@ -103,14 +104,18 @@ function ($closure) use ($queryBuilder) {
             )
             ->andReturn($queryBuilder)
             ->shouldReceive('where')
-            ->with('entry', 'like', '%"foo":"1"%')
+            ->with('entry', 'like', '%"foo":1%')
+            ->andReturn($queryBuilder)
+            ->shouldReceive('where')
+            ->with('entry', 'like', '%"bar":"string"%')
             ->andReturn($queryBuilder)
             ->shouldReceive('get')
             ->andReturn([1, 2, 3]);
 
         $engine = new DatabaseEngine($manager);
         $builder = new Builder(new TestModel(), 'zonda');
         $builder->where('foo', 1);
+        $builder->where('bar', 'string');
         $result = $engine->search($builder);
         $this->assertSame($result, [
             'results' => [1, 2, 3],