whereMatch operator.

Author: zix2

src/Concerns/DecoratesBoolQuery.php

@@ -69,7 +69,7 @@ public function whereNotNull(string $field): static
         return $this;
     }
 
-    public function whereMatch(string $field, string $query): static
+    public function whereMatch(string $field, string $query, string $operator = 'or'): static
     {
         $this->forwardCallTo($this->boolQuery(), __FUNCTION__, func_get_args());
 

src/Contracts/BoolQuery.php

@@ -23,7 +23,7 @@ public function whereNull(string $field): static;
 
     public function whereNotNull(string $field): static;
 
-    public function whereMatch(string $field, string $query): static;
+    public function whereMatch(string $field, string $query, string $operator = 'or'): static;
 
     public function whereMultiMatch(array $fields, string $query, ?string $type = null): static;
 }

src/Filtering/BoolQueryBuilder.php

@@ -141,9 +141,9 @@ public function whereNotNull(string $field): static
         return $this;
     }
 
-    public function whereMatch(string $field, string $query): static
+    public function whereMatch(string $field, string $query, string $operator = 'or'): static
     {
-        $this->must->add(new OneMatch($this->absolutePath($field), $query));
+        $this->must->add(new OneMatch($this->absolutePath($field), $query, $operator));
 
         return $this;
     }

src/Filtering/Criterias/OneMatch.php

@@ -7,14 +7,18 @@
 
 class OneMatch implements Criteria
 {
-    public function __construct(private string $field, private string $query)
+    public function __construct(private string $field, private string $query, private string $operator)
     {
         Assert::stringNotEmpty(trim($field));
+        Assert::oneOf($operator, ['and', 'or']);
     }
 
     public function toDSL(): array
     {
-        $body = ['query' => $this->query];
+        $body = [
+            'query' => $this->query,
+            'operator' => $this->operator,
+        ];
 
         return [
             'match' => [

tests/Functional/Search/FilteringTest.php

@@ -61,6 +61,13 @@ public function testWhereMatch(): void
         $this->assertDocumentIds([319, 471]);
     }
 
+    public function whereMatchOperatorAnd(): void
+    {
+        $this->testing->whereMatch('search_name', 'leather gloves', 'and');
+
+        $this->assertDocumentIds([319]);
+    }
+
     public function testWhereMultiMatch(): void
     {
         $this->testing->whereMultiMatch(['search_name', 'description'], 'nice gloves');