#110876 add tests

Author: MsNatali

src/Concerns/DecoratesBoolQuery.php

@@ -3,6 +3,7 @@
 namespace Ensi\LaravelElasticQuery\Concerns;
 
 use Closure;
+use Ensi\LaravelElasticQuery\Contracts\BoolQuery;
 use Ensi\LaravelElasticQuery\Contracts\MatchOptions;
 use Ensi\LaravelElasticQuery\Contracts\MultiMatchOptions;
 use Ensi\LaravelElasticQuery\Contracts\WildcardOptions;
@@ -107,7 +108,7 @@ public function orWhereWildcard(string $field, string $query, ?WildcardOptions $
         return $this;
     }
 
-    public function addMustBool(): BoolQueryBuilder
+    public function addMustBool(): BoolQuery
     {
         return $this->forwardCallTo($this->boolQuery(), __FUNCTION__, func_get_args());
     }

src/Contracts/BoolQuery.php

@@ -25,5 +25,13 @@ public function whereNotNull(string $field): static;
 
     public function whereMatch(string $field, string $query, string|MatchOptions $operator = 'or'): static;
 
+    public function orWhereMatch(string $field, string $query, string|MatchOptions $operator = 'or'): static;
+
     public function whereMultiMatch(array $fields, string $query, string|MultiMatchOptions|null $type = null): static;
+
+    public function whereWildcard(string $field, string $query, ?WildcardOptions $options = null): static;
+
+    public function orWhereWildcard(string $field, string $query, ?WildcardOptions $options = null): static;
+
+    public function addMustBool(): BoolQuery;
 }

src/Filtering/BoolQueryBuilder.php

@@ -202,7 +202,7 @@ public function makeWildcard(string $field, string $query, ?WildcardOptions $opt
         return new Wildcard($this->absolutePath($field), $query, $options ?: new WildcardOptions());
     }
 
-    public function addMustBool(): static
+    public function addMustBool(): BoolQueryBuilder
     {
         $boolCriteria = static::make();
         $this->must->add($boolCriteria);

tests/Unit/Filtering/BoolQueryTest.php

@@ -141,7 +141,7 @@ public function testMatch(string|MatchOptions $options, array $expected): void
     {
         $dsl = BoolQueryBuilder::make()->whereMatch('name', 'foo', $options)->toDSL();
 
-        $this->assertArrayFragment(array_merge(['query' => 'foo'], $expected), $dsl);
+        $this->assertArrayFragment(['must' => [["match" => ['name' => array_merge(['query' => 'foo'], $expected)]]]], $dsl);
     }
 
     public function provideMatch(): array
@@ -160,6 +160,32 @@ public function provideMatch(): array
         ];
     }
 
+    /**
+     * @dataProvider provideOrMatch
+     */
+    public function testOrMatch(string|MatchOptions $options, array $expected): void
+    {
+        $dsl = BoolQueryBuilder::make()->orWhereMatch('name', 'foo', $options)->toDSL();
+
+        $this->assertArrayFragment(['should' => [["match" => ['name' => array_merge(['query' => 'foo'], $expected)]]]], $dsl);
+    }
+
+    public function provideOrMatch(): array
+    {
+        return [
+            'operator' => ['and', ['operator' => 'and']],
+            'fuzziness' => [MatchOptions::make(fuzziness: 'AUTO'), ['fuzziness' => 'AUTO']],
+            'minimum_should_match' => [
+                MatchOptions::make(minimumShouldMatch: '50%'),
+                ['minimum_should_match' => '50%'],
+            ],
+            'many options' => [
+                MatchOptions::make(operator: 'or', fuzziness: '2', minimumShouldMatch: '30%'),
+                ['minimum_should_match' => '30%', 'fuzziness' => '2', 'operator' => 'or'],
+            ],
+        ];
+    }
+
     /**
      * @dataProvider provideMultiMatch
      */
@@ -190,7 +216,7 @@ public function testWildcard(?WildcardOptions $options, array $expected): void
     {
         $dsl = BoolQueryBuilder::make()->whereWildcard('foo', '%value%', $options)->toDSL();
 
-        $this->assertArrayFragment(['wildcard' => ['foo' => array_merge(['value' => '%value%'], $expected)]], $dsl);
+        $this->assertArrayFragment(['must' => [['wildcard' => ['foo' => array_merge(['value' => '%value%'], $expected)]]]], $dsl);
     }
 
     public function provideWildcard(): array
@@ -201,4 +227,40 @@ public function provideWildcard(): array
             'rewrite options' => [WildcardOptions::make(rewrite: 'constant_score'), ['rewrite' => 'constant_score']],
         ];
     }
+
+    /**
+     * @dataProvider provideOrWildcard
+     */
+    public function testOrWildcard(?WildcardOptions $options, array $expected): void
+    {
+        $dsl = BoolQueryBuilder::make()->orWhereWildcard('foo', '%value%', $options)->toDSL();
+
+        $this->assertArrayFragment(['should' => [['wildcard' => ['foo' => array_merge(['value' => '%value%'], $expected)]]]], $dsl);
+    }
+
+    public function provideOrWildcard(): array
+    {
+        return [
+            'empty options' => [WildcardOptions::make(0, false), ['boost' => 0, 'case_insensitive' => false]],
+            'full options' => [WildcardOptions::make(0.5, true), ['boost' => 0.5, 'case_insensitive' => true]],
+            'rewrite options' => [WildcardOptions::make(rewrite: 'constant_score'), ['rewrite' => 'constant_score']],
+        ];
+    }
+
+    public function testAddMustBool(): void
+    {
+        $builder = BoolQueryBuilder::make();
+        $builder->where('mustName', 'value');
+        $builder->addMustBool()->orWhereWildcard('wildcardName', 'wildcardValue')->orWhereMatch('matchName', 'matchValue');
+
+        $dsl = $builder->toDSL();
+
+        $this->assertArrayFragment([
+            'filter' => [["term" => ['mustName' => 'value']]],
+            'must' => [["bool" => ['should' => [
+                ['wildcard' => ['wildcardName' => ['value' => 'wildcardValue']]],
+                ["match" => ['matchName' => ['query' => 'matchValue', 'operator' => 'or']]],
+            ]]]],
+        ], $dsl);
+    }
 }