refactor routesUser test

thegameofcode · Mar 16, 2016 · 4e4fa23 · 4e4fa23
1 parent 093d24c
commit 4e4fa23
Show file tree

Hide file tree

Showing 7 changed files with 92 additions and 262 deletions.
diff --git a/src/managers/redis.js b/src/managers/redis.js
@@ -25,7 +25,7 @@ function disconnect(cbk) {
 		return cbk();
 	}
 
-	redisClient.end();
+	redisClient.end(false);
 	isConnected = false;
 	return cbk(null, false);
 }

diff --git a/src/routes_internal/user/addUserRealm_post.js b/src/routes_internal/user/addUserRealm_post.js
@@ -1,20 +1,11 @@
 'use strict';
 
 const userMng = require('../../managers/user');
+const responseError = require('../../util/response_errors');
 
 module.exports = function (req, res, next) {
 	userMng().addRealmToUser(req.user._id, req.body.name, function (err) {
-		if (err) {
-			if (!err.code) {
-				res.send(500, err);
-				return next(err);
-			}
-
-			const errCode = err.code;
-			delete(err.code);
-			res.send(errCode, err);
-			return next(err);
-		}
+		if( err ) return responseError(err, res, next);
 
 		res.send(204);
 		return next();

diff --git a/src/routes_internal/user/removeUserRealm_del.js b/src/routes_internal/user/removeUserRealm_del.js
@@ -1,20 +1,11 @@
 'use strict';
 
 const userMng = require('../../managers/user');
+const responseError = require('../../util/response_errors');
 
 module.exports = function (req, res, next) {
 	userMng().removeRealmFromUser(req.user._id, req.body.name, function (err) {
-		if (err) {
-			if (!err.code) {
-				res.send(500, err);
-				return next(err);
-			}
-
-			const errCode = err.code;
-			delete(err.code);
-			res.send(errCode, err);
-			return next(err);
-		}
+		if( err ) return responseError(err, res, next);
 
 		res.send(200);
 		return next();

diff --git a/src/routes_public/user/addUserRealm_post.js b/src/routes_public/user/addUserRealm_post.js
@@ -1,21 +1,12 @@
 'use strict';
 
 const userMng = require('../../managers/user');
+const responseError = require('../../util/response_errors');
 
 module.exports = function (req, res, next) {
 
 	userMng().addRealmToUser(req.user._id, req.body.name, function (err) {
-		if (err) {
-			if (!err.code) {
-				res.send(500, err);
-				return next(err);
-			}
-
-			const errCode = err.code;
-			delete(err.code);
-			res.send(errCode, err);
-			return next(err);
-		}
+		if( err ) return responseError(err, res, next);
 
 		res.send(204);
 		return next();

diff --git a/src/routes_public/user/removeUserRealm_del.js b/src/routes_public/user/removeUserRealm_del.js
@@ -1,21 +1,12 @@
 'use strict';
 
 const userMng = require('../../managers/user');
+const responseError = require('../../util/response_errors');
 
 module.exports = function (req, res, next) {
 
 	userMng().removeRealmFromUser(req.user._id, req.body.name, function (err) {
-		if (err) {
-			if (!err.code) {
-				res.send(500, err);
-				return next(err);
-			}
-
-			const errCode = err.code;
-			delete(err.code);
-			res.send(errCode, err);
-			return next(err);
-		}
+		if( err ) return responseError(err, res, next);
 
 		res.send(200);
 		return next();

diff --git a/src/util/response_errors.js b/src/util/response_errors.js
@@ -0,0 +1,14 @@
+'use strict';
+
+module.exports = function (err, res, next) {
+	if (!err.code) {
+		res.send(500, err);
+		return next(err);
+	}
+
+	const errCode = err.code;
+	delete(err.code);
+	res.send(errCode, err);
+	return next(err);
+
+};