[9.x] Added soft deleted to Meilisearch (OOTB included) (#672)

* Added soft deleted to Meilisearch * formatting Co-authored-by: Taylor Otwell <taylor@laravel.com>
laravel · Dec 12, 2022 · 53130b2 · 53130b2
1 parent 2bc384e
commit 53130b2
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 0 deletions.
diff --git a/src/Console/IndexCommand.php b/src/Console/IndexCommand.php
@@ -4,6 +4,7 @@
 
 use Exception;
 use Illuminate\Console\Command;
+use Illuminate\Database\Eloquent\SoftDeletes;
 use Illuminate\Support\Str;
 use Laravel\Scout\EngineManager;
 
@@ -59,6 +60,12 @@ public function handle(EngineManager $manager)
                                 ?? config('scout.'.$driver.'.index-settings.'.$class)
                                 ?? [];
 
+                if (isset($model) &&
+                    config('scout.soft_delete', false) &&
+                    in_array(SoftDeletes::class, class_uses_recursive($model))) {
+                    $settings['filterableAttributes'][] = '__soft_deleted';
+                }
+
                 if ($settings) {
                     $engine->updateIndexSettings($name, $settings);
                 }

diff --git a/src/Console/SyncIndexSettingsCommand.php b/src/Console/SyncIndexSettingsCommand.php
@@ -4,6 +4,7 @@
 
 use Exception;
 use Illuminate\Console\Command;
+use Illuminate\Database\Eloquent\SoftDeletes;
 use Illuminate\Support\Str;
 use Laravel\Scout\EngineManager;
 
@@ -44,6 +45,22 @@ public function handle(EngineManager $manager)
 
             if (count($indexes)) {
                 foreach ($indexes as $name => $settings) {
+                    if (! is_array($settings)) {
+                        $name = $settings;
+
+                        $settings = [];
+                    }
+
+                    if (class_exists($name)) {
+                        $model = new $name;
+                    }
+
+                    if (isset($model) &&
+                        config('scout.soft_delete', false) &&
+                        in_array(SoftDeletes::class, class_uses_recursive($model))) {
+                        $settings['filterableAttributes'][] = '__soft_deleted';
+                    }
+
                     $engine->updateIndexSettings($indexName = $this->indexName($name), $settings);
 
                     $this->info('Settings for the ['.$indexName.'] index synced successfully.');