Skip to content

Commit d35f25f

Browse files
committed
User controller renaming
1 parent b5dbd7d commit d35f25f

File tree

12 files changed

+64
-64
lines changed

12 files changed

+64
-64
lines changed

app/controllers/users/createItem.js renamed to app/controllers/users/createUser.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ const { createItemInDb } = require('./helpers')
1111
* @param {Object} req - request object
1212
* @param {Object} res - response object
1313
*/
14-
const createItem = async (req, res) => {
14+
const createUser = async (req, res) => {
1515
try {
1616
// Gets locale from header 'Accept-Language'
1717
const locale = req.getLocale()
@@ -27,4 +27,4 @@ const createItem = async (req, res) => {
2727
}
2828
}
2929

30-
module.exports = { createItem }
30+
module.exports = { createUser }
Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
11
const model = require('../../models/user')
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 deleteUser = 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, model))
15+
res.status(200).json(await deleteItem(id, model))
1616
} catch (error) {
1717
handleError(res, error)
1818
}
1919
}
2020

21-
module.exports = { deleteItem }
21+
module.exports = { deleteUser }
Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
11
const User = require('../../models/user')
22
const { matchedData } = require('express-validator')
33
const { isIDGood, handleError } = require('../../middleware/utils')
4-
const db = require('../../middleware/db')
4+
const { getItem } = require('../../middleware/db')
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 getUser = 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, User))
15+
res.status(200).json(await getItem(id, User))
1616
} catch (error) {
1717
handleError(res, error)
1818
}
1919
}
2020

21-
module.exports = { getItem }
21+
module.exports = { getUser }
Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
const User = require('../../models/user')
22
const { handleError } = require('../../middleware/utils')
3-
const db = require('../../middleware/db')
3+
const { getItems, checkQueryString } = require('../../middleware/db')
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 getUsers = async (req, res) => {
1111
try {
12-
const query = await db.checkQueryString(req.query)
13-
res.status(200).json(await db.getItems(req, User, query))
12+
const query = await checkQueryString(req.query)
13+
res.status(200).json(await getItems(req, User, query))
1414
} catch (error) {
1515
handleError(res, error)
1616
}
1717
}
1818

19-
module.exports = { getItems }
19+
module.exports = { getUsers }

app/controllers/users/index.js

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
const { createItem } = require('./createItem')
2-
const { deleteItem } = require('./deleteItem')
3-
const { getItem } = require('./getItem')
4-
const { getItems } = require('./getItems')
5-
const { updateItem } = require('./updateItem')
1+
const { createUser } = require('./createUser')
2+
const { deleteUser } = require('./deleteUser')
3+
const { getUser } = require('./getUser')
4+
const { getUsers } = require('./getUsers')
5+
const { updateUser } = require('./updateUser')
66

77
module.exports = {
8-
createItem,
9-
deleteItem,
10-
getItem,
11-
getItems,
12-
updateItem
8+
createUser,
9+
deleteUser,
10+
getUser,
11+
getUsers,
12+
updateUser
1313
}
Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,25 @@
1-
const model = require('../../models/user')
1+
const User = require('../../models/user')
22
const { matchedData } = require('express-validator')
33
const { isIDGood, handleError } = require('../../middleware/utils')
4-
const db = require('../../middleware/db')
4+
const { updateItem } = require('../../middleware/db')
55
const { emailExistsExcludingMyself } = require('../../middleware/emailer')
66

77
/**
88
* Update item function called by route
99
* @param {Object} req - request object
1010
* @param {Object} res - response object
1111
*/
12-
const updateItem = async (req, res) => {
12+
const updateUser = async (req, res) => {
1313
try {
1414
req = matchedData(req)
1515
const id = await isIDGood(req.id)
1616
const doesEmailExists = await emailExistsExcludingMyself(id, req.email)
1717
if (!doesEmailExists) {
18-
res.status(200).json(await db.updateItem(id, model, req))
18+
res.status(200).json(await updateItem(id, User, req))
1919
}
2020
} catch (error) {
2121
handleError(res, error)
2222
}
2323
}
2424

25-
module.exports = { updateItem }
25+
module.exports = { updateUser }
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 { validateCreateUser } = require('./validateCreateUser')
2+
const { validateDeleteUser } = require('./validateDeleteUser')
3+
const { validateGetUser } = require('./validateGetUser')
4+
const { validateUpdateUser } = require('./validateUpdateUser')
55

66
module.exports = {
7-
validateCreateItem,
8-
validateDeleteItem,
9-
validateGetItem,
10-
validateUpdateItem
7+
validateCreateUser,
8+
validateDeleteUser,
9+
validateGetUser,
10+
validateUpdateUser
1111
}

app/controllers/users/validators/validateCreateItem.js renamed to app/controllers/users/validators/validateCreateUser.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ const { check } = require('express-validator')
55
/**
66
* Validates create new item request
77
*/
8-
const validateCreateItem = [
8+
const validateCreateUser = [
99
check('name')
1010
.exists()
1111
.withMessage('MISSING')
@@ -72,4 +72,4 @@ const validateCreateItem = [
7272
}
7373
]
7474

75-
module.exports = { validateCreateItem }
75+
module.exports = { validateCreateUser }

app/controllers/users/validators/validateDeleteItem.js renamed to app/controllers/users/validators/validateDeleteUser.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 validateDeleteUser = [
88
check('id')
99
.exists()
1010
.withMessage('MISSING')
@@ -16,4 +16,4 @@ const validateDeleteItem = [
1616
}
1717
]
1818

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

app/controllers/users/validators/validateGetItem.js renamed to app/controllers/users/validators/validateGetUser.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 get item request
66
*/
7-
const validateGetItem = [
7+
const validateGetUser = [
88
check('id')
99
.exists()
1010
.withMessage('MISSING')
@@ -16,4 +16,4 @@ const validateGetItem = [
1616
}
1717
]
1818

19-
module.exports = { validateGetItem }
19+
module.exports = { validateGetUser }

0 commit comments

Comments
 (0)