Add whereNotIn support

babenkoivan · May 27, 2024 · aadbced · aadbced
1 parent cb7cb4b
commit aadbced
Show file tree

Hide file tree

Showing 3 changed files with 72 additions and 9 deletions.
diff --git a/src/Factories/SearchParametersFactory.php b/src/Factories/SearchParametersFactory.php
@@ -74,19 +74,27 @@ protected function makeFilter(Builder $builder): ?array
                 'terms' => [$field => $values],
             ])->values();
 
-            $filter = $filter->merge($whereIns);
+            if ($whereIns->isNotEmpty()) {
+                $filter->push([
+                    'bool' => [
+                        'must' => $whereIns->all(),
+                    ],
+                ]);
+            }
         }
 
         if (property_exists($builder, 'whereNotIns')) {
             $whereNotIns = collect($builder->whereNotIns)->map(static fn (array $values, string $field) => [
                 'terms' => [$field => $values],
             ])->values();
 
-            $filter = $filter->merge([[
-                'bool' => [
-                    'must_not' => $whereNotIns
-                ]
-            ]]);
+            if ($whereNotIns->isNotEmpty()) {
+                $filter->push([
+                    'bool' => [
+                        'must_not' => $whereNotIns->all(),
+                    ],
+                ]);
+            }
         }
 
         return $filter->isEmpty() ? null : $filter->all();

diff --git a/tests/Integration/Engine/EngineSearchTest.php b/tests/Integration/Engine/EngineSearchTest.php
@@ -61,7 +61,7 @@ public function test_search_result_can_be_filtered_with_where_clause(): void
         $this->assertEquals($target->toArray(), $found->first()->toArray());
     }
 
-    public function test_search_result_can_be_filtered_with_wherein_clause(): void
+    public function test_search_result_can_be_filtered_with_where_in_clause(): void
     {
         if (!method_exists(Builder::class, 'whereIn')) {
             $this->markTestSkipped('Method "whereIn" is not supported by current Scout version');
@@ -77,6 +77,22 @@ public function test_search_result_can_be_filtered_with_wherein_clause(): void
         $this->assertEquals($target->toArray(), $found->first()->toArray());
     }
 
+    public function test_search_result_can_be_filtered_with_where_not_in_clause(): void
+    {
+        if (!method_exists(Builder::class, 'whereNotIn')) {
+            $this->markTestSkipped('Method "whereNotIn" is not supported by current Scout version');
+        }
+
+        // add some mixins
+        factory(Client::class, rand(2, 10))->create(['email' => '[email protected]']);
+
+        $target = factory(Client::class)->create(['email' => '[email protected]']);
+        $found = Client::search()->whereNotIn('email', ['[email protected]'])->get();
+
+        $this->assertCount(1, $found);
+        $this->assertEquals($target->toArray(), $found->first()->toArray());
+    }
+
     public function test_search_result_can_be_sorted(): void
     {
         $source = factory(Client::class, rand(2, 10))->create()->sortBy('email')->values();

diff --git a/tests/Integration/Factories/SearchParametersFactoryTest.php b/tests/Integration/Factories/SearchParametersFactoryTest.php
@@ -85,7 +85,7 @@ public function test_search_parameters_can_be_made_from_builder_with_where_filte
         ], $searchParameters->toArray());
     }
 
-    public function test_search_parameters_can_be_made_from_builder_with_wherein_filter(): void
+    public function test_search_parameters_can_be_made_from_builder_with_where_in_filter(): void
     {
         if (!method_exists(Builder::class, 'whereIn')) {
             $this->markTestSkipped('Method "whereIn" is not supported by current Scout version');
@@ -104,7 +104,46 @@ public function test_search_parameters_can_be_made_from_builder_with_wherein_fil
                             'query_string' => ['query' => 'book'],
                         ],
                         'filter' => [
-                            ['terms' => ['author_id' => [1, 2]]],
+                            [
+                                'bool' => [
+                                    'must' => [
+                                        ['terms' => ['author_id' => [1, 2]]],
+                                    ],
+                                ],
+                            ],
+                        ],
+                    ],
+                ],
+            ],
+        ], $searchParameters->toArray());
+    }
+
+    public function test_search_parameters_can_be_made_from_builder_with_where_not_in_filter(): void
+    {
+        if (!method_exists(Builder::class, 'whereNotIn')) {
+            $this->markTestSkipped('Method "whereNotIn" is not supported by current Scout version');
+        }
+
+        $model = new Client();
+        $builder = (new Builder($model, 'book'))->whereNotIn('author_id', [1, 2]);
+        $searchParameters = $this->searchParametersFactory->makeFromBuilder($builder);
+
+        $this->assertSame([
+            'index' => $model->searchableAs(),
+            'body' => [
+                'query' => [
+                    'bool' => [
+                        'must' => [
+                            'query_string' => ['query' => 'book'],
+                        ],
+                        'filter' => [
+                            [
+                                'bool' => [
+                                    'must_not' => [
+                                        ['terms' => ['author_id' => [1, 2]]],
+                                    ],
+                                ],
+                            ],
                         ],
                     ],
                 ],