IDBPR-2554 Добавлены тесты на новые методы

Author: egmanoylin

src/Concerns/DecoratesBoolQuery.php

@@ -3,14 +3,14 @@
 namespace Ensi\LaravelElasticQuery\Concerns;
 
 use Closure;
+use Ensi\LaravelElasticQuery\Contracts\FunctionScoreItem;
 use Ensi\LaravelElasticQuery\Contracts\FunctionScoreOptions;
 use Ensi\LaravelElasticQuery\Contracts\MatchOptions;
 use Ensi\LaravelElasticQuery\Contracts\MoreLikeOptions;
+use Ensi\LaravelElasticQuery\Contracts\MoreLikeThis;
 use Ensi\LaravelElasticQuery\Contracts\MultiMatchOptions;
 use Ensi\LaravelElasticQuery\Contracts\WildcardOptions;
 use Ensi\LaravelElasticQuery\Filtering\BoolQueryBuilder;
-use Ensi\LaravelElasticQuery\Filtering\Criterias\FunctionScoreItem;
-use Ensi\LaravelElasticQuery\Filtering\Criterias\MoreLikeThis;
 use Illuminate\Contracts\Support\Arrayable;
 use Illuminate\Support\Traits\ForwardsCalls;
 

src/Contracts/BoolQuery.php

@@ -42,4 +42,12 @@ public function whereWildcard(string $field, string $query, ?WildcardOptions $op
     public function orWhereWildcard(string $field, string $query, ?WildcardOptions $options = null): static;
 
     public function addMustBool(callable $fn): static;
+
+    public function whereMoreLikeThis(array $fields, MoreLikeThis $likeThis, ?MoreLikeOptions $options = null): static;
+
+    /**
+     * @param array<FunctionScoreItem> $functions
+     * @param ?FunctionScoreOptions $options
+     */
+    public function addFunctionScore(array $functions, ?FunctionScoreOptions $options = null): static;
 }

src/Filtering/Criterias/FunctionScoreItem.php renamed to src/Contracts/FunctionScoreItem.php

@@ -1,18 +1,18 @@
 <?php
 
-namespace Ensi\LaravelElasticQuery\Filtering\Criterias;
+namespace Ensi\LaravelElasticQuery\Contracts;
 
-use Ensi\LaravelElasticQuery\Contracts\Criteria;
+use Illuminate\Contracts\Support\Arrayable;
 
