File tree Expand file tree Collapse file tree 16 files changed +97
-91
lines changed Expand file tree Collapse file tree 16 files changed +97
-91
lines changed Original file line number Diff line number Diff line change 1
1
const City = require ( '../../models/city' )
2
- const db = require ( '../../middleware/db' )
2
+ const { createItem } = require ( '../../middleware/db' )
3
3
const { handleError } = require ( '../../middleware/utils' )
4
4
const { matchedData } = require ( 'express-validator' )
5
5
const { cityExists } = require ( './helpers' )
@@ -9,16 +9,16 @@ const { cityExists } = require('./helpers')
9
9
* @param {Object } req - request object
10
10
* @param {Object } res - response object
11
11
*/
12
- const createItem = async ( req , res ) => {
12
+ const createCity = async ( req , res ) => {
13
13
try {
14
14
req = matchedData ( req )
15
15
const doesCityExists = await cityExists ( req . name )
16
16
if ( ! doesCityExists ) {
17
- res . status ( 201 ) . json ( await db . createItem ( req , City ) )
17
+ res . status ( 201 ) . json ( await createItem ( req , City ) )
18
18
}
19
19
} catch ( error ) {
20
20
handleError ( res , error )
21
21
}
22
22
}
23
23
24
- module . exports = { createItem }
24
+ module . exports = { createCity }
Original file line number Diff line number Diff line change 1
1
const City = require ( '../../models/city' )
2
2
const { matchedData } = require ( 'express-validator' )
3
3
const { isIDGood, handleError } = require ( '../../middleware/utils' )
4
- const db = require ( '../../middleware/db' )
4
+ const { deleteItem } = require ( '../../middleware/db' )
5
5
6
6
/**
7
7
* Delete item function called by route
8
8
* @param {Object } req - request object
9
9
* @param {Object } res - response object
10
10
*/
11
- const deleteItem = async ( req , res ) => {
11
+ const deleteCity = async ( req , res ) => {
12
12
try {
13
13
req = matchedData ( req )
14
14
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 ) )
16
16
} catch ( error ) {
17
17
handleError ( res , error )
18
18
}
19
19
}
20
20
21
- module . exports = { deleteItem }
21
+ module . exports = { deleteCity }
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 1
1
const City = require ( '../../models/city' )
2
- const db = require ( '../../middleware/db' )
2
+ const { checkQueryString , getItems } = require ( '../../middleware/db' )
3
3
const { handleError } = require ( '../../middleware/utils' )
4
4
5
5
/**
6
6
* Get items function called by route
7
7
* @param {Object } req - request object
8
8
* @param {Object } res - response object
9
9
*/
10
- const getItems = async ( req , res ) => {
10
+ const getCities = async ( req , res ) => {
11
11
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 ) )
14
14
} catch ( error ) {
15
15
handleError ( res , error )
16
16
}
17
17
}
18
18
19
- module . exports = { getItems }
19
+ module . exports = { getCities }
Original file line number Diff line number Diff line change 1
1
const { matchedData } = require ( 'express-validator' )
2
2
const City = require ( '../../models/city' )
3
- const db = require ( '../../middleware/db' )
3
+ const { getItem } = require ( '../../middleware/db' )
4
4
const { isIDGood, handleError } = require ( '../../middleware/utils' )
5
5
6
6
/**
7
7
* Get item function called by route
8
8
* @param {Object } req - request object
9
9
* @param {Object } res - response object
10
10
*/
11
- const getItem = async ( req , res ) => {
11
+ const getCity = async ( req , res ) => {
12
12
try {
13
13
req = matchedData ( req )
14
14
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 ) )
16
16
} catch ( error ) {
17
17
handleError ( res , error )
18
18
}
19
19
}
20
20
21
- module . exports = { getItem }
21
+ module . exports = { getCity }
Original file line number Diff line number Diff line change 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 ' )
7
7
8
8
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
15
15
}
Original file line number Diff line number Diff line change 1
1
const City = require ( '../../models/city' )
2
- const db = require ( '../../middleware/db' )
2
+ const { updateItem } = require ( '../../middleware/db' )
3
3
const { isIDGood, handleError } = require ( '../../middleware/utils' )
4
4
const { matchedData } = require ( 'express-validator' )
5
5
const { cityExistsExcludingItself } = require ( './helpers' )
@@ -9,17 +9,17 @@ const { cityExistsExcludingItself } = require('./helpers')
9
9
* @param {Object } req - request object
10
10
* @param {Object } res - response object
11
11
*/
12
- const updateItem = async ( req , res ) => {
12
+ const updateCity = async ( req , res ) => {
13
13
try {
14
14
req = matchedData ( req )
15
15
const id = await isIDGood ( req . id )
16
16
const doesCityExists = await cityExistsExcludingItself ( id , req . name )
17
17
if ( ! doesCityExists ) {
18
- res . status ( 200 ) . json ( await db . updateItem ( id , City , req ) )
18
+ res . status ( 200 ) . json ( await updateItem ( id , City , req ) )
19
19
}
20
20
} catch ( error ) {
21
21
handleError ( res , error )
22
22
}
23
23
}
24
24
25
- module . exports = { updateItem }
25
+ module . exports = { updateCity }
Original file line number Diff line number Diff line change 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 ' )
5
5
6
6
module . exports = {
7
- validateCreateItem ,
8
- validateDeleteItem ,
9
- validateGetItem ,
10
- validateUpdateItem
7
+ validateCreateCity ,
8
+ validateDeleteCity ,
9
+ validateGetCity ,
10
+ validateUpdateCity
11
11
}
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 }
You can’t perform that action at this time.
0 commit comments