From 8dce99250b3fd28a02061399d1d1cc9bc266e532 Mon Sep 17 00:00:00 2001
From: barisusakli <barisusakli@gmail.com>
Date: Thu, 24 Jul 2014 12:41:22 -0400
Subject: [PATCH] final fix for #1884

fix mongo functions so they return correct data if duplicate keys are
passed. getObjects(['post:1', 'post:1'], callback) was only returning
one object.
---
 src/database/mongo/hash.js    | 10 +++++-----
 src/database/mongo/helpers.js | 22 ++++++----------------
 src/database/mongo/sorted.js  |  5 +++--
 3 files changed, 14 insertions(+), 23 deletions(-)

diff --git a/src/database/mongo/hash.js b/src/database/mongo/hash.js
index f157342885..d116038bf9 100644
--- a/src/database/mongo/hash.js
+++ b/src/database/mongo/hash.js
@@ -20,17 +20,16 @@ module.exports = function(db, module) {
 	};
 
 	module.getObjects = function(keys, callback) {
-
-		db.collection('objects').find({_key:{$in:keys}}, {_id:0}).toArray(function(err, data) {
-
+		db.collection('objects').find({_key: {$in: keys}}, {_id: 0}).toArray(function(err, data) {
 			if(err) {
 				return callback(err);
 			}
 
+			var map = helpers.toMap(data);
 			var returnData = [];
 
 			for(var i=0; i<keys.length; ++i) {
-				returnData.push(helpers.findItem(data, keys[i]));
+				returnData.push(map[keys[i]]);
 			}
 
 			callback(null, returnData);
@@ -70,12 +69,13 @@ module.exports = function(db, module) {
 				items = [];
 			}
 
+			var map = helpers.toMap(items);
 			var returnData = [],
 				index = 0,
 				item;
 
 			for (var i=0; i<keys.length; ++i) {
-				var item = helpers.findItem(items, keys[i]) || {};
+				var item = map[keys[i]] || {};
 
 				for (var k=0; k<fields.length; ++k) {
 					if (item[fields[k]] === null || item[fields[k]] === undefined) {
diff --git a/src/database/mongo/helpers.js b/src/database/mongo/helpers.js
index ec8571ea4f..ca44a2cb46 100644
--- a/src/database/mongo/helpers.js
+++ b/src/database/mongo/helpers.js
@@ -2,23 +2,13 @@
 
 var helpers = {};
 
-helpers.findItem = function(data, key) {
-	if(!data) {
-		return null;
+helpers.toMap = function(data) {
+	var map = {};
+	for (var i = 0; i<data.length; ++i) {
+		map[data[i]._key] = data[i];
 	}
-
-	for(var i=0; i<data.length; ++i) {
-		if(data[i]._key === key) {
-			var item = data.splice(i, 1);
-			if(item && item.length) {
-				return item[0];
-			} else {
-				return null;
-			}
-		}
-	}
-	return null;
-};
+	return map;
+}
 
 helpers.fieldToString = function(field) {
 	if(field === null || field === undefined) {
diff --git a/src/database/mongo/sorted.js b/src/database/mongo/sorted.js
index 069061679c..9c0a76bfda 100644
--- a/src/database/mongo/sorted.js
+++ b/src/database/mongo/sorted.js
@@ -155,11 +155,12 @@ module.exports = function(db, module) {
 				return callback(err);
 			}
 
-			var returnData = [],
+			var map = helpers.toMap(result),
+				returnData = [],
 				item;
 
 			for(var i=0; i<keys.length; ++i) {
-				item = helpers.findItem(result, keys[i]);
+				item = map[keys[i]];
 				returnData.push(item ? item.score : null);
 			}