Merge pull request #158 from martiis/agg_setter

Added sub aggregations setter in AbstractAggregation

Author: saimaz

DSL/Aggregation/AbstractAggregation.php

@@ -24,17 +24,17 @@ abstract class AbstractAggregation implements NamedBuilderInterface
     /**
      * @var string
      */
-    protected $field;
+    private $field;
 
     /**
      * @var string
      */
-    protected $name;
+    private $name;
 
     /**
      * @var NamedBuilderBag
      */
-    public $aggregations;
+    private $aggregations;
 
     /**
      * @return string
@@ -88,6 +88,26 @@ public function getName()
         return self::PREFIX . $this->name;
     }
 
+    /**
+     * Adds a sub-aggregation.
+     *
+     * @param AbstractAggregation $abstractAggregation
+     */
+    public function addAggregation(AbstractAggregation $abstractAggregation)
+    {
+        $this->aggregations->add($abstractAggregation);
+    }
+
+    /**
+     * Returns all sub aggregations.
+     *
+     * @return AbstractAggregation[]
+     */
+    public function getAggregations()
+    {
+        return $this->aggregations->all();
+    }
+
     /**
      * {@inheritdoc}
      */
@@ -114,8 +134,7 @@ public function toArray()
     protected function collectNestedAggregations()
     {
         $result = [];
-        $nested = $this->aggregations->all();
-        foreach ($nested as $aggregation) {
+        foreach ($this->getAggregations() as $aggregation) {
             $result = array_merge($result, $aggregation->toArray());
         }
 

DSL/Aggregation/NestedAggregation.php

@@ -58,7 +58,7 @@ public function getType()
      */
     public function getArray()
     {
-        if (count($this->aggregations) == 0) {
+        if (count($this->getAggregations()) == 0) {
             throw new \LogicException("Nested aggregation `{$this->getName()}` has no aggregations added");
         }
 

DSL/NamedBuilderBag.php

@@ -96,18 +96,18 @@ public function get($name)
     /**
      * Returns all builders contained.
      *
-     * @param string|null $name Builder name.
+     * @param string|null $type Builder type.
      *
      * @return NamedBuilderInterface[]
      */
-    public function all($name = null)
+    public function all($type = null)
     {
         return array_filter(
             $this->bag,
-            function ($builder) use ($name) {
+            function ($builder) use ($type) {
                 /** @var NamedBuilderInterface $builder */
 
-                return $name === null || $builder->getName() == $name;
+                return $type === null || $builder->getType() == $type;
             }
         );
     }

Tests/Functional/DSL/Aggregation/FilterAggregationTest.php

@@ -76,7 +76,7 @@ public function getFilterAggregationData()
 
         $aggregation2 = new StatsAggregation('test_agg_2');
         $aggregation2->setField('price');
-        $aggregation->aggregations->add($aggregation2);
+        $aggregation->addAggregation($aggregation2);
 
         $result = [
             'agg_test_agg' => [

Tests/Functional/DSL/Aggregation/GlobalAggregationTest.php

@@ -79,7 +79,7 @@ public function getGlobalAggregationData()
         $aggregation2->setField('price');
         $aggregation2->addRange(null, 40);
 
-        $aggregation->aggregations->add($aggregation2);
+        $aggregation->addAggregation($aggregation2);
 
         // Case #0 global aggregation without query.
         $out[] = [

Tests/Functional/DSL/Aggregation/NestedAggregationTest.php

@@ -169,7 +169,7 @@ public function testNestedAggregation($aggregation, $expectedResult, $mapping)
         $nestedAggregation = new NestedAggregation('test_nested_agg');
         $nestedAggregation->setPath('sub_products');
 
-        $nestedAggregation->aggregations->add($aggregation);
+        $nestedAggregation->addAggregation($aggregation);
 
         $search = $repo->createSearch()->addAggregation($nestedAggregation);
         $results = $repo->execute($search, Repository::RESULTS_RAW);

Tests/Functional/DSL/Aggregation/RangeAggregationTest.php

@@ -159,7 +159,7 @@ public function testRangeAggregation($aggregation, $expectedResult)
             $aggregation2->setKeyed($childAgg['keyed']);
             $aggregation2->addRange($childAgg['range']['from'], $childAgg['range']['to'], $childAgg['key']);
 
-            $rangeAggregation->aggregations->add($aggregation2);
+            $rangeAggregation->addAggregation($aggregation2);
         }
 
         $search = $repo->createSearch()->addAggregation($rangeAggregation);

Tests/Functional/DSL/Aggregation/TopHitsAggregationTest.php

@@ -189,7 +189,7 @@ public function testTopHitsAggregationNested()
         $topAggregation = new TopHitsAggregation('test-top_hits');
         $termAggregation = new TermsAggregation('test_term');
         $termAggregation->setField('description');
-        $termAggregation->aggregations->add($topAggregation);
+        $termAggregation->addAggregation($topAggregation);
 
         /** @var Repository $repo */
         $repo = $this->getManager()->getRepository('AcmeTestBundle:Product');

Tests/Functional/DSL/Complex/PostFilterAndAggregationTest.php

@@ -89,7 +89,7 @@ public function testBoolWithFuzzyQueryAndSortFilter()
         $filters = $search->getPostFilters();
         $filterAgg->setFilter($filters);
 
-        $filterAgg->aggregations->add($TermsAgg);
+        $filterAgg->addAggregation($TermsAgg);
 
         $search->addAggregation($filterAgg);
 

Tests/Functional/Result/AggregationIteratorFindTest.php

@@ -139,7 +139,7 @@ private function buildAggregation()
         $aggregation->setField('description');
         $aggregation2 = new StatsAggregation('test_agg_2');
         $aggregation2->setField('price');
-        $aggregation->aggregations->add($aggregation2);
+        $aggregation->addAggregation($aggregation2);
 
         return $aggregation;
     }