#102033 terms composite aggs

Author: DimionX

src/Aggregating/Bucket.php

@@ -4,7 +4,12 @@
 
 class Bucket
 {
-    public function __construct(public mixed $key, public int $count)
+    public function __construct(public mixed $key, public int $count, protected array $compositeValues = [])
     {
     }
+
+    public function getCompositeValue(string $name): mixed
+    {
+        return $this->compositeValues[$name] ?? null;
+    }
 }

src/Aggregating/Bucket/TermsAggregation.php

@@ -5,12 +5,18 @@
 use Ensi\LaravelElasticQuery\Aggregating\BucketCollection;
 use Ensi\LaravelElasticQuery\Aggregating\Result;
 use Ensi\LaravelElasticQuery\Contracts\Aggregation;
+use Ensi\LaravelElasticQuery\Search\Sorting\Sort;
 use Webmozart\Assert\Assert;
 
 class TermsAggregation implements Aggregation
 {
-    public function __construct(private string $name, private string $field, private ?int $size = null)
-    {
+    public function __construct(
+        private string $name,
+        private string $field,
+        private ?int $size = null,
+        private ?Sort $sort = null,
+        private ?Aggregation $composite = null,
+    ) {
         Assert::stringNotEmpty(trim($name));
         Assert::stringNotEmpty(trim($field));
         Assert::nullOrGreaterThan($this->size, 0);
@@ -29,20 +35,39 @@ public function toDSL(): array
             $body['size'] = $this->size;
         }
 
-        return [
+        if ($this->sort) {
+            $body['order'] = $this->sort->toDSL();
+        }
+
+        $dsl = [
             $this->name => [
                 'terms' => $body,
             ],
         ];
+
+        if ($this->isComposite()) {
+            $dsl[$this->name]['aggs'] = $this->composite->toDSL();
+        }
+
+        return $dsl;
     }
 
     public function parseResults(array $response): array
     {
         $buckets = array_map(
-            fn (array $bucket) => Result::parseBucket($bucket),
+            function (array $bucket) {
+                $values = $this->isComposite() ? $this->composite->parseResults($bucket) : [];
+
+                return Result::parseBucket($bucket, $values);
+            },
             $response[$this->name]['buckets'] ?? []
         );
 
         return [$this->name => new BucketCollection($buckets)];
     }
+
+    public function isComposite(): bool
+    {
+        return isset($this->composite);
+    }
 }

src/Aggregating/Metrics/MinMaxScoreAggregation.php

@@ -0,0 +1,37 @@
+<?php
+
+namespace Ensi\LaravelElasticQuery\Aggregating\Metrics;
+
+use Ensi\LaravelElasticQuery\Aggregating\MinMax;
+use Ensi\LaravelElasticQuery\Aggregating\Result;
+use Ensi\LaravelElasticQuery\Contracts\Aggregation;
+use Webmozart\Assert\Assert;
+
+class MinMaxScoreAggregation implements Aggregation
+{
+    public function __construct(protected string $name = 'score')
+    {
+        Assert::stringNotEmpty(trim($name));
+    }
+
+    public function name(): string
+    {
+        return $this->name;
+    }
+
+    public function toDSL(): array
+    {
+        return [
+            "{$this->name}_min" => ['min' => ['script' => "_score"]],
+            "{$this->name}_max" => ['max' => ['script' => "_score"]],
+        ];
+    }
+
+    public function parseResults(array $response): array
+    {
+        return [$this->name => new MinMax(
+            Result::parseValue($response["{$this->name}_min"]) ?? 0,
+            Result::parseValue($response["{$this->name}_max"]) ?? 0,
+        )];
+    }
+}

src/Aggregating/Result.php

@@ -9,9 +9,9 @@ public static function parseValue(array $source): mixed
         return self::parse($source, 'value');
     }
 
-    public static function parseBucket(array $source): Bucket
+    public static function parseBucket(array $source, array $compositeValues = []): Bucket
     {
-        return new Bucket(self::parse($source, 'key'), (int)($source['doc_count'] ?? 0));
+        return new Bucket(self::parse($source, 'key'), (int)($source['doc_count'] ?? 0), $compositeValues);
     }
 
     public static function parse(array $source, string $key): mixed

src/Concerns/ConstructsAggregations.php

@@ -9,7 +9,9 @@
 use Ensi\LaravelElasticQuery\Aggregating\CompositeAggregationBuilder;
 use Ensi\LaravelElasticQuery\Aggregating\Metrics\MinMaxAggregation;
 use Ensi\LaravelElasticQuery\Aggregating\Metrics\ValueCountAggregation;
+use Ensi\LaravelElasticQuery\Contracts\Aggregation;
 use Ensi\LaravelElasticQuery\Filtering\BoolQueryBuilder;
+use Ensi\LaravelElasticQuery\Search\Sorting\Sort;
 
 trait ConstructsAggregations
 {
@@ -19,9 +21,14 @@ trait ConstructsAggregations
     protected AggregationCollection $aggregations;
     protected BoolQueryBuilder $boolQuery;
 
-    public function terms(string $name, string $field, ?int $size = null): static
-    {
-        $this->aggregations->add(new TermsAggregation($name, $this->absolutePath($field), $size));
+    public function terms(
+        string $name,
+        string $field,
+        ?int $size = null,
+        ?Sort $sort = null,
+        ?Aggregation $composite = null,
+    ): static {
+        $this->aggregations->add(new TermsAggregation($name, $this->absolutePath($field), $size, $sort, $composite));
 
         return $this;
     }