More cleanup

Author: davellanedam

app/controllers/auth/helpers/passwordsDoNotMatch.js

@@ -8,15 +8,18 @@ const LOGIN_ATTEMPTS = 5
  * @param {Object} user - user object
  */
 const passwordsDoNotMatch = async (user) => {
-  user.loginAttempts += 1
-  await saveLoginAttemptsToDB(user)
-  return new Promise((resolve, reject) => {
-    if (user.loginAttempts <= LOGIN_ATTEMPTS) {
-      return resolve(buildErrObject(409, 'WRONG_PASSWORD'))
-    } else {
-      resolve(blockUser(user))
+  return new Promise(async (resolve, reject) => {
+    try {
+      user.loginAttempts += 1
+      await saveLoginAttemptsToDB(user)
+      if (user.loginAttempts <= LOGIN_ATTEMPTS) {
+        return reject(buildErrObject(409, 'WRONG_PASSWORD'))
+      }
+
+      resolve(await blockUser(user))
+    } catch (error) {
+      throw error
     }
-    reject(buildErrObject(422, 'ERROR'))
   })
 }
 

app/controllers/cities/helpers/cityExists.js

@@ -1,18 +1,24 @@
 const City = require('../../../models/city')
-const { itemAlreadyExists } = require('../../../middleware/utils')
+const { buildErrObject } = require('../../../middleware/utils')
 
 /**
  * Checks if a city already exists in database
  * @param {string} name - name of item
  */
 const cityExists = (name) => {
-  return new Promise((resolve) => {
+  return new Promise((resolve, reject) => {
     City.findOne(
       {
         name
       },
       (err, item) => {
-        itemAlreadyExists(err, item, 'CITY_ALREADY_EXISTS')
+        if (err) {
+          return reject(buildErrObject(422, err.message))
+        }
+
+        if (item) {
+          return reject(buildErrObject(422, 'CITY_ALREADY_EXISTS'))
+        }
         resolve(false)
       }
     )

app/controllers/cities/helpers/cityExistsExcludingItself.js

@@ -1,13 +1,13 @@
 const City = require('../../../models/city')
-const { itemAlreadyExists } = require('../../../middleware/utils')
+const { buildErrObject } = require('../../../middleware/utils')
 
 /**
  * Checks if a city already exists excluding itself
  * @param {string} id - id of item
  * @param {string} name - name of item
  */
 const cityExistsExcludingItself = (id, name) => {
-  return new Promise((resolve) => {
+  return new Promise((resolve, reject) => {
     City.findOne(
       {
         name,
@@ -16,7 +16,14 @@ const cityExistsExcludingItself = (id, name) => {
         }
       },
       (err, item) => {
-        itemAlreadyExists(err, item, 'CITY_ALREADY_EXISTS')
+        if (err) {
+          return reject(buildErrObject(422, err.message))
+        }
+
+        if (item) {
+          return reject(buildErrObject(422, 'CITY_ALREADY_EXISTS'))
+        }
+
         resolve(false)
       }
     )

app/middleware/emailer/emailExists.js

@@ -1,18 +1,24 @@
 const User = require('../../models/user')
-const { itemAlreadyExists } = require('../../middleware/utils')
+const { buildErrObject } = require('../../middleware/utils')
 
 /**
  * Checks User model if user with an specific email exists
  * @param {string} email - user email
  */
 const emailExists = (email) => {
-  return new Promise((resolve) => {
+  return new Promise((resolve, reject) => {
     User.findOne(
       {
         email
       },
       (err, item) => {
-        itemAlreadyExists(err, item, 'EMAIL_ALREADY_EXISTS')
+        if (err) {
+          return reject(buildErrObject(422, err.message))
+        }
+
+        if (item) {
+          return reject(buildErrObject(422, 'EMAIL_ALREADY_EXISTS'))
+        }
         resolve(false)
       }
     )

app/middleware/emailer/emailExistsExcludingMyself.js

@@ -1,22 +1,29 @@
 const User = require('../../models/user')
-const { itemAlreadyExists } = require('../../middleware/utils')
+const { buildErrObject } = require('../../middleware/utils')
 
 /**
  * Checks User model if user with an specific email exists but excluding user id
  * @param {string} id - user id
  * @param {string} email - user email
  */
 const emailExistsExcludingMyself = (id, email) => {
-  return new Promise((resolve) => {
+  return new Promise((resolve, reject) => {
     User.findOne(
       {
         email,
         _id: {
           $ne: id
         }
       },
-      (err, item) => {
-        itemAlreadyExists(err, item, 'EMAIL_ALREADY_EXISTS')
+      async (err, item) => {
+        if (err) {
+          return reject(buildErrObject(422, err.message))
+        }
+
+        if (item) {
+          return reject(buildErrObject(422, 'EMAIL_ALREADY_EXISTS'))
+        }
+
         resolve(false)
       }
     )

app/middleware/utils/index.js

@@ -5,7 +5,6 @@ const { getCountry } = require('./getCountry')
 const { getIP } = require('./getIP')
 const { handleError } = require('./handleError')
 const { isIDGood } = require('./isIDGood')
-const { itemAlreadyExists } = require('./itemAlreadyExists')
 const { itemNotFound } = require('./itemNotFound')
 const { removeExtensionFromFile } = require('./removeExtensionFromFile')
 const { validateResult } = require('./validateResult')
@@ -18,7 +17,6 @@ module.exports = {
   getIP,
   handleError,
   isIDGood,
-  itemAlreadyExists,
   itemNotFound,
   removeExtensionFromFile,
   validateResult