🐛 Make Model#aggregate(pipeline) work again

11ways · Dec 27, 2024 · 0dd6c5f · 0dd6c5f
1 parent c672882
commit 0dd6c5f
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 8 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,7 @@
 ## 1.4.0-alpha.9 (WIP)
 
 * Fix `Conduit#parseRequest()` forgetting GET query parameters when overriding respone url
+* Make `Model#aggregate(pipeline)` work again
 
 ## 1.4.0-alpha.8 (2024-11-28)
 

diff --git a/lib/class/model.js b/lib/class/model.js
@@ -679,21 +679,26 @@ Model.setMethod(function disableTranslations() {
  *
  * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.5.0
- * @version  0.5.0
+ * @version  1.4.0
  *
  * @param    {Array}    pipeline
  * @param    {Function} callback
  */
-Model.setMethod(function aggregate(pipeline, callback) {
+Model.setMethod(async function aggregate(pipeline, callback) {
 
-	this.datasource.collection(this.table, function gotCollection(err, collection) {
+	let collection = await this.datasource.collection(this.table);
 
-		if (err) {
-			return callback(err);
-		}
+	if (err) {
+		return pledge.reject(err);
+	}
 
-		collection.aggregate(pipeline, callback);
-	});
+	let cursor = collection.aggregate(pipeline);
+
+	if (typeof callback == 'function') {
+		callback(null, cursor);
+	}
+
+	return cursor;
 });
 
 /**