From e3c281f3cb247dec24f8dfd14c444b8c62b98e07 Mon Sep 17 00:00:00 2001
From: Paul Klimov <klimov.paul@gmail.com>
Date: Tue, 3 Dec 2013 14:18:25 +0200
Subject: [PATCH] Mongo Collection "aggregate" method interface refactored.

---
 extensions/mongo/Collection.php | 22 +++++++++++++++-------
 extensions/mongo/Query.php      |  4 ++--
 2 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/extensions/mongo/Collection.php b/extensions/mongo/Collection.php
index ba631e9..e92480b 100644
--- a/extensions/mongo/Collection.php
+++ b/extensions/mongo/Collection.php
@@ -349,19 +349,27 @@ class Collection extends Object
 	/**
 	 * Performs aggregation using Mongo Aggregation Framework.
 	 * @param array $pipeline list of pipeline operators, or just the first operator
-	 * @param array $pipelineOperator Additional pipeline operators
+	 * @param array $pipelineOperator additional pipeline operator. You can specify additional
+	 * pipelines via third argument, fourth argument etc.
 	 * @return array the result of the aggregation.
+	 * @throws Exception on failure.
 	 * @see http://docs.mongodb.org/manual/applications/aggregation/
 	 */
 	public function aggregate($pipeline, $pipelineOperator = [])
 	{
 		$token = 'Aggregating from ' . $this->getFullName();
 		Yii::info($token, __METHOD__);
-		Yii::beginProfile($token, __METHOD__);
-		$args = func_get_args();
-		$result = call_user_func_array([$this->mongoCollection, 'aggregate'], $args);
-		Yii::endProfile($token, __METHOD__);
-		return $result;
+		try {
+			Yii::beginProfile($token, __METHOD__);
+			$args = func_get_args();
+			$result = call_user_func_array([$this->mongoCollection, 'aggregate'], $args);
+			$this->tryResultError($result);
+			Yii::endProfile($token, __METHOD__);
+			return $result['result'];
+		} catch (\Exception $e) {
+			Yii::endProfile($token, __METHOD__);
+			throw new Exception($e->getMessage(), (int)$e->getCode(), $e);
+		}
 	}
 
 	/**
@@ -377,8 +385,8 @@ class Collection extends Object
 	 *  - condition - criteria for including a document in the aggregation.
 	 *  - finalize - function called once per unique key that takes the final output of the reduce function.
 	 * @return array the result of the aggregation.
-	 * @see http://docs.mongodb.org/manual/reference/command/group/
 	 * @throws Exception on failure.
+	 * @see http://docs.mongodb.org/manual/reference/command/group/
 	 */
 	public function group($keys, $initial, $reduce, $options = [])
 	{
diff --git a/extensions/mongo/Query.php b/extensions/mongo/Query.php
index 6259b99..16fd8db 100644
--- a/extensions/mongo/Query.php
+++ b/extensions/mongo/Query.php
@@ -244,8 +244,8 @@ class Query extends Component implements QueryInterface
 			]
 		];
 		$result = $collection->aggregate($pipelines);
-		if (!empty($result['ok'])) {
-			return $result['result'][0]['total'];
+		if (array_key_exists(0, $result)) {
+			return $result[0]['total'];
 		} else {
 			return 0;
 		}