Cleanup and renaming

davellanedam · davellanedam · commit b5dbd7d4e72a · 2020-10-03T01:59:52.000-04:00
diff --git a/app/controllers/cities/createCity.js b/app/controllers/cities/createCity.js
@@ -1,5 +1,5 @@
 const City = require('../../models/city')
-const db = require('../../middleware/db')
+const { createItem } = require('../../middleware/db')
 const { handleError } = require('../../middleware/utils')
 const { matchedData } = require('express-validator')
 const { cityExists } = require('./helpers')
@@ -9,16 +9,16 @@ const { cityExists } = require('./helpers')
  * @param {Object} req - request object
  * @param {Object} res - response object
  */
-const createItem = async (req, res) => {
+const createCity = async (req, res) => {
   try {
     req = matchedData(req)
     const doesCityExists = await cityExists(req.name)
     if (!doesCityExists) {
-      res.status(201).json(await db.createItem(req, City))
+      res.status(201).json(await createItem(req, City))
     }
   } catch (error) {
     handleError(res, error)
   }
 }
 
-module.exports = { createItem }
+module.exports = { createCity }
diff --git a/app/controllers/cities/deleteCity.js b/app/controllers/cities/deleteCity.js
@@ -1,21 +1,21 @@
 const City = require('../../models/city')
 const { matchedData } = require('express-validator')
 const { isIDGood, handleError } = require('../../middleware/utils')
-const db = require('../../middleware/db')
+const { deleteItem } = require('../../middleware/db')
 
 /**
  * Delete item function called by route
  * @param {Object} req - request object
  * @param {Object} res - response object
  */
-const deleteItem = async (req, res) => {
+const deleteCity = async (req, res) => {
   try {
     req = matchedData(req)
     const id = await isIDGood(req.id)
-    res.status(200).json(await db.deleteItem(id, City))
+    res.status(200).json(await deleteItem(id, City))
   } catch (error) {
     handleError(res, error)
   }
 }
 
-module.exports = { deleteItem }
+module.exports = { deleteCity }
diff --git a/app/controllers/cities/getAllCities.js b/app/controllers/cities/getAllCities.js
@@ -6,12 +6,12 @@ const { getAllItemsFromDB } = require('./helpers')
  * @param {Object} req - request object
  * @param {Object} res - response object
  */
-const getAllItems = async (req, res) => {
+const getAllCities = async (req, res) => {
   try {
     res.status(200).json(await getAllItemsFromDB())
   } catch (error) {
     handleError(res, error)
   }
 }
 
-module.exports = { getAllItems }
+module.exports = { getAllCities }
diff --git a/app/controllers/cities/getCities.js b/app/controllers/cities/getCities.js
@@ -1,19 +1,19 @@
 const City = require('../../models/city')
-const db = require('../../middleware/db')
+const { checkQueryString, getItems } = require('../../middleware/db')
 const { handleError } = require('../../middleware/utils')
 
 /**
  * Get items function called by route
  * @param {Object} req - request object
  * @param {Object} res - response object
  */
-const getItems = async (req, res) => {
+const getCities = async (req, res) => {
   try {
-    const query = await db.checkQueryString(req.query)
-    res.status(200).json(await db.getItems(req, City, query))
+    const query = await checkQueryString(req.query)
+    res.status(200).json(await getItems(req, City, query))
   } catch (error) {
     handleError(res, error)
   }
 }
 
-module.exports = { getItems }
+module.exports = { getCities }
diff --git a/app/controllers/cities/getCity.js b/app/controllers/cities/getCity.js
@@ -1,21 +1,21 @@
 const { matchedData } = require('express-validator')
 const City = require('../../models/city')
-const db = require('../../middleware/db')
+const { getItem } = require('../../middleware/db')
 const { isIDGood, handleError } = require('../../middleware/utils')
 
 /**
  * Get item function called by route
  * @param {Object} req - request object
  * @param {Object} res - response object
  */
-const getItem = async (req, res) => {
+const getCity = async (req, res) => {
   try {
     req = matchedData(req)
     const id = await isIDGood(req.id)
-    res.status(200).json(await db.getItem(id, City))
+    res.status(200).json(await getItem(id, City))
   } catch (error) {
     handleError(res, error)
   }
 }
 
-module.exports = { getItem }
+module.exports = { getCity }
diff --git a/app/controllers/cities/index.js b/app/controllers/cities/index.js
@@ -1,15 +1,15 @@
-const { createItem } = require('./createItem')
-const { deleteItem } = require('./deleteItem')
-const { getAllItems } = require('./getAllItems')
-const { getItem } = require('./getItem')
-const { getItems } = require('./getItems')
-const { updateItem } = require('./updateItem')
+const { createCity } = require('./createCity')
+const { deleteCity } = require('./deleteCity')
+const { getAllCities } = require('./getAllCities')
+const { getCity } = require('./getCity')
+const { getCities } = require('./getCities')
+const { updateCity } = require('./updateCity')
 
 module.exports = {
-  createItem,
-  deleteItem,
-  getAllItems,
-  getItem,
-  getItems,
-  updateItem
+  createCity,
+  deleteCity,
+  getAllCities,
+  getCity,
+  getCities,
+  updateCity
 }
diff --git a/app/controllers/cities/updateCity.js b/app/controllers/cities/updateCity.js
@@ -1,5 +1,5 @@
 const City = require('../../models/city')
-const db = require('../../middleware/db')
+const { updateItem } = require('../../middleware/db')
 const { isIDGood, handleError } = require('../../middleware/utils')
 const { matchedData } = require('express-validator')
 const { cityExistsExcludingItself } = require('./helpers')
@@ -9,17 +9,17 @@ const { cityExistsExcludingItself } = require('./helpers')
  * @param {Object} req - request object
  * @param {Object} res - response object
  */
-const updateItem = async (req, res) => {
+const updateCity = async (req, res) => {
   try {
     req = matchedData(req)
     const id = await isIDGood(req.id)
     const doesCityExists = await cityExistsExcludingItself(id, req.name)
     if (!doesCityExists) {
-      res.status(200).json(await db.updateItem(id, City, req))
+      res.status(200).json(await updateItem(id, City, req))
     }
   } catch (error) {
     handleError(res, error)
   }
 }
 
-module.exports = { updateItem }
+module.exports = { updateCity }
diff --git a/app/controllers/cities/validators/index.js b/app/controllers/cities/validators/index.js
@@ -1,11 +1,11 @@
-const { validateCreateItem } = require('./validateCreateItem')
-const { validateDeleteItem } = require('./validateDeleteItem')
-const { validateGetItem } = require('./validateGetItem')
-const { validateUpdateItem } = require('./validateUpdateItem')
+const { validateCreateCity } = require('./validateCreateCity')
+const { validateDeleteCity } = require('./validateDeleteCity')
+const { validateGetCity } = require('./validateGetCity')
+const { validateUpdateCity } = require('./validateUpdateCity')
 
 module.exports = {
-  validateCreateItem,
-  validateDeleteItem,
-  validateGetItem,
-  validateUpdateItem
+  validateCreateCity,
+  validateDeleteCity,
+  validateGetCity,
+  validateUpdateCity
 }
diff --git a/app/controllers/cities/validators/validateCreateCity.js b/app/controllers/cities/validators/validateCreateCity.js
@@ -4,7 +4,7 @@ const { check } = require('express-validator')
 /**
  * Validates create new item request
  */
-const validateCreateItem = [
+const validateCreateCity = [
   check('name')
     .exists()
     .withMessage('MISSING')
@@ -17,4 +17,4 @@ const validateCreateItem = [
   }
 ]
 
-module.exports = { validateCreateItem }
+module.exports = { validateCreateCity }
diff --git a/app/controllers/cities/validators/validateDeleteCity.js b/app/controllers/cities/validators/validateDeleteCity.js
@@ -4,7 +4,7 @@ const { check } = require('express-validator')
 /**
  * Validates delete item request
  */
-const validateDeleteItem = [
+const validateDeleteCity = [
   check('id')
     .exists()
     .withMessage('MISSING')
@@ -16,4 +16,4 @@ const validateDeleteItem = [
   }
 ]
 
-module.exports = { validateDeleteItem }
+module.exports = { validateDeleteCity }
diff --git a/app/controllers/cities/validators/validateGetCity.js b/app/controllers/cities/validators/validateGetCity.js
@@ -4,7 +4,7 @@ const { check } = require('express-validator')
 /**
  * Validates get item request
  */
-const validateGetItem = [
+const validateGetCity = [
   check('id')
     .exists()
     .withMessage('MISSING')
@@ -16,4 +16,4 @@ const validateGetItem = [
   }
 ]
 
-module.exports = { validateGetItem }
+module.exports = { validateGetCity }
diff --git a/app/controllers/cities/validators/validateUpdateCity.js b/app/controllers/cities/validators/validateUpdateCity.js
@@ -4,7 +4,7 @@ const { check } = require('express-validator')
 /**
  * Validates update item request
  */
-const validateUpdateItem = [
+const validateUpdateCity = [
   check('name')
     .exists()
     .withMessage('MISSING')
@@ -22,4 +22,4 @@ const validateUpdateItem = [
   }
 ]
 
-module.exports = { validateUpdateItem }
+module.exports = { validateUpdateCity }
diff --git a/app/middleware/db/getItems.js b/app/middleware/db/getItems.js
@@ -1,8 +1,7 @@
-const {
-  listInitOptions,
-  buildErrObject,
-  cleanPaginationID
-} = require('../../middleware/utils')
+const { buildErrObject } = require('../../middleware/utils')
+
+const { listInitOptions } = require('./listInitOptions')
+const { cleanPaginationID } = require('./cleanPaginationID')
 
 /**
  * Gets items from database
@@ -14,7 +13,7 @@ const getItems = async (req, model, query) => {
   return new Promise((resolve, reject) => {
     model.paginate(query, options, (err, items) => {
       if (err) {
-        reject(buildErrObject(422, err.message))
+        return reject(buildErrObject(422, err.message))
       }
       resolve(cleanPaginationID(items))
     })
diff --git a/app/middleware/db/listInitOptions.js b/app/middleware/db/listInitOptions.js
@@ -1,23 +1,29 @@
+const { buildErrObject } = require('../../middleware/utils')
 const { buildSort } = require('./buildSort')
 
 /**
  * Builds initial options for query
  * @param {Object} query - query object
  */
-const listInitOptions = async (req) => {
-  return new Promise((resolve) => {
-    const order = req.query.order || -1
-    const sort = req.query.sort || 'createdAt'
-    const sortBy = buildSort(sort, order)
-    const page = parseInt(req.query.page, 10) || 1
-    const limit = parseInt(req.query.limit, 10) || 5
-    const options = {
-      sort: sortBy,
-      lean: true,
-      page,
-      limit
+const listInitOptions = (req) => {
+  return new Promise(async (resolve, reject) => {
+    try {
+      const order = req.query.order || -1
+      const sort = req.query.sort || 'createdAt'
+      const sortBy = buildSort(sort, order)
+      const page = parseInt(req.query.page, 10) || 1
+      const limit = parseInt(req.query.limit, 10) || 5
+      const options = {
+        sort: sortBy,
+        lean: true,
+        page,
+        limit
+      }
+      resolve(options)
+    } catch (error) {
+      console.log(error.message)
+      reject(buildErrObject(422, 'ERROR_WITH_INIT_OPTIONS'))
     }
-    resolve(options)
   })
 }
 
diff --git a/app/middleware/utils/validateResult.js b/app/middleware/utils/validateResult.js
@@ -1,5 +1,6 @@
 const { validationResult } = require('express-validator')
-const { handleError, buildErrObject } = require('../../middleware/utils')
+const { handleError } = require('./handleError')
+const { buildErrObject } = require('./buildErrObject')
 
 /**
  * Builds error for validation files
diff --git a/app/routes/cities.js b/app/routes/cities.js

Original file line number	Diff line number	Diff line change
`@@ -6,12 +6,12 @@ const { getAllItemsFromDB } = require('./helpers')`
`6`	`6`	`* @param {Object} req - request object`
`7`	`7`	`* @param {Object} res - response object`
`8`	`8`	`*/`
`9`		`-const getAllItems = async (req, res) => {`
	`9`	`+const getAllCities = async (req, res) => {`
`10`	`10`	`try {`
`11`	`11`	`res.status(200).json(await getAllItemsFromDB())`
`12`	`12`	`} catch (error) {`
`13`	`13`	`handleError(res, error)`
`14`	`14`	`}`
`15`	`15`	`}`
`16`	`16`
`17`		`-module.exports = { getAllItems }`
	`17`	`+module.exports = { getAllCities }`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ const { check } = require('express-validator')`
`4`	`4`	`/**`
`5`	`5`	`* Validates create new item request`
`6`	`6`	`*/`
`7`		`-const validateCreateItem = [`
	`7`	`+const validateCreateCity = [`
`8`	`8`	`check('name')`
`9`	`9`	`.exists()`
`10`	`10`	`.withMessage('MISSING')`
`@@ -17,4 +17,4 @@ const validateCreateItem = [`
`17`	`17`	`}`
`18`	`18`	`]`
`19`	`19`
`20`		`-module.exports = { validateCreateItem }`
	`20`	`+module.exports = { validateCreateCity }`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ const { check } = require('express-validator')`
`4`	`4`	`/**`
`5`	`5`	`* Validates delete item request`
`6`	`6`	`*/`
`7`		`-const validateDeleteItem = [`
	`7`	`+const validateDeleteCity = [`
`8`	`8`	`check('id')`
`9`	`9`	`.exists()`
`10`	`10`	`.withMessage('MISSING')`
`@@ -16,4 +16,4 @@ const validateDeleteItem = [`
`16`	`16`	`}`
`17`	`17`	`]`
`18`	`18`
`19`		`-module.exports = { validateDeleteItem }`
	`19`	`+module.exports = { validateDeleteCity }`