alchemymvc 1.1.7 → 1.2.0

package/lib/app/datasource/mongo_datasource.js

@@ -228,7 +228,7 @@ Mongo.setMethod(function collection(name, callback) {
  *
  * @author   Jelle De Loecker   <jelle@develry.be>
  * @since    0.2.0
- * @version  1.1.0
+ * @version  1.2.0
  */
 Mongo.setMethod(function _read(model, criteria, callback) {
 
@@ -250,22 +250,87 @@ Mongo.setMethod(function _read(model, criteria, callback) {
 
 		if (compiled.pipeline) {
 
-			collection.aggregate(compiled.pipeline, {}, function gotAggregate(err, cursor) {
+			// Sorting should happen in the pipeline
+			if (options.sort && options.sort.length) {
+				let sort_object = {};
 
-				if (err) {
-					return callback(err);
+				for (let entry of options.sort) {
+					sort_object[entry[0]] = entry[1];
 				}
 
-				cursor.toArray(function gotArray(err, items) {
+				compiled.pipeline.unshift({$sort: sort_object});
+			}
+
+			// Skipping also happens in the pipeline
+			if (options.skip) {
+				compiled.pipeline.push({$skip: options.skip});
+			}
+
+			let aggregate_options = {};
 
-					if (err) {
-						return callback(err);
+			// Limits can still be set as an option though
+			if (options.limit) {
+				aggregate_options.limit = options.limit;
+			}
+
+			Function.parallel({
+				available: function getAvailable(next) {
+
+					if (criteria.options.available === false) {
+						return next(null, null);
 					}
 
-					items = that.organizeResultItems(model, items);
+					let pipeline = JSON.clone(compiled.pipeline),
+					    cloned_options = JSON.clone(aggregate_options);
+
+					pipeline.push({$count: 'available'});
+
+					// Expensive aggregate just to get the available count...
+					collection.aggregate(pipeline, cloned_options, function gotAggregate(err, cursor) {
+
+						if (err) {
+							return next(err);
+						}
+
+						cursor.toArray(function gotAvailableArray(err, items) {
+
+							if (err) {
+								return next(err);
+							}
+
+							if (!items || !items.length) {
+								return next(null, null);
+							}
+
+							let available = items[0].available;
+
+							if (options.skip) {
+								available += options.skip;
+							}
+
+							return next(null, available);
+						});
+					});
+				},
+				items: function getItems(next) {
+					collection.aggregate(compiled.pipeline, aggregate_options, function gotAggregate(err, cursor) {
+
+						if (err) {
+							return next(err);
+						}
+
+						cursor.toArray(next);
+					});
+				}
+			}, function done(err, data) {
+
+				if (err) {
+					return callback(err);
+				}
+
+				data.items = that.organizeResultItems(model, data.items);
 
-					callback(null, items);
-				});
+				callback(err, data.items, data.available);
 			});
 
 			return;