diff --git a/dotenv b/dotenv index 646618c..4c51b11 100644 --- a/dotenv +++ b/dotenv @@ -1,6 +1,6 @@ SERVER_PORT=3000 ROOT_PATH=/home/josepablocb/Documents/Work/EnRuta/SysS/ETAAPI -API_CONFIG=config/apiConfig.json +API_CONFIG=config/apiConfig_local.json ############################ # PATHS relative to ROOT ############################ diff --git a/index.js b/index.js index 7b3885b..0de2b41 100644 --- a/index.js +++ b/index.js @@ -18,7 +18,7 @@ mongoose.connect( apiConfig.mongodb, { useNewUrlParser: true } ).then( ( val ) => { - console.log( "MongoDB Connected" ); + console.log( `MongoDB Connected : ${ apiConfig.mongodb }` ); });//catch throw error so service stops! const app = express(); diff --git a/lib/Handlers/Generic.handler.js b/lib/Handlers/Generic.handler.js new file mode 100644 index 0000000..42e3c6a --- /dev/null +++ b/lib/Handlers/Generic.handler.js @@ -0,0 +1,59 @@ +"use strict"; +const { ROOT_PATH, LIB_PATH, MODELS_PATH, HANDLERS_PATH } = process.env; + +async function getPage( page, elements, Model, filter=null, projection=null){ + const skip = elements * page; + const total = await Model.count( filter ); + const list = await Model.find( filter , projection, { skip : skip , limit : elements } ); + return { + total : total, + limit : elements, + skip : skip, + data : list + } +} + +async function getPageQuery(page, elements, Model, filter=null, projection=null){ + const skip = elements * page; + const total = await Model.count( filter ); + return { + query : Model.find( filter , projection, { skip : skip , limit : elements } ), + total : total, + skip : skip + }; +} + +class GenericHandler{ + constructor( Model, search_param, populate_list=null ) { + this.Model = Model; + this.search_param = search_param; + this.populate_list = populate_list || []; + } + + async populateQuey( query ){ + if( this.populate_list.length > 0 ){ + query.populate( this.populate_list ); + } + return await query.exec(); + } + + async getList( page, elements, filter=null, projection=null ){ + const { query } = await getPageQuery( page , elements, this.Model, filter, projection ); + return await this.populateQuey( query ); + } + + async findList( find_string, page, elements, projection=null ){ + const search_param = this.search_param; + const re = new RegExp( find_string ); + const filter = {}; + filter[ search_param ] = { $regex: re, $options: 'i' }; + return await this.getList( page, elements, filter, projection ); + } + + async getById( id, projection=null ){ + const query = Model.findById( id, projection ); + return await this.populateQuey( query ); + } +}; + +module.exports = { getPage, getPageQuery, GenericHandler }; diff --git a/scripts/ci_functions.sh b/scripts/ci_functions.sh index 7e27905..18e163a 100755 --- a/scripts/ci_functions.sh +++ b/scripts/ci_functions.sh @@ -8,6 +8,7 @@ function build_docker(){ return -1 fi CONTAINER_NAME=$1 + cat config/apiConfig.json > config/apiConfig_local.json set -x docker rmi -f "$AWS_ECR_REPO/$CONTAINER_NAME" diff --git a/sections/cities/routes.js b/sections/cities/routes.js index c924483..2681e86 100644 --- a/sections/cities/routes.js +++ b/sections/cities/routes.js @@ -2,8 +2,8 @@ const router = require('express').Router(); const services= require('./services.js'); -router.get('/', services.getCitiesList); -router.get('/find', services.findCitiesList); -router.get('/:id', services.getCity); +router.get('/', services.getList); +router.get('/find', services.findList); +router.get('/:id', services.getById); module.exports = router; diff --git a/sections/cities/services.js b/sections/cities/services.js index d88af2a..e78fca8 100644 --- a/sections/cities/services.js +++ b/sections/cities/services.js @@ -1,28 +1,33 @@ "use strict"; const { ROOT_PATH, LIB_PATH, MODELS_PATH, HANDLERS_PATH } = process.env; const { getPagination , getPage } = require( `${ROOT_PATH}/${LIB_PATH}/Misc.js` ); +const { GenericHandler } = require( `${ROOT_PATH}/${HANDLERS_PATH}/Generic.handler.js` ); const Model = require( `${ROOT_PATH}/${MODELS_PATH}/cities.model.js` ); -const getCitiesList = async(req, res) => { +const generic = new GenericHandler( Model, "city_name" ); + +const getList = async(req, res) => { const { page , elements } = getPagination( req.query ); - const retVal = await getPage( page , elements, Model ); + const retVal = await generic.getList(page , elements); res.send( retVal ); }; -const findCitiesList = async(req, res) => { - let filter=null; - if( req.query.regex ){ - const re = new RegExp( req.query.regex ); - filter = { "city_name" : { $regex: re, $options: 'i' }}; +const findList = async(req, res) => { + const findString = req.query.regex || null; + const { page , elements } = getPagination( req.query ); + let retVal; + if( findString ){ + retVal = await generic.findList( findString, page, elements ); + }else{ + retVal = await generic.getList(page , elements); } - const { page , elements } = getPagination( req.query ); - const retVal = await getPage( page, elements, Model, filter ); res.send( retVal ); }; -const getCity = async(req, res) => { - const retVal = await Model.findById( req.params.id ); +const getById = async(req, res) => { + const id=req.params.id; + const retVal = await generic.getById( id ); res.send( retVal ); }; -module.exports = { getCitiesList , findCitiesList , getCity }; +module.exports = { getList , findList , getById }; diff --git a/sections/countries/routes.js b/sections/countries/routes.js index 6e5c96a..2681e86 100644 --- a/sections/countries/routes.js +++ b/sections/countries/routes.js @@ -2,8 +2,8 @@ const router = require('express').Router(); const services= require('./services.js'); -router.get('/', services.getCountriesList); -router.get('/find', services.findCountriesList); -router.get('/:id', services.getCountry); +router.get('/', services.getList); +router.get('/find', services.findList); +router.get('/:id', services.getById); module.exports = router; diff --git a/sections/countries/services.js b/sections/countries/services.js index ddc4722..9370975 100644 --- a/sections/countries/services.js +++ b/sections/countries/services.js @@ -3,13 +3,13 @@ const { ROOT_PATH, LIB_PATH, MODELS_PATH, HANDLERS_PATH } = process.env; const { getPagination , getPage } = require( `${ROOT_PATH}/${LIB_PATH}/Misc.js` ); const Model = require( `${ROOT_PATH}/${MODELS_PATH}/countries.model.js` ); -const getCountriesList = async(req, res) => { +const getList = async(req, res) => { const { page , elements } = getPagination( req.query ); const retVal = await getPage( page , elements, Model ); res.send( retVal ); }; -const findCountriesList = async(req, res) => { +const findList = async(req, res) => { let filter=null; if( req.query.regex ){ const re = new RegExp( req.query.regex ); @@ -20,9 +20,9 @@ const findCountriesList = async(req, res) => { res.send( retVal ); }; -const getCountry = async(req, res) => { +const getById = async(req, res) => { const retVal = await Model.findById( req.params.id ); res.send( retVal ); }; -module.exports = { getCountriesList, findCountriesList, getCountry }; +module.exports = { getList, findList, getById }; diff --git a/sections/meta-data/routes.js b/sections/meta-data/routes.js index c9862ab..2681e86 100644 --- a/sections/meta-data/routes.js +++ b/sections/meta-data/routes.js @@ -2,8 +2,8 @@ const router = require('express').Router(); const services= require('./services.js'); -router.get('/', services.getMetaDataList); -router.get('/find', services.findMetaDataList); -router.get('/:id', services.getMetaData); +router.get('/', services.getList); +router.get('/find', services.findList); +router.get('/:id', services.getById); module.exports = router; diff --git a/sections/meta-data/services.js b/sections/meta-data/services.js index aae50c5..f07a4ec 100644 --- a/sections/meta-data/services.js +++ b/sections/meta-data/services.js @@ -3,13 +3,13 @@ const { ROOT_PATH, LIB_PATH, MODELS_PATH, HANDLERS_PATH } = process.env; const { getPagination , getPage } = require( `${ROOT_PATH}/${LIB_PATH}/Misc.js` ); const Model = require( `${ROOT_PATH}/${MODELS_PATH}/meta-data.model.js` ); -const getMetaDataList = async(req, res) => { +const getList = async(req, res) => { const { page , elements } = getPagination( req.query ); const retVal = await getPage( page , elements, Model ); res.send( retVal ); }; -const findMetaDataList = async(req, res) => { +const findList = async(req, res) => { let filter=null; if( req.query.regex ){ const re = new RegExp( req.query.regex ); @@ -20,9 +20,9 @@ const findMetaDataList = async(req, res) => { res.send( retVal ); }; -const getMetaData = async(req, res) => { +const getById = async(req, res) => { const retVal = await Model.findById( req.params.id ); res.send( retVal ); }; -module.exports = { getMetaDataList, findMetaDataList, getMetaData }; +module.exports = { getList, findList, getById }; diff --git a/sections/meta-groups/routes.js b/sections/meta-groups/routes.js index f2653dd..2681e86 100644 --- a/sections/meta-groups/routes.js +++ b/sections/meta-groups/routes.js @@ -2,8 +2,8 @@ const router = require('express').Router(); const services= require('./services.js'); -router.get('/', services.getMetaGroupsList); -router.get('/find', services.findMetaGroupsList); -router.get('/:id', services.getMetaGroups); +router.get('/', services.getList); +router.get('/find', services.findList); +router.get('/:id', services.getById); module.exports = router; diff --git a/sections/meta-groups/services.js b/sections/meta-groups/services.js index b1e440f..b3b3334 100644 --- a/sections/meta-groups/services.js +++ b/sections/meta-groups/services.js @@ -3,13 +3,13 @@ const { ROOT_PATH, LIB_PATH, MODELS_PATH, HANDLERS_PATH } = process.env; const { getPagination , getPage } = require( `${ROOT_PATH}/${LIB_PATH}/Misc.js` ); const Model = require( `${ROOT_PATH}/${MODELS_PATH}/meta-groups.model.js` ); -const getMetaGroupsList = async(req, res) => { +const getList = async(req, res) => { const { page , elements } = getPagination( req.query ); const retVal = await getPage( page , elements, Model ); res.send( retVal ); }; -const findMetaGroupsList = async(req, res) => { +const findList = async(req, res) => { let filter=null; if( req.query.regex ){ const re = new RegExp( req.query.regex ); @@ -20,9 +20,9 @@ const findMetaGroupsList = async(req, res) => { res.send( retVal ); }; -const getMetaGroups = async(req, res) => { +const getById = async(req, res) => { const retVal = await Model.findById( req.params.id ); res.send( retVal ); }; -module.exports = { getMetaGroupsList, findMetaGroupsList, getMetaGroups }; +module.exports = { getList, findList, getById }; diff --git a/sections/product-categories/routes.js b/sections/product-categories/routes.js index ba848db..2681e86 100644 --- a/sections/product-categories/routes.js +++ b/sections/product-categories/routes.js @@ -2,8 +2,8 @@ const router = require('express').Router(); const services= require('./services.js'); -router.get('/', services.getProductCategoriesList); -router.get('/find', services.findProductCategoriesList); -router.get('/:id', services.getProductCategory ); +router.get('/', services.getList); +router.get('/find', services.findList); +router.get('/:id', services.getById); module.exports = router; diff --git a/sections/product-categories/services.js b/sections/product-categories/services.js index 527e923..484060d 100644 --- a/sections/product-categories/services.js +++ b/sections/product-categories/services.js @@ -3,13 +3,13 @@ const { ROOT_PATH, LIB_PATH, MODELS_PATH, HANDLERS_PATH } = process.env; const { getPagination , getPage } = require( `${ROOT_PATH}/${LIB_PATH}/Misc.js` ); const Model = require( `${ROOT_PATH}/${MODELS_PATH}/product-categories.model.js` ); -const getProductCategoriesList = async(req, res) => { +const getList = async(req, res) => { const { page , elements } = getPagination( req.query ); const retVal = await getPage( page , elements, Model ); res.send( retVal ); }; -const findProductCategoriesList = async(req, res) => { +const findList = async(req, res) => { let filter=null; if( req.query.regex ){ const re = new RegExp( req.query.regex ); @@ -20,9 +20,9 @@ const findProductCategoriesList = async(req, res) => { res.send( retVal ); }; -const getProductCategory = async(req, res) => { +const getById = async(req, res) => { const retVal = await Model.findById( req.params.id ); res.send( retVal ); }; -module.exports = { getProductCategoriesList, findProductCategoriesList, getProductCategory }; +module.exports = { getList, findList, getById }; diff --git a/sections/products/routes.js b/sections/products/routes.js index a349f87..2681e86 100644 --- a/sections/products/routes.js +++ b/sections/products/routes.js @@ -2,8 +2,8 @@ const router = require('express').Router(); const services= require('./services.js'); -router.get('/', services.getProductsList); -router.get('/find', services.findProductsList); -router.get('/:id', services.getProduct); +router.get('/', services.getList); +router.get('/find', services.findList); +router.get('/:id', services.getById); module.exports = router; diff --git a/sections/products/services.js b/sections/products/services.js index 5a6311c..b847f96 100644 --- a/sections/products/services.js +++ b/sections/products/services.js @@ -3,13 +3,13 @@ const { ROOT_PATH, LIB_PATH, MODELS_PATH, HANDLERS_PATH } = process.env; const { getPagination , getPage } = require( `${ROOT_PATH}/${LIB_PATH}/Misc.js` ); const Model = require( `${ROOT_PATH}/${MODELS_PATH}/products.model.js` ); -const getProductsList = async(req, res) => { +const getList = async(req, res) => { const { page , elements } = getPagination( req.query ); const retVal = await getPage( page , elements, Model ); res.send( retVal ); }; -const findProductsList = async(req, res) => { +const findList = async(req, res) => { let filter=null; if( req.query.regex ){ const re = new RegExp( req.query.regex ); @@ -20,9 +20,9 @@ const findProductsList = async(req, res) => { res.send( retVal ); }; -const getProduct = async(req, res) => { +const getById = async(req, res) => { const retVal = await Model.findById( req.params.id ); res.send( retVal ); }; -module.exports = { getProductsList, findProductsList, getProduct }; +module.exports = { getList, findList, getById }; diff --git a/sections/states/routes.js b/sections/states/routes.js index 99d6d87..2681e86 100644 --- a/sections/states/routes.js +++ b/sections/states/routes.js @@ -2,8 +2,8 @@ const router = require('express').Router(); const services= require('./services.js'); -router.get('/', services.getStatesList); -router.get('/find', services.findStatesList); -router.get('/:id', services.getState); +router.get('/', services.getList); +router.get('/find', services.findList); +router.get('/:id', services.getById); module.exports = router; diff --git a/sections/states/services.js b/sections/states/services.js index e45c163..3d493e9 100644 --- a/sections/states/services.js +++ b/sections/states/services.js @@ -3,13 +3,13 @@ const { ROOT_PATH, LIB_PATH, MODELS_PATH, HANDLERS_PATH } = process.env; const { getPagination , getPage } = require( `${ROOT_PATH}/${LIB_PATH}/Misc.js` ); const Model = require( `${ROOT_PATH}/${MODELS_PATH}/states.model.js` ); -const getStatesList = async(req, res) => { +const getList = async(req, res) => { const { page , elements } = getPagination( req.query ); const retVal = await getPage( page , elements, Model ); res.send( retVal ); }; -const findStatesList = async(req, res) => { +const findList = async(req, res) => { let filter=null; if( req.query.regex ){ const re = new RegExp( req.query.regex ); @@ -20,9 +20,9 @@ const findStatesList = async(req, res) => { res.send( retVal ); }; -const getState = async(req, res) => { +const getById = async(req, res) => { const retVal = await Model.findById( req.params.id ); res.send( retVal ); }; -module.exports = { getStatesList, findStatesList, getState }; +module.exports = { getList, findList, getById };