Merge pull request #358 from Flowpack/task/only-apply-size-if-set

TASK: Only apply the size parameter if set

Author: daniellienert

Classes/Eel/ElasticSearchQueryBuilder.php

@@ -407,19 +407,22 @@ public function queryFilterMultiple(array $data, $clauseType = 'must'): ElasticS
      * @param string $field The field to aggregate by
      * @param string $type Aggregation type
      * @param string $parentPath
-     * @param int $size The amount of buckets to return
+     * @param int|null $size The amount of buckets to return or null if not applicable to the aggregation
      * @return ElasticSearchQueryBuilder
      * @throws QueryBuildingException
      */
-    public function fieldBasedAggregation(string $name, string $field, string $type = 'terms', string $parentPath = '', int $size = 10): ElasticSearchQueryBuilder
+    public function fieldBasedAggregation(string $name, string $field, string $type = 'terms', string $parentPath = '', ?int $size = null): ElasticSearchQueryBuilder
     {
         $aggregationDefinition = [
             $type => [
-                'field' => $field,
-                'size' => $size
+                'field' => $field
             ]
         ];
 
+        if ($size !== null) {
+            $aggregationDefinition[$type]['size'] = $size;
+        }
+
         $this->aggregation($name, $aggregationDefinition, $parentPath);
 
         return $this;

Tests/Functional/Eel/ElasticSearchQueryTest.php

@@ -162,6 +162,7 @@ public function limitImpactGetAccessibleCount(): void
 
     /**
      * @test
+     * @throws QueryBuildingException
      */
     public function fieldBasedAggregations(): void
     {
@@ -173,7 +174,6 @@ public function fieldBasedAggregations(): void
             ->getAggregations();
 
         static::assertArrayHasKey($aggregationTitle, $result);
-
         static::assertCount(3, $result[$aggregationTitle]['buckets']);
 
         $expectedChickenBucket = [

Tests/Unit/Eel/ElasticSearchQueryBuilderTest.php

@@ -331,30 +331,29 @@ public function anSimpleAggregationCanBeAddedToTheRequest(string $type, string $
 
     /**
      * @test
+     * @throws QueryBuildingException
      */
     public function anAggregationCanBeSubbedUnderAPath(): void
     {
         $this->queryBuilder->fieldBasedAggregation('foo', 'bar');
-        $this->queryBuilder->fieldBasedAggregation('bar', 'bar', 'terms', 'foo');
+        $this->queryBuilder->fieldBasedAggregation('bar', 'bar', 'terms', 'foo', 22);
         $this->queryBuilder->fieldBasedAggregation('baz', 'bar', 'terms', 'foo.bar');
 
         $expected = [
             'foo' => [
                 'terms' => [
                     'field' => 'bar',
-                    'size' => 10
                 ],
                 'aggregations' => [
                     'bar' => [
                         'terms' => [
                             'field' => 'bar',
-                            'size' => 10
+                            'size' => 22
                         ],
                         'aggregations' => [
                             'baz' => [
                                 'terms' => [
                                     'field' => 'bar',
-                                    'size' => 10
                                 ],
                             ]
                         ]