IDBPR-2554 Добавлена возможность передачи query для function_score

ensi-platform · Feb 11, 2025 · 9ed6647 · 9ed6647
1 parent 9bfe58f
commit 9ed6647
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 7 deletions.
diff --git a/src/Concerns/DecoratesBoolQuery.php b/src/Concerns/DecoratesBoolQuery.php
@@ -3,6 +3,7 @@
 namespace Ensi\LaravelElasticQuery\Concerns;
 
 use Closure;
+use Ensi\LaravelElasticQuery\Contracts\DSLAware;
 use Ensi\LaravelElasticQuery\Contracts\FunctionScoreItem;
 use Ensi\LaravelElasticQuery\Contracts\FunctionScoreOptions;
 use Ensi\LaravelElasticQuery\Contracts\MatchOptions;
@@ -155,9 +156,10 @@ public function whereMoreLikeThis(array $fields, MoreLikeThis $likeThis, ?MoreLi
 
     /**
      * @param array<FunctionScoreItem> $functions
+     * @param ?DSLAware $query
      * @param ?FunctionScoreOptions $options
      */
-    public function addFunctionScore(array $functions, ?FunctionScoreOptions $options = null): static
+    public function addFunctionScore(array $functions, ?DSLAware $query = null, ?FunctionScoreOptions $options = null): static
     {
         $this->forwardCallTo($this->boolQuery(), __FUNCTION__, func_get_args());
 

diff --git a/src/Contracts/BoolQuery.php b/src/Contracts/BoolQuery.php
@@ -47,7 +47,8 @@ public function whereMoreLikeThis(array $fields, MoreLikeThis $likeThis, ?MoreLi
 
     /**
      * @param array<FunctionScoreItem> $functions
+     * @param ?DSLAware $query
      * @param ?FunctionScoreOptions $options
      */
-    public function addFunctionScore(array $functions, ?FunctionScoreOptions $options = null): static;
+    public function addFunctionScore(array $functions, ?DSLAware $query = null, ?FunctionScoreOptions $options = null): static;
 }
diff --git a/src/Filtering/BoolQueryBuilder.php b/src/Filtering/BoolQueryBuilder.php
@@ -6,6 +6,7 @@
 use Ensi\LaravelElasticQuery\Concerns\SupportsPath;
 use Ensi\LaravelElasticQuery\Contracts\BoolQuery;
 use Ensi\LaravelElasticQuery\Contracts\Criteria;
+use Ensi\LaravelElasticQuery\Contracts\DSLAware;
 use Ensi\LaravelElasticQuery\Contracts\FunctionScoreItem;
 use Ensi\LaravelElasticQuery\Contracts\FunctionScoreOptions;
 use Ensi\LaravelElasticQuery\Contracts\MatchOptions;
@@ -260,11 +261,12 @@ public function whereMoreLikeThis(array $fields, MoreLikeThis $likeThis, ?MoreLi
 
     /**
      * @param array<FunctionScoreItem> $functions
+     * @param ?DSLAware $query
      * @param ?FunctionScoreOptions $options
      */
-    public function addFunctionScore(array $functions, ?FunctionScoreOptions $options = null): static
+    public function addFunctionScore(array $functions, ?DSLAware $query = null, ?FunctionScoreOptions $options = null): static
     {
-        $this->should->add(new FunctionScore($functions, $options));
+        $this->should->add(new FunctionScore($functions, $query, $options));
 
         return $this;
     }

diff --git a/src/Filtering/Criterias/FunctionScore.php b/src/Filtering/Criterias/FunctionScore.php
@@ -3,6 +3,7 @@
 namespace Ensi\LaravelElasticQuery\Filtering\Criterias;
 
 use Ensi\LaravelElasticQuery\Contracts\Criteria;
+use Ensi\LaravelElasticQuery\Contracts\DSLAware;
 use Ensi\LaravelElasticQuery\Contracts\FunctionScoreItem;
 use Ensi\LaravelElasticQuery\Contracts\FunctionScoreOptions;
 use stdClass;
@@ -16,6 +17,7 @@ class FunctionScore implements Criteria
      */
     public function __construct(
         private array $functions,
+        private ?DSLAware $query = null,
         private ?FunctionScoreOptions $options = null,
     ) {
         array_map(fn ($function) => Assert::isInstanceOfAny($function, [FunctionScoreItem::class]), $functions);
@@ -24,7 +26,7 @@ public function __construct(
     public function toDSL(): array
     {
         $body = [
-            'query' => ['match_all' => new stdClass()],
+            'query' => $this->query?->toDSL() ?? ['match_all' => new stdClass()],
             'functions' => array_map(fn (FunctionScoreItem $function) => $function->toArray(), $this->functions),
         ];
 

diff --git a/tests/IntegrationTests/Search/SearchQueryIntegrationTest.php b/tests/IntegrationTests/Search/SearchQueryIntegrationTest.php
@@ -128,7 +128,7 @@
         ->whereMoreLikeThis(
             $fields,
             $likeThis,
-            MoreLikeOptions::make(
+            options: MoreLikeOptions::make(
                 minTermFreq: 1,
                 minDocFreq: 1,
             )
@@ -158,7 +158,7 @@
                     ),
                 ),
             ],
-            FunctionScoreOptions::make(
+            options: FunctionScoreOptions::make(
                 scoreMode: ScoreMode::SUM,
                 boostMode: BoostMode::SUM
             )