Base aggs on more than one field in a single call

Author: pdphilip

src/DSL/Bridge.php

@@ -164,7 +164,7 @@ public function processAggregationRaw($bodyParams): Results
         try {
             $process = $this->client->search($params);
 
-            return $this->_sanitizeAggsResponse($process, $params, $this->_queryTag(__FUNCTION__));
+            return $this->_sanitizeRawAggsResponse($process, $params, $this->_queryTag(__FUNCTION__));
         } catch (Exception $e) {
 
             $this->throwError($e, $params, $this->_queryTag(__FUNCTION__));
@@ -738,11 +738,17 @@ public function _countAggregate($wheres, $options, $columns): Results
     private function _maxAggregate($wheres, $options, $columns): Results
     {
         $params = $this->buildParams($this->index, $wheres, $options);
+        if (is_array($columns[0])) {
+            $columns = $columns[0];
+        }
         try {
-            $params['body']['aggs']['max_value'] = ParameterBuilder::maxAggregation($columns[0]);
+            foreach ($columns as $column) {
+                $params['body']['aggs']['max_'.$column] = ParameterBuilder::maxAggregation($column);
+            }
             $process = $this->client->search($params);
 
-            return $this->_return($process['aggregations']['max_value']['value'] ?? 0, $process, $params, $this->_queryTag(__FUNCTION__));
+            return $this->_sanitizeAggsResponse($process, $params, $this->_queryTag(__FUNCTION__));
+
         } catch (Exception $e) {
 
             $this->throwError($e, $params, $this->_queryTag(__FUNCTION__));
@@ -756,11 +762,16 @@ private function _maxAggregate($wheres, $options, $columns): Results
     private function _minAggregate($wheres, $options, $columns): Results
     {
         $params = $this->buildParams($this->index, $wheres, $options);
+        if (is_array($columns[0])) {
+            $columns = $columns[0];
+        }
         try {
-            $params['body']['aggs']['min_value'] = ParameterBuilder::minAggregation($columns[0]);
+            foreach ($columns as $column) {
+                $params['body']['aggs']['min_'.$column] = ParameterBuilder::minAggregation($column);
+            }
             $process = $this->client->search($params);
 
-            return $this->_return($process['aggregations']['min_value']['value'] ?? 0, $process, $params, $this->_queryTag(__FUNCTION__));
+            return $this->_sanitizeAggsResponse($process, $params, $this->_queryTag(__FUNCTION__));
         } catch (Exception $e) {
             $this->throwError($e, $params, $this->_queryTag(__FUNCTION__));
         }
@@ -772,13 +783,18 @@ private function _minAggregate($wheres, $options, $columns): Results
      */
     private function _sumAggregate($wheres, $options, $columns): Results
     {
-
         $params = $this->buildParams($this->index, $wheres, $options);
+        if (is_array($columns[0])) {
+            $columns = $columns[0];
+        }
         try {
-            $params['body']['aggs']['sum_value'] = ParameterBuilder::sumAggregation($columns[0]);
+            foreach ($columns as $column) {
+                $params['body']['aggs']['sum_'.$column] = ParameterBuilder::sumAggregation($column);
+            }
             $process = $this->client->search($params);
 
-            return $this->_return($process['aggregations']['sum_value']['value'] ?? 0, $process, $params, $this->_queryTag(__FUNCTION__));
+            return $this->_sanitizeAggsResponse($process, $params, $this->_queryTag(__FUNCTION__));
+
         } catch (Exception $e) {
 
             $this->throwError($e, $params, $this->_queryTag(__FUNCTION__));
@@ -793,11 +809,17 @@ private function _sumAggregate($wheres, $options, $columns): Results
     private function _avgAggregate($wheres, $options, $columns): Results
     {
         $params = $this->buildParams($this->index, $wheres, $options);
+        if (is_array($columns[0])) {
+            $columns = $columns[0];
+        }
         try {
-            $params['body']['aggs']['avg_value'] = ParameterBuilder::avgAggregation($columns[0]);
+            foreach ($columns as $column) {
+                $params['body']['aggs']['avg_'.$column] = ParameterBuilder::avgAggregation($column);
+            }
             $process = $this->client->search($params);
 
-            return $this->_return($process['aggregations']['avg_value']['value'] ?? 0, $process, $params, $this->_queryTag(__FUNCTION__));
+            return $this->_sanitizeAggsResponse($process, $params, $this->_queryTag(__FUNCTION__));
+            
         } catch (Exception $e) {
             $this->throwError($e, $params, $this->_queryTag(__FUNCTION__));
         }
@@ -1075,7 +1097,22 @@ private function _sanitizeHighlights($highlights)
         return $highlights;
     }
 
-    private function _sanitizeAggsResponse($response, $params, $queryTag)
+    public function _sanitizeAggsResponse($response, $params, $queryTag)
+    {
+        $meta['timed_out'] = $response['timed_out'];
+        $meta['total'] = $response['hits']['total']['value'] ?? 0;
+        $meta['max_score'] = $response['hits']['max_score'] ?? 0;
+        $meta['sorts'] = [];
+
+        $aggs = $response['aggregations'];
+        $data = (count($aggs) === 1)
+            ? reset($aggs)['value'] ?? 0
+            : array_map(fn($value) => $value['value'] ?? 0, $aggs);
+
+        return $this->_return($data, $meta, $params, $queryTag);
+    }
+
+    private function _sanitizeRawAggsResponse($response, $params, $queryTag)
     {
         $meta['timed_out'] = $response['timed_out'];
         $meta['total'] = $response['hits']['total']['value'] ?? 0;

src/Eloquent/Docs/ModelDocs.php

@@ -19,6 +19,10 @@
  * @method $this minScore(float $value)
  * @method $this field(string $field, int $boostFactor = null)
  * @method $this fields(array $fields)
+ * @method sum(array|string $columns)
+ * @method min(array|string $columns)
+ * @method max(array|string $columns)
+ * @method avg(array|string $columns)
  * @method search(array $columns = '*')
  * @method query(array $columns = '*')
  * @method toDsl(array $columns = '*')