diff --git a/src/controllers/resource_types/placesController.js b/src/controllers/resource_types/placesController.js index 6f9d69f..b59226a 100644 --- a/src/controllers/resource_types/placesController.js +++ b/src/controllers/resource_types/placesController.js @@ -41,7 +41,7 @@ const getPlaceByUuidController = (req, res, next, config) => { const uuid_place = req.params.uuid const conn = mysql.start(config) - getPlaceListModel({ uuid_place, conn }) + getPlaceListModel({ uuid: uuid_place, conn }) .then((response) => { if (noResults(response)) { const err = error404() @@ -122,11 +122,11 @@ const getPlaceByNameController = (req, res, next, config) => { } const getPlaceByLatLongController = (req, res, next, config) => { - const lat = req.params.lat - const long = req.params.long + const latitude = req.params.latitude + const longitude = req.params.longitude const conn = mysql.start(config) - getPlaceListModel({ lat, long, conn }) + getPlaceListModel({ latitude, longitude, conn }) .then((response) => { if (noResults(response)) { const err = error404() @@ -174,7 +174,7 @@ const insertPlaceController = (req, res, next, config) => { const modifyPlaceController = (req, res, next, config) => { const conn = mysql.start(config) - modifyPlaceModel({ ...req.body, conn }) + modifyPlaceModel({ ...req.params, ...req.body, conn }) .then((response) => { const result = { _data: { @@ -195,7 +195,7 @@ const modifyPlaceController = (req, res, next, config) => { const deletePlaceController = (req, res, next, config) => { const conn = mysql.start(config) - deletePlaceModel({ ...req.body, conn }) + deletePlaceModel({ ...req.params, ...req.body, conn }) .then((response) => { const result = { _data: { diff --git a/src/controllers/resource_types/usersHasPlacesController.js b/src/controllers/resource_types/usersHasPlacesController.js index 330ea18..c53483d 100644 --- a/src/controllers/resource_types/usersHasPlacesController.js +++ b/src/controllers/resource_types/usersHasPlacesController.js @@ -166,9 +166,9 @@ const putUserHasPlacesController = (req, res, next, config) => { const deleteUserHasPlacesController = (req, res, next, config) => { const conn = mysql.start(config) const uuid_user_has_places = req.params.uuid - const deleted_by = req.auth.user || null + const deletedBy = req.auth.user || null - softDeleteUserHasPlacesModel({uuid: uuid_user_has_places, deleted_by, conn}) + softDeleteUserHasPlacesModel({uuid: uuid_user_has_places, deletedBy, conn}) .then(() => { next({}) }) @@ -184,9 +184,9 @@ const deleteUserHasPlacesController = (req, res, next, config) => { const deleteUserHasPlacesByUserUuidController = (req, res, next, config) => { const conn = mysql.start(config) const uuid_user = req.params.uuid - const deleted_by = req.auth.user || null + const deletedBy = req.auth.user || null - softDeleteUserHasPlacesModel({user_uuid: uuid_user, deleted_by, conn}) + softDeleteUserHasPlacesModel({user_uuid: uuid_user, deletedBy, conn}) .then(() => { next({}) }) @@ -202,9 +202,9 @@ const deleteUserHasPlacesByUserUuidController = (req, res, next, config) => { const deleteUserHasPlacesByPlaceUuidController = (req, res, next, config) => { const conn = mysql.start(config) const uuid_place = req.params.uuid - const deleted_by = req.auth.user || null + const deletedBy = req.auth.user || null - softDeleteUserHasPlacesModel({place_uuid: uuid_place, deleted_by, conn}) + softDeleteUserHasPlacesModel({place_uuid: uuid_place, deletedBy, conn}) .then(() => { next({}) }) diff --git a/src/repositories/authorization/userRepository.js b/src/repositories/authorization/userRepository.js index 603ff1e..7999ce1 100644 --- a/src/repositories/authorization/userRepository.js +++ b/src/repositories/authorization/userRepository.js @@ -61,9 +61,9 @@ const countUserListQuery = rest => * @returns {String} INSERT query */ const insertUserQuery = ({email, fk_role, createdBy}) => { - const emailCondition = email ? ':email,' : null; + const emailCondition = email ? ':email' : null; const roleCondition = fk_role ? '(SELECT id FROM dbmaster.roles WHERE name = :fk_role),' : `(SELECT id FROM dbmaster.roles WHERE name = 'viewer'),`; - const createdByCondition = createdBy ? ':createdBy,' : null; + const createdByCondition = createdBy ? ':createdBy' : null; return ` INSERT INTO dbmaster.users ( uuid,