change union to match intersect

accept aggregate and withscores

src/database/mongo/sorted.js

@@ -474,48 +474,64 @@ module.exports = function(db, module) {
 		});
 	};
 
-	module.getSortedSetUnion = function(sets, start, stop, callback) {
+	module.getSortedSetUnion = function(params, callback) {
-		getSortedSetUnion(sets, 1, start, stop, callback);
+		params.sort = 1;
+		getSortedSetUnion(params, callback);
 	};
 
-	module.getSortedSetRevUnion = function(sets, start, stop, callback) {
+	module.getSortedSetRevUnion = function(params, callback) {
-		getSortedSetUnion(sets, -1, start, stop, callback);
+		params.sort = -1;
+		getSortedSetUnion(params, callback);
 	};
 
 
-	function getSortedSetUnion(sets, sort, start, stop, callback) {
+	function getSortedSetUnion(params, callback) {
-		if (!Array.isArray(sets) || !sets.length) {
+		if (!Array.isArray(params.sets) || !params.sets.length) {
 			return callback();
 		}
-		var limit = stop - start + 1;
+		var limit = params.stop - params.start + 1;
 		if (limit <= 0) {
 			limit = 0;
 		}
 
+		var aggregate = {};
+		if (params.aggregate) {
+			aggregate['$' + params.aggregate.toLowerCase()] = '$score';
+		} else {
+			aggregate.$sum = '$score';
+		}
+
 		var pipeline = [
-			{ $match: { _key: {$in: sets}} },
+			{ $match: { _key: {$in: params.sets}} },
-			{ $group: { _id: {value: '$value'}, totalScore: {$sum : "$score"}} },
+			{ $group: { _id: {value: '$value'}, totalScore: aggregate} },
-			{ $sort: { totalScore: sort} }
+			{ $sort: { totalScore: params.sort} }
 		];
 
-		if (start) {
+		if (params.start) {
-			pipeline.push({ $skip: start });
+			pipeline.push({ $skip: params.start });
 		}
 
 		if (limit > 0) {
 			pipeline.push({ $limit: limit });
 		}
 
-		pipeline.push({	$project: { _id: 0, value: '$_id.value' }});
+		var project = { _id: 0, value: '$_id.value' };
+		if (params.withScores) {
+			project.score = '$totalScore';
+		}
+		pipeline.push({	$project: project });
 
 		db.collection('objects').aggregate(pipeline, function(err, data) {
 			if (err || !data) {
 				return callback(err);
 			}
 
-			data = data.map(function(item) {
+			if (!params.withScores) {
-				return item.value;
+				data = data.map(function(item) {
-			});
+					return item.value;
+				});
+			}
+
 			callback(null, data);
 		});
 	}

src/database/redis/sorted.js

@@ -232,32 +232,34 @@ module.exports = function(redisClient, module) {
 		multi.exec(callback);
 	};
 
-	module.getSortedSetUnion = function(sets, start, stop, callback) {
+	module.getSortedSetUnion = function(params, callback) {
-		sortedSetUnion('zrange', sets, start, stop, false, callback);
+		params.method = 'zrange';
+		sortedSetUnion(params, callback);
 	};
 
-	module.getSortedSetRevUnion = function(sets, start, stop, callback) {
+	module.getSortedSetRevUnion = function(params, callback) {
-		sortedSetUnion('zrevrange', sets, start, stop, false, callback);
+		params.method = 'zrevrange';
+		sortedSetUnion(params, callback);
 	};
 
-	function sortedSetUnion(method, sets, start, stop, withScores, callback) {
+	function sortedSetUnion(params, callback) {
 
 		var tempSetName = 'temp_' + Date.now();
 
-		var params = [tempSetName, start, stop];
+		var rangeParams = [tempSetName, params.start, params.stop];
-		if (withScores) {
+		if (params.withScores) {
 			params.push('WITHSCORES');
 		}
 
 		var multi = redisClient.multi();
-		multi.zunionstore([tempSetName, sets.length].concat(sets));
+		multi.zunionstore([tempSetName, params.sets.length].concat(params.sets));
-		multi[method](params);
+		multi[params.method](rangeParams);
 		multi.del(tempSetName);
 		multi.exec(function(err, results) {
 			if (err) {
 				return callback(err);
 			}
-			if (!withScores) {
+			if (!params.withScores) {
 				return callback(null, results ? results[1] : null);
 			}
 			results = results[1] || [];

tests/database/sorted.js

@@ -438,7 +438,7 @@ describe('Sorted Set methods', function() {
 
 	describe('getSortedSetUnion()', function() {
 		it('should return an array of values from both sorted sets sorted by scores lowest to highest', function(done) {
-			db.getSortedSetUnion(['sortedSetTest2', 'sortedSetTest3'], 0, -1, function(err, values) {
+			db.getSortedSetUnion({sets: ['sortedSetTest2', 'sortedSetTest3'], start: 0, stop: -1}, function(err, values) {
 				assert.equal(err, null);
 				assert.equal(arguments.length, 2);
 				assert.deepEqual(values, ['value1', 'value2', 'value4']);
@@ -449,7 +449,7 @@ describe('Sorted Set methods', function() {
 
 	describe('getSortedSetRevUnion()', function() {
 		it('should return an array of values from both sorted sets sorted by scores highest to lowest', function(done) {
-			db.getSortedSetRevUnion(['sortedSetTest2', 'sortedSetTest3'], 0, -1, function(err, values) {
+			db.getSortedSetRevUnion({sets: ['sortedSetTest2', 'sortedSetTest3'], start: 0, stop: -1}, function(err, values) {
 				assert.equal(err, null);
 				assert.equal(arguments.length, 2);
 				assert.deepEqual(values, ['value4', 'value2', 'value1']);