Explorar o código

Refactor file

sbkwgh %!s(int64=7) %!d(string=hai) anos
pai
achega
65b53e44cf
Modificáronse 1 ficheiros con 77 adicións e 40 borrados
  1. 77 40
      lib/errors.js

+ 77 - 40
lib/errors.js

@@ -1,58 +1,95 @@
 let Errors = {
-	unknown: ['An unknown error occured on our end. Please try again later', 500],
-	accountAlreadyCreated: ['This account has already been created', 400],
-	categoryAlreadyExists: ['This category has already been created', 400],
-	accountDoesNotExist: ['This account does not exist', 400],
-	invalidCategory: ['This category does not exist', 400],
-	invalidLoginCredentials: ['The username or password provided was incorrect', 401],
-	requestNotAuthorized: ['The request was not authorized', 401],
-	invalidToken: ['The token provided was not valid', 401],
-	noSettings: ['You haven\'t added any settings yet', 500],
-	passwordSame: ['You can\'t set it to the same password', 400],
-	cannotLikeOwnPost: ['You can\'t like your own post', 400],
-	threadLocked: ['You can\'t post to a locked thread', 400],
-	postRemoved: ['You can\'t reply to a removed post', 400],
-	invalidParameter (param, message) {
-		if(message) {
-			var punctuatedMessage = ': ' + message
-		}
-
-		return [`${param} is invalid${punctuatedMessage}`, 400]
-	}
+	unknown: [
+		'An unknown error occured on our end. Please try again later',
+		500
+	],
+	accountAlreadyCreated: [
+		'This account has already been created',
+		400
+	],
+	categoryAlreadyExists: [
+		'This category has already been created',
+		400
+	],
+	accountDoesNotExist: [
+		'This account does not exist',
+		400
+],
+	invalidCategory: [
+		'This category does not exist',
+		400
+	],
+	invalidLoginCredentials: [
+		'The username or password provided was incorrect',
+		401
+	],
+	requestNotAuthorized: [
+		'The request was not authorized',
+		401
+	],
+	invalidToken: [
+		'The token provided was not valid',
+		401
+	],
+	noSettings: [
+		'You haven\'t added any settings yet',
+		500
+	],
+	passwordSame: [
+		'You can\'t set it to the same password',
+		400
+	],
+	cannotLikeOwnPost: [
+		'You can\'t like your own post',
+		400
+	],
+	threadLocked: [
+		'You can\'t post to a locked thread',
+		400
+	],
+	postRemoved: [
+		'You can\'t reply to a removed post',
+		400
+	]
 }
 
-let ProcessedErrors = {}
 function processErrors(errorName) {
-	let temp
+	let arr = Errors[errorName]
 
-	if(typeof Errors[errorName] === 'function') {
-		temp = function() {
-			let arr = Errors[errorName](...arguments)
-			return {
-				name: errorName,
-				message: arr[0],
-				status: arr[1],
-				parameter: arguments[0]
-			}
-		}
-	} else {
-		let arr = Errors[errorName]
+	temp = {}
+	temp.name = errorName
+	temp.message = arr[0]
+	temp.status = arr[1]
 
-		temp = {}
-		temp.name = errorName
-		temp.message = arr[0]
-		temp.status = arr[1]
+	return {
+		name: errorName,
+		message: arr[0],
+		status: arr[1]
 	}
-
-	return temp
 }
 
+let ProcessedErrors = {}
+
 for(var errorName in Errors) {
 	ProcessedErrors[errorName] = processErrors(errorName)
 }
 
 ProcessedErrors.VALIDATION_ERROR = 'VALIDATION_ERROR';
 
+ProcessedErrors.invalidParameter = function (param, message) {
+	let punctuatedMessage = '';
+	if(message) {
+		punctuatedMessage = ': ' + message;
+	}
+
+	return {
+		name: errorName,
+		message: `${param} is invalid${punctuatedMessage}`,
+		status: 400,
+		parameter: param
+	};
+}
+
 ProcessedErrors.sequelizeValidation = (sequelize, obj) => {
 	return new sequelize.ValidationError(obj.error, [
 		new sequelize.ValidationErrorItem(