Aggregations

- fixed filter
- getter in collection
- buckets from named aggregations

Author: Spamercz

src/Aggregation/LeafAggregationCollection.php

@@ -62,15 +62,17 @@ public function toArray() : array
 
 		foreach ($this->aggregations as $aggregation) {
 			if ($aggregation instanceof \Spameri\ElasticQuery\Aggregation\LeafAggregationCollection) {
-				$array[$this->key()] = [
-					'aggs' => $aggregation->toArray(),
-					'filter' => $this->filter->toArray(),
-				];
+				$array[$this->key()]['aggregations'][$aggregation->key()] = $aggregation->toArray()[$aggregation->key()];
+
 			} else {
-				$array[$this->key()] = $array + $aggregation->toArray();
+				$array[$this->key()]['aggregations'][$aggregation->key()] = $aggregation->toArray();
 			}
 		}
 
+		if ($this->filter) {
+			$array[$this->key()]['filter'] = $this->filter->toArray();
+		}
+
 		return $array;
 	}
 

src/Response/Result/Aggregation.php

@@ -50,7 +50,7 @@ public function position() : int
 	}
 
 
-	public function bucketCollection() : \Spameri\ElasticQuery\Response\Result\Aggregation\BucketCollection
+	public function buckets() : \Spameri\ElasticQuery\Response\Result\Aggregation\BucketCollection
 	{
 		return $this->bucketCollection;
 	}

src/Response/Result/AggregationCollection.php

@@ -25,4 +25,18 @@ public function getIterator() : \ArrayIterator
 		return new \ArrayIterator($this->aggregations);
 	}
 
+
+	public function getAggregation(
+		string $name
+	): ?\Spameri\ElasticQuery\Response\Result\Aggregation
+	{
+		foreach ($this->aggregations as $aggregation) {
+			if ($aggregation->name() === $name) {
+				return $aggregation;
+			}
+		}
+
+		return NULL;
+	}
+
 }

src/Response/ResultMapper.php

@@ -192,6 +192,12 @@ private function mapAggregation(
 			}
 		}
 
+		if (isset($aggregationArray[$name]['buckets'])) {
+			foreach ($aggregationArray[$name]['buckets'] as $bucketPosition => $bucket) {
+				$buckets[] = $this->mapBucket($bucketPosition, $bucket);
+			}
+		}
+
 		if (isset($aggregationArray['doc_count']) && $aggregationArray['doc_count'] > 0) {
 			foreach ($aggregationArray as $aggregationName => $aggregation) {
 				if ( ! \is_array($aggregation)) {
@@ -230,7 +236,9 @@ private function mapBucket(
 		return new \Spameri\ElasticQuery\Response\Result\Aggregation\Bucket(
 			$bucketArray['key'] ?? $bucketPosition,
 			$bucketArray['doc_count'],
-			\is_int($bucketPosition) ? $bucketPosition : NULL
+			\is_int($bucketPosition) ? $bucketPosition : NULL,
+			$bucketArray['from'] ?? NULL,
+			$bucketArray['to'] ?? NULL
 		);
 	}
 

tests/SpameriTests/ElasticQuery/Response/Result.phpt

@@ -93,7 +93,7 @@ class Result extends \Tester\TestCase
 		\Tester\Assert::same(0, $aggregation->position());
 		\Tester\Assert::same('guessedRight', $aggregation->name());
 		/** @var \Spameri\ElasticQuery\Response\Result\Aggregation\Bucket $bucket */
-		foreach ($aggregation->bucketCollection() as $bucket) {
+		foreach ($aggregation->buckets() as $bucket) {
 			if ($bucket->position() === 0) {
 				\Tester\Assert::same(0, $bucket->position());
 				\Tester\Assert::same('7kASSmUBq9pZLj7-1Uv4', $bucket->key());