Add terms_set in query builder (#2036)

* Add terms_set in query builder * Add test * Add changelog
ruflin · Dec 6, 2021 · bb26470 · bb26470
1 parent 70deadd
commit bb26470
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -15,6 +15,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 * Added `indices_boost` option to `Elastica\Query` [#2018](https://github.com/ruflin/Elastica/pull/2018)
 * Added `Elastica\Query\Terms::setBoost()` method to configure boost [#2035](https://github.com/ruflin/Elastica/pull/2035)
 * Added `Elastica\Query\TermsSet` query [#2020](https://github.com/ruflin/Elastica/pull/2020)
+* Added `terms_set` in query builder [#2036](https://github.com/ruflin/Elastica/pull/2036)
 * Added `Elastica\Aggregation\Traits\BucketsPathTrait` to configure `buckets_path` on aggregations [#2037](https://github.com/ruflin/Elastica/pull/2037)
 * Allowed to configure a sub key when adding a param with `Elastica\Param::addParam()` [#2030](https://github.com/ruflin/Elastica/pull/2030)
 ### Changed

diff --git a/src/QueryBuilder/DSL/Query.php b/src/QueryBuilder/DSL/Query.php
@@ -45,8 +45,10 @@
 use Elastica\Query\SpanWithin;
 use Elastica\Query\Term;
 use Elastica\Query\Terms;
+use Elastica\Query\TermsSet;
 use Elastica\Query\Wildcard;
 use Elastica\QueryBuilder\DSL;
+use Elastica\Script\AbstractScript;
 
 /**
  * elasticsearch query DSL.
@@ -474,6 +476,17 @@ public function terms(string $field, array $terms = []): Terms
         return new Terms($field, $terms);
     }
 
+    /**
+     * @see https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-terms-set-query.html
+     *
+     * @param array<bool|float|int|string> $terms
+     * @param AbstractScript|string        $minimumShouldMatch
+     */
+    public function terms_set(string $field, array $terms, $minimumShouldMatch): TermsSet
+    {
+        return new TermsSet($field, $terms, $minimumShouldMatch);
+    }
+
     /**
      * wildcard query.
      *

diff --git a/src/QueryBuilder/Version/Version700.php b/src/QueryBuilder/Version/Version700.php
@@ -51,6 +51,7 @@ class Version700 extends Version
         'span_term',
         'term',
         'terms',
+        'terms_set',
         'wildcard',
         'exists',
         'percolate',

diff --git a/tests/QueryBuilder/DSL/QueryTest.php b/tests/QueryBuilder/DSL/QueryTest.php
@@ -70,6 +70,7 @@ public function testInterface(): void
         $this->_assertImplemented($queryDSL, 'simple_query_string', Query\SimpleQueryString::class, ['query']);
         $this->_assertImplemented($queryDSL, 'term', Query\Term::class, []);
         $this->_assertImplemented($queryDSL, 'terms', Query\Terms::class, ['field', []]);
+        $this->_assertImplemented($queryDSL, 'terms_set', Query\TermsSet::class, ['field', ['term'], 'match_field']);
         $this->_assertImplemented($queryDSL, 'wildcard', Query\Wildcard::class, ['field', '']);
         $this->_assertImplemented(
             $queryDSL,