Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-11-01 19:46:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

fixed mongo setAdd and setRemove to accept arrays like redis, fixed infinite scroll for mongo

Browse Source
This commit is contained in:
Baris Soner Usakli
2014-02-21 14:53:31 -05:00
parent 15f19653c5
commit ae93c372ff
2 changed files with 48 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
src/database/mongo.js
View File

@@ -20,6 +20,7 @@
module.init = function(callback) {
mongoClient.connect('mongodb://'+ nconf.get('mongo:host') + ':' + nconf.get('mongo:port') + '/' + nconf.get('mongo:database'), function(err, _db) {
if(err) {
winston.error("NodeBB could not connect to your Mongo database. Mongo returned the following error: " + err.message);
@@ -424,10 +425,23 @@
// sets
module.setAdd = function(key, value, callback) {
if(value !== null && value !== undefined) {
value = value.toString();
if(!Array.isArray(value)) {
value = [value];
}
db.collection('objects').update({_key:key}, {$addToSet: { members: value }}, {upsert:true, w: 1}, function(err, result) {
value.forEach(function(element, index, array) {
array[index] = element ? element.toString() : element;
});
db.collection('objects').update({_key:key},
{
$addToSet: { members: { $each: value } }
},
{
upsert:true, w: 1
}
, function(err, result) {
if(typeof callback === 'function') {
callback(err, result);
}
@@ -435,10 +449,15 @@
}
module.setRemove = function(key, value, callback) {
if(value !== null && value !== undefined) {
value = value.toString();
if(!Array.isArray(value)) {
value = [value];
}
db.collection('objects').update({_key:key, members: value}, {$pull : {members: value}}, function(err, result) {
value.forEach(function(element, index, array) {
array[index] = element ? element.toString() : element;
});
db.collection('objects').update( { _key: key }, { $pullAll: { members: value } }, function(err, result) {
if(typeof callback === 'function') {
callback(err, result);
}
@@ -456,17 +475,26 @@
}
module.isMemberOfSets = function(sets, value, callback) {
function iterator(set, next) {
module.isSetMember(set, value, function(err, result) {
if(err) {
return next(err);
}
next(null, result?1:0);
});
if(value !== null && value !== undefined) {
value = value.toString();
}
async.map(sets, iterator, callback);
db.collection('objects').find({_key: {$in : sets}, members: value}).toArray(function(err, result) {
if(err) {
return callback(err);
}
result = result.map(function(item) {
return item._key;
});
result = sets.map(function(set) {
return result.indexOf(set) !== -1 ? 1 : 0;
});
callback(err, result);
});
}
module.getSetMembers = function(key, callback) {
@@ -655,16 +683,18 @@
if(value !== null && value !== undefined) {
value = value.toString();
}
module.getSortedSetRange(key, 0, -1, function(err, result) {
module.getSortedSetRevRange(key, 0, -1, function(err, result) {
if(err) {
return callback(err);
}
var rank = result.indexOf(value);
if(rank === -1) {
return callback(null, null);
}
callback(null, result.length - rank - 1);
callback(null, rank);
});
}