File tree Expand file tree Collapse file tree 2 files changed +24
-0
lines changed Expand file tree Collapse file tree 2 files changed +24
-0
lines changed Original file line number Diff line number Diff line change 44
55use Exception ;
66use Illuminate \Console \Command ;
7+ use Illuminate \Database \Eloquent \SoftDeletes ;
78use Illuminate \Support \Str ;
89use Laravel \Scout \EngineManager ;
910
@@ -59,6 +60,12 @@ public function handle(EngineManager $manager)
5960 ?? config ('scout. ' .$ driver .'.index-settings. ' .$ class )
6061 ?? [];
6162
63+ if (isset ($ model ) &&
64+ config ('scout.soft_delete ' , false ) &&
65+ in_array (SoftDeletes::class, class_uses_recursive ($ model ))) {
66+ $ settings ['filterableAttributes ' ][] = '__soft_deleted ' ;
67+ }
68+
6269 if ($ settings ) {
6370 $ engine ->updateIndexSettings ($ name , $ settings );
6471 }
Original file line number Diff line number Diff line change 44
55use Exception ;
66use Illuminate \Console \Command ;
7+ use Illuminate \Database \Eloquent \SoftDeletes ;
78use Illuminate \Support \Str ;
89use Laravel \Scout \EngineManager ;
910
@@ -44,6 +45,22 @@ public function handle(EngineManager $manager)
4445
4546 if (count ($ indexes )) {
4647 foreach ($ indexes as $ name => $ settings ) {
48+ if (! is_array ($ settings )) {
49+ $ name = $ settings ;
50+
51+ $ settings = [];
52+ }
53+
54+ if (class_exists ($ name )) {
55+ $ model = new $ name ;
56+ }
57+
58+ if (isset ($ model ) &&
59+ config ('scout.soft_delete ' , false ) &&
60+ in_array (SoftDeletes::class, class_uses_recursive ($ model ))) {
61+ $ settings ['filterableAttributes ' ][] = '__soft_deleted ' ;
62+ }
63+
4764 $ engine ->updateIndexSettings ($ indexName = $ this ->indexName ($ name ), $ settings );
4865
4966 $ this ->info ('Settings for the [ ' .$ indexName .'] index synced successfully. ' );
You can’t perform that action at this time.
0 commit comments