-class FunctionScoreItem implements Criteria
+class FunctionScoreItem implements Arrayable
 {
     public function __construct(
         private int $weight,
         private Criteria $filter,
     ) {
     }
 
-    public function toDSL(): array
+    public function toArray(): array
     {
         return [
             'weight' => $this->weight,

src/Contracts/FunctionScoreOptions.php

@@ -15,8 +15,8 @@ public static function make(
         ?string $scoreMode = null,
         ?string $boostMode = null,
     ): static {
-        Assert::oneOf($scoreMode, ScoreMode::cases());
-        Assert::oneOf($boostMode, BoostMode::cases());
+        Assert::nullOrOneOf($scoreMode, ScoreMode::cases());
+        Assert::nullOrOneOf($boostMode, BoostMode::cases());
 
         return new static(array_filter([
             'score_mode' => $scoreMode,

src/Contracts/MoreLikeOptions.php

@@ -11,14 +11,26 @@ public function __construct(private array $options = [])
     }
 
     public static function make(
-        ?int $minTermFreq = null,
         ?int $maxQueryTerms = null,
+        ?int $minTermFreq = null,
+        ?int $minDocFreq = null,
+        ?int $maxDocFreq = null,
+        ?int $minWordLength = null,
+        ?int $maxWordLength = null,
+        ?array $stopWords = null,
+        ?string $analyzer = null,
         ?string $minimumShouldMatch = null,
     ): static {
 
         return new static(array_filter([
-            'min_term_freq' => $minTermFreq,
             'max_query_terms' => $maxQueryTerms,
+            'min_term_freq' => $minTermFreq,
+            'min_doc_freq' => $minDocFreq,
+            'max_doc_freq' => $maxDocFreq,
+            'min_word_length' => $minWordLength,
+            'max_word_length' => $maxWordLength,
+            'stop_words' => $stopWords,
+            'analyzer' => $analyzer,
             'minimum_should_match' => $minimumShouldMatch,
         ]));
     }

src/Filtering/Criterias/MoreLikeThis.php renamed to src/Contracts/MoreLikeThis.php

@@ -1,10 +1,10 @@
 <?php
 
-namespace Ensi\LaravelElasticQuery\Filtering\Criterias;
+namespace Ensi\LaravelElasticQuery\Contracts;
 
-use Ensi\LaravelElasticQuery\Contracts\Criteria;
+use Illuminate\Contracts\Support\Arrayable;
 
-class MoreLikeThis implements Criteria
+class MoreLikeThis implements Arrayable
 {
     private array $this = [];
 
@@ -25,7 +25,7 @@ public function addString(string $token): static
         return $this;
     }
 
-    public function toDSL(): array
+    public function toArray(): array
     {
         return $this->this;
     }

src/Filtering/BoolQueryBuilder.php

@@ -6,13 +6,13 @@
 use Ensi\LaravelElasticQuery\Concerns\SupportsPath;
 use Ensi\LaravelElasticQuery\Contracts\BoolQuery;
 use Ensi\LaravelElasticQuery\Contracts\Criteria;
+use Ensi\LaravelElasticQuery\Contracts\FunctionScoreItem;
 use Ensi\LaravelElasticQuery\Contracts\FunctionScoreOptions;
 use Ensi\LaravelElasticQuery\Contracts\MatchOptions;
 use Ensi\LaravelElasticQuery\Contracts\MoreLikeOptions;
+use Ensi\LaravelElasticQuery\Contracts\MoreLikeThis;
 use Ensi\LaravelElasticQuery\Contracts\MultiMatchOptions;
 use Ensi\LaravelElasticQuery\Contracts\WildcardOptions;
-use Ensi\LaravelElasticQuery\Filtering\Criterias\FunctionScoreItem;
-use Ensi\LaravelElasticQuery\Filtering\Criterias\MoreLikeThis;
 use Ensi\LaravelElasticQuery\Filtering\Criterias\Exists;
 use Ensi\LaravelElasticQuery\Filtering\Criterias\FunctionScore;
 use Ensi\LaravelElasticQuery\Filtering\Criterias\MoreLike;

src/Filtering/Criterias/FunctionScore.php

@@ -3,8 +3,8 @@
 namespace Ensi\LaravelElasticQuery\Filtering\Criterias;
 
 use Ensi\LaravelElasticQuery\Contracts\Criteria;
+use Ensi\LaravelElasticQuery\Contracts\FunctionScoreItem;
 use Ensi\LaravelElasticQuery\Contracts\FunctionScoreOptions;
-use Ensi\LaravelElasticQuery\Filtering\Criterias\FunctionScoreItem;
 use stdClass;
 use Webmozart\Assert\Assert;
 
@@ -25,7 +25,7 @@ public function toDSL(): array
     {
         $body = [
             'query' => ['match_all' => new stdClass()],
-            'functions' => array_map(fn (FunctionScoreItem $function) => $function->toDSL(), $this->functions),
+            'functions' => array_map(fn (FunctionScoreItem $function) => $function->toArray(), $this->functions),
         ];
 
         if ($this->options) {

src/Filtering/Criterias/MoreLike.php

@@ -4,7 +4,7 @@
 
 use Ensi\LaravelElasticQuery\Contracts\Criteria;
 use Ensi\LaravelElasticQuery\Contracts\MoreLikeOptions;
-use Ensi\LaravelElasticQuery\Filtering\Criterias\MoreLikeThis;
+use Ensi\LaravelElasticQuery\Contracts\MoreLikeThis;
 use Webmozart\Assert\Assert;
 
 class MoreLike implements Criteria
@@ -22,7 +22,7 @@ public function toDSL(): array
     {
         $body = [
             'fields' => $this->fields,
-            'like' => $this->likeThis->toDSL(),
+            'like' => $this->likeThis->toArray(),
         ];
 
         if ($this->options) {

tests/IntegrationTests/Search/SearchQueryIntegrationTest.php

@@ -1,14 +1,23 @@
 <?php
 
 use Ensi\LaravelElasticQuery\Contracts\BoolQuery;
+use Ensi\LaravelElasticQuery\Contracts\BoostMode;
+use Ensi\LaravelElasticQuery\Contracts\FunctionScoreItem;
+use Ensi\LaravelElasticQuery\Contracts\FunctionScoreOptions;
+use Ensi\LaravelElasticQuery\Contracts\MoreLikeOptions;
+use Ensi\LaravelElasticQuery\Contracts\MoreLikeThis;
+use Ensi\LaravelElasticQuery\Contracts\ScoreMode;
 use Ensi\LaravelElasticQuery\Contracts\SortableQuery;
+use Ensi\LaravelElasticQuery\Filtering\Criterias\Terms;
 use Ensi\LaravelElasticQuery\Tests\Data\Models\ProductsIndex;
 use Ensi\LaravelElasticQuery\Tests\IntegrationTestCase;
 use Ensi\LaravelElasticQuery\Tests\IntegrationTests\Search\TestCases\SearchIntegrationTestCase;
 
 use function PHPUnit\Framework\assertArrayNotHasKey;
+use function PHPUnit\Framework\assertContains;
 use function PHPUnit\Framework\assertCount;
 use function PHPUnit\Framework\assertEquals;
+use function PHPUnit\Framework\assertEqualsCanonicalizing;
 
 uses(SearchIntegrationTestCase::class);
 
@@ -111,3 +120,53 @@
 
     assertCount(2, $result);
 });
+
+test('search query more like this', function (array $fields, MoreLikeThis $likeThis, array $expectedIds) {
+    /** @var SearchIntegrationTestCase $this */
+
+    $result = ProductsIndex::query()
+        ->whereMoreLikeThis(
+            $fields,
+            $likeThis,
+            MoreLikeOptions::make(
+                minTermFreq: 1,
+                minDocFreq: 1,
+            )
+        )
+        ->get();
+
+    assertEqualsCanonicalizing($expectedIds, $result->pluck('_id')->all());
+})->with([
+    'array id' => [['tags'], (new MoreLikeThis())->addId('405'), ['150']],
+    'array string' => [['tags'], (new MoreLikeThis())->addString('drinks'), ['150', '405']],
+    'full text id' => [['description'], (new MoreLikeThis())->addId('1'), ['150', '328', '471']],
+    'full text string' => [['description'], (new MoreLikeThis())->addString('description'), ['1', '150', '471']],
+    'full text combine' => [['description'], (new MoreLikeThis())->addId('1')->addString('water'), ['150', '328', '405', '471']],
+]);
+
+test('search query add function score', function () {
+    /** @var SearchIntegrationTestCase $this */
+
+    $result = ProductsIndex::query()
+        ->addFunctionScore(
+            [
+                new FunctionScoreItem(
+                    weight: 10,
+                    filter: new Terms(
+                        field: "tags",
+                        values: ["drinks"],
+                    ),
+                ),
+            ],
+            FunctionScoreOptions::make(
+                scoreMode: ScoreMode::SUM,
+                boostMode: BoostMode::SUM
+            )
+        )
+        ->get();
+
+    assertCount(6, $result);
+
+    assertContains('drinks', $result[0]['_source']['tags']);
+    assertContains('drinks', $result[1]['_source']['tags']);
+});