Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2026-05-07 18:56:57 +02:00
Code Issues Packages Projects Releases Wiki Activity

removed redismock, added database mocked, fixed tests to work with dbal

Browse Source
This commit is contained in:
Baris Usakli
2013-12-06 13:21:21 -05:00
parent 6313a5eeb1
commit 0da141e7bc
8 changed files with 124 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/database/mongo.js
View File

@@ -118,9 +118,14 @@
db.dropDatabase(function(err, result) {
if(err){
winston.error(error);
return callback(err);
if(callback) {
return callback(err);
}
}
if(callback) {
callback(null);
}
callback(null);
});
}
@@ -379,7 +384,10 @@
// sets
module.setAdd = function(key, value, callback) {
db.collection('objects').update({_key:key}, {$addToSet: { members: value.toString() }}, {upsert:true, w: 1}, function(err, result) {
if(value !== null && value !== undefined) {
value = value.toString();
}
db.collection('objects').update({_key:key}, {$addToSet: { members: value }}, {upsert:true, w: 1}, function(err, result) {
if(callback) {
callback(err, result);
}
@@ -387,7 +395,10 @@
}
module.setRemove = function(key, value, callback) {
db.collection('objects').update({_key:key, members: value.toString()}, {$pull : {members: value}}, function(err, result) {
if(value !== null && value !== undefined) {
value = value.toString();
}
db.collection('objects').update({_key:key, members: value}, {$pull : {members: value}}, function(err, result) {
if(callback) {
callback(err, result);
}
@@ -395,7 +406,10 @@
}
module.isSetMember = function(key, value, callback) {
db.collection('objects').findOne({_key:key, members: value.toString()}, function(err, item) {
if(value !== null && value !== undefined) {
value = value.toString();
}
db.collection('objects').findOne({_key:key, members: value}, function(err, item) {
callback(err, item !== null && item !== undefined);
});
}
@@ -650,13 +664,20 @@
db.collection('objects').update({_key: key }, { $pop: { array: 1 } }, function(err, result) {
if(err) {
return callback(err);
if(callback) {
return callback(err);
}
return;
}
if(value && value.length) {
callback(err, value[0]);
if(callback) {
callback(err, value[0]);
}
} else {
callback(err, null);
if(callback) {
callback(err, null);
}
}
});
});

6
src/websockets.js
View File

@@ -1152,8 +1152,10 @@ websockets.init = function(io) {
return io.sockets.in(room);
};
}
websockets.getConnectedClients = function() {
return userSockets;
}
}
})(module.exports);
})(module.exports);