moved updateCategoryField out, db.delete only sends back err

src/categories/unread.js

@@ -34,9 +34,7 @@ module.exports = function(Categories) {
 
 	Categories.markAsUnreadForAll = function(cid, callback) {
 		callback = callback || function() {};
-		db.delete('cid:' + cid + ':read_by_uid', function(err) {
-			callback(err);
-		});
+		db.delete('cid:' + cid + ':read_by_uid', callback);
 	};
 
 	Categories.hasReadCategories = function(cids, uid, callback) {

src/categories/update.js

@@ -19,23 +19,6 @@ module.exports = function(Categories) {
 			}, next);
 		}
 
-		function updateCategoryField(cid, key, value, next) {
-			db.setObjectField('category:' + cid, key, value, function(err) {
-				if(err) {
-					return next(err);
-				}
-
-				if (key === 'name') {
-					var slug = cid + '/' + utils.slugify(value);
-					db.setObjectField('category:' + cid, 'slug', slug, next);
-				} else if (key === 'order') {
-					db.sortedSetAdd('categories:cid', value, cid, next);
-				} else {
-					next();
-				}
-			});
-		}
-
 		var cids = Object.keys(modified);
 
 		async.each(cids, updateCategory, function(err) {
@@ -43,4 +26,21 @@ module.exports = function(Categories) {
 		});
 	};
 
+	function updateCategoryField(cid, key, value, callback) {
+		db.setObjectField('category:' + cid, key, value, function(err) {
+			if (err) {
+				return callback(err);
+			}
+
+			if (key === 'name') {
+				var slug = cid + '/' + utils.slugify(value);
+				db.setObjectField('category:' + cid, 'slug', slug, callback);
+			} else if (key === 'order') {
+				db.sortedSetAdd('categories:cid', value, cid, callback);
+			} else {
+				callback();
+			}
+		});
+	}
+
 };

src/database/mongo/main.js

@@ -81,7 +81,9 @@ module.exports = function(db, module) {
 		if (!key) {
 			return callback();
 		}
-		db.collection('objects').remove({_key: key}, callback);
+		db.collection('objects').remove({_key: key}, function(err, res) {
+			callback(err);
+		});
 	};
 
 	module.deleteAll = function(keys, callback) {

src/database/redis/main.js

@@ -70,7 +70,9 @@ module.exports = function(redisClient, module) {
 	};
 
 	module.delete = function(key, callback) {
-		redisClient.del(key, callback);
+		redisClient.del(key, function(err, res) {
+			callback(err);
+		});
 	};
 
 	module.deleteAll = function(keys, callback) {