Skip to content

Commit b5dbd7d

Browse files
committed
Cleanup and renaming
1 parent 375451e commit b5dbd7d

16 files changed

+97
-91
lines changed
Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
const City = require('../../models/city')
2-
const db = require('../../middleware/db')
2+
const { createItem } = require('../../middleware/db')
33
const { handleError } = require('../../middleware/utils')
44
const { matchedData } = require('express-validator')
55
const { cityExists } = require('./helpers')
@@ -9,16 +9,16 @@ const { cityExists } = require('./helpers')
99
* @param {Object} req - request object
1010
* @param {Object} res - response object
1111
*/
12-
const createItem = async (req, res) => {
12+
const createCity = async (req, res) => {
1313
try {
1414
req = matchedData(req)
1515
const doesCityExists = await cityExists(req.name)
1616
if (!doesCityExists) {
17-
res.status(201).json(await db.createItem(req, City))
17+
res.status(201).json(await createItem(req, City))
1818
}
1919
} catch (error) {
2020
handleError(res, error)
2121
}
2222
}
2323

24-
module.exports = { createItem }
24+
module.exports = { createCity }
Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
11
const City = require('../../models/city')
22
const { matchedData } = require('express-validator')
33
const { isIDGood, handleError } = require('../../middleware/utils')
4-
const db = require('../../middleware/db')
4+
const { deleteItem } = require('../../middleware/db')
55

66
/**
77
* Delete item function called by route
88
* @param {Object} req - request object
99
* @param {Object} res - response object
1010
*/
11-
const deleteItem = async (req, res) => {
11+
const deleteCity = async (req, res) => {
1212
try {
1313
req = matchedData(req)
1414
const id = await isIDGood(req.id)
15-
res.status(200).json(await db.deleteItem(id, City))
15+
res.status(200).json(await deleteItem(id, City))
1616
} catch (error) {
1717
handleError(res, error)
1818
}
1919
}
2020

21-
module.exports = { deleteItem }
21+
module.exports = { deleteCity }

app/controllers/cities/getAllItems.js renamed to app/controllers/cities/getAllCities.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@ const { getAllItemsFromDB } = require('./helpers')
66
* @param {Object} req - request object
77
* @param {Object} res - response object
88
*/
9-
const getAllItems = async (req, res) => {
9+
const getAllCities = async (req, res) => {
1010
try {
1111
res.status(200).json(await getAllItemsFromDB())
1212
} catch (error) {
1313
handleError(res, error)
1414
}
1515
}
1616

17-
module.exports = { getAllItems }
17+
module.exports = { getAllCities }
Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
const City = require('../../models/city')
2-
const db = require('../../middleware/db')
2+
const { checkQueryString, getItems } = require('../../middleware/db')
33
const { handleError } = require('../../middleware/utils')
44

55
/**
66
* Get items function called by route
77
* @param {Object} req - request object
88
* @param {Object} res - response object
99
*/
10-
const getItems = async (req, res) => {
10+
const getCities = async (req, res) => {
1111
try {
12-
const query = await db.checkQueryString(req.query)
13-
res.status(200).json(await db.getItems(req, City, query))
12+
const query = await checkQueryString(req.query)
13+
res.status(200).json(await getItems(req, City, query))
1414
} catch (error) {
1515
handleError(res, error)
1616
}
1717
}
1818

19-
module.exports = { getItems }
19+
module.exports = { getCities }
Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
11
const { matchedData } = require('express-validator')
22
const City = require('../../models/city')
3-
const db = require('../../middleware/db')
3+
const { getItem } = require('../../middleware/db')
44
const { isIDGood, handleError } = require('../../middleware/utils')
55

66
/**
77
* Get item function called by route
88
* @param {Object} req - request object
99
* @param {Object} res - response object
1010
*/
11-
const getItem = async (req, res) => {
11+
const getCity = async (req, res) => {
1212
try {
1313
req = matchedData(req)
1414
const id = await isIDGood(req.id)
15-
res.status(200).json(await db.getItem(id, City))
15+
res.status(200).json(await getItem(id, City))
1616
} catch (error) {
1717
handleError(res, error)
1818
}
1919
}
2020

21-
module.exports = { getItem }
21+
module.exports = { getCity }

app/controllers/cities/index.js

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
1-
const { createItem } = require('./createItem')
2-
const { deleteItem } = require('./deleteItem')
3-
const { getAllItems } = require('./getAllItems')
4-
const { getItem } = require('./getItem')
5-
const { getItems } = require('./getItems')
6-
const { updateItem } = require('./updateItem')
1+
const { createCity } = require('./createCity')
2+
const { deleteCity } = require('./deleteCity')
3+
const { getAllCities } = require('./getAllCities')
4+
const { getCity } = require('./getCity')
5+
const { getCities } = require('./getCities')
6+
const { updateCity } = require('./updateCity')
77

88
module.exports = {
9-
createItem,
10-
deleteItem,
11-
getAllItems,
12-
getItem,
13-
getItems,
14-
updateItem
9+
createCity,
10+
deleteCity,
11+
getAllCities,
12+
getCity,
13+
getCities,
14+
updateCity
1515
}
Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
const City = require('../../models/city')
2-
const db = require('../../middleware/db')
2+
const { updateItem } = require('../../middleware/db')
33
const { isIDGood, handleError } = require('../../middleware/utils')
44
const { matchedData } = require('express-validator')
55
const { cityExistsExcludingItself } = require('./helpers')
@@ -9,17 +9,17 @@ const { cityExistsExcludingItself } = require('./helpers')
99
* @param {Object} req - request object
1010
* @param {Object} res - response object
1111
*/
12-
const updateItem = async (req, res) => {
12+
const updateCity = async (req, res) => {
1313
try {
1414
req = matchedData(req)
1515
const id = await isIDGood(req.id)
1616
const doesCityExists = await cityExistsExcludingItself(id, req.name)
1717
if (!doesCityExists) {
18-
res.status(200).json(await db.updateItem(id, City, req))
18+
res.status(200).json(await updateItem(id, City, req))
1919
}
2020
} catch (error) {
2121
handleError(res, error)
2222
}
2323
}
2424

25-
module.exports = { updateItem }
25+
module.exports = { updateCity }
Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
const { validateCreateItem } = require('./validateCreateItem')
2-
const { validateDeleteItem } = require('./validateDeleteItem')
3-
const { validateGetItem } = require('./validateGetItem')
4-
const { validateUpdateItem } = require('./validateUpdateItem')
1+
const { validateCreateCity } = require('./validateCreateCity')
2+
const { validateDeleteCity } = require('./validateDeleteCity')
3+
const { validateGetCity } = require('./validateGetCity')
4+
const { validateUpdateCity } = require('./validateUpdateCity')
55

66
module.exports = {
7-
validateCreateItem,
8-
validateDeleteItem,
9-
validateGetItem,
10-
validateUpdateItem
7+
validateCreateCity,
8+
validateDeleteCity,
9+
validateGetCity,
10+
validateUpdateCity
1111
}

app/controllers/cities/validators/validateCreateItem.js renamed to app/controllers/cities/validators/validateCreateCity.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ const { check } = require('express-validator')
44
/**
55
* Validates create new item request
66
*/
7-
const validateCreateItem = [
7+
const validateCreateCity = [
88
check('name')
99
.exists()
1010
.withMessage('MISSING')
@@ -17,4 +17,4 @@ const validateCreateItem = [
1717
}
1818
]
1919

20-
module.exports = { validateCreateItem }
20+
module.exports = { validateCreateCity }

app/controllers/cities/validators/validateDeleteItem.js renamed to app/controllers/cities/validators/validateDeleteCity.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ const { check } = require('express-validator')
44
/**
55
* Validates delete item request
66
*/
7-
const validateDeleteItem = [
7+
const validateDeleteCity = [
88
check('id')
99
.exists()
1010
.withMessage('MISSING')
@@ -16,4 +16,4 @@ const validateDeleteItem = [
1616
}
1717
]
1818

19-
module.exports = { validateDeleteItem }
19+
module.exports = { validateDeleteCity }

0 commit comments

Comments
 (0)