Merge pull request #241 from bartjuh4/nested_aggregations

Add support for nested aggregations
Jeroen-G · Apr 26, 2024 · e9968d8 · e9968d8
2 parents 3a0283c + ba87f57
commit e9968d8
Show file tree

Hide file tree

Showing 9 changed files with 281 additions and 32 deletions.
diff --git a/infection.json b/infection.json
@@ -8,7 +8,7 @@
             "ExplorerServiceProvider.php",
             "Infrastructure/Console",
             "Infrastructure/Scout/ElasticEngine",
-            "Infrastructure/Elastic/ElasticAdapter",
+            "Infrastructure/Elastic/ElasticClientBuilder",
             "Infrastructure/Elastic/ElasticIndexAdapter",
             "Infrastructure/Elastic/ElasticDocumentAdapter"
         ]

diff --git a/src/Application/Results.php b/src/Application/Results.php
@@ -31,11 +31,7 @@ public function aggregations(): array
 
         foreach ($this->rawResults['aggregations'] as $name => $rawAggregation) {
             if (array_key_exists('doc_count', $rawAggregation)) {
-                foreach ($rawAggregation as $nestedAggregationName => $rawNestedAggregation) {
-                    if (isset($rawNestedAggregation['buckets'])) {
-                        $aggregations[] = new AggregationResult($nestedAggregationName, $rawNestedAggregation['buckets']);
-                    }
-                }
+                $aggregations = array_merge($aggregations, $this->parseNestedAggregations($rawAggregation));
                 continue;
             }
 
@@ -49,4 +45,24 @@ public function count(): int
     {
         return $this->rawResults['hits']['total']['value'];
     }
+
+    /** @return AggregationResult[] */
+    private function parseNestedAggregations(array $rawAggregation): array
+    {
+        $aggregations = [];
+        foreach ($rawAggregation as $nestedAggregationName => $rawNestedAggregation) {
+            if (isset($rawNestedAggregation['buckets'])) {
+                $aggregations[] = new AggregationResult($nestedAggregationName, $rawNestedAggregation['buckets']);
+            }
+
+            if (isset($rawNestedAggregation['doc_count'])) {
+                $nested = $this->parseNestedAggregations($rawNestedAggregation);
+                foreach ($nested as $item) {
+                    $aggregations[] = $item;
+                }
+            }
+        }
+
+        return $aggregations;
+    }
 }
diff --git a/src/Domain/Aggregations/NestedFilteredAggregation.php b/src/Domain/Aggregations/NestedFilteredAggregation.php
@@ -0,0 +1,83 @@
+<?php
+
+declare(strict_types=1);
+
+namespace JeroenG\Explorer\Domain\Aggregations;
+
+final class NestedFilteredAggregation implements AggregationSyntaxInterface
+{
+    private string $path;
+
+    private string $name;
+
+    private string $field;
+
+    /**
+     * @var array<string, mixed>
+     */
+    private array $filters;
+
+    private int $size;
+
+    /**
+     * @param array<string, mixed> $filters
+     */
+    public function __construct(string $path, string $name, string $field, array $filters, int $size = 10)
+    {
+        $this->path = $path;
+        $this->name = $name;
+        $this->field = $field;
+        $this->size = $size;
+        $this->filters = $filters;
+    }
+
+    /**
+     * @return array<string, mixed>
+     */
+    public function build(): array
+    {
+        return [
+            'nested' => [
+                'path' => $this->path,
+            ],
+            'aggs' => [
+                'filter_aggs' => [
+                    'filter' => $this->buildElasticFilters(),
+                    'aggs' => [
+                        $this->name => [
+                            'terms' => [
+                                'field' => $this->path . '.' . $this->field,
+                                'size' => $this->size,
+                            ],
+                        ],
+                    ],
+                ],
+            ],
+        ];
+    }
+
+    /**
+     * @return array<string, mixed>
+     */
+    private function buildElasticFilters(): array
+    {
+        $elasticFilters = [];
+        foreach ($this->filters as $field => $filterValues) {
+            $elasticFilters[] = [
+                'terms' => [
+                    $this->path . '.' . $field => $filterValues,
+                ],
+            ];
+        }
+
+        return [
+            'bool' => [
+                'should' => [
+                    'bool' => [
+                        'must' => $elasticFilters,
+                    ],
+                ],
+            ],
+        ];
+    }
+}
diff --git a/src/Domain/IndexManagement/DirectIndexConfiguration.php b/src/Domain/IndexManagement/DirectIndexConfiguration.php
@@ -4,8 +4,6 @@
 
 namespace JeroenG\Explorer\Domain\IndexManagement;
 
-use Webmozart\Assert\Assert;
-
 final class DirectIndexConfiguration implements IndexConfigurationInterface
 {
     private function __construct(

diff --git a/src/Infrastructure/Elastic/FakeResponse.php b/src/Infrastructure/Elastic/FakeResponse.php
@@ -4,10 +4,6 @@
 
 namespace JeroenG\Explorer\Infrastructure\Elastic;
 
-use Elasticsearch\Client;
-use GuzzleHttp\Ring\Future\FutureArrayInterface;
-use JeroenG\Explorer\Application\Results;
-use JeroenG\Explorer\Application\SearchCommandInterface;
 use Webmozart\Assert\Assert;
 
 class FakeResponse

diff --git a/src/Infrastructure/Scout/Builder.php b/src/Infrastructure/Scout/Builder.php
@@ -4,7 +4,6 @@
 
 namespace JeroenG\Explorer\Infrastructure\Scout;
 
-use JeroenG\Explorer\Application\Paginator;
 use JeroenG\Explorer\Domain\Aggregations\AggregationSyntaxInterface;
 use JeroenG\Explorer\Domain\Query\QueryProperties\QueryProperty;
 use JeroenG\Explorer\Domain\Syntax\Compound\BoolQuery;

diff --git a/src/Infrastructure/Scout/ScoutSearchCommandBuilder.php b/src/Infrastructure/Scout/ScoutSearchCommandBuilder.php
@@ -12,7 +12,6 @@
 use JeroenG\Explorer\Domain\Syntax\Compound\QueryType;
 use JeroenG\Explorer\Domain\Syntax\MultiMatch;
 use JeroenG\Explorer\Domain\Syntax\Sort;
-use JeroenG\Explorer\Domain\Syntax\SyntaxInterface;
 use JeroenG\Explorer\Domain\Syntax\Term;
 use JeroenG\Explorer\Domain\Syntax\Terms;
 use Laravel\Scout\Builder;