ETA/ETAApi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: Cities uses GenericHandler

Browse Source
This commit is contained in:
Josepablo C.
2023-10-09 12:39:39 -06:00
parent 54387add66
commit d01f62004f
18 changed files with 124 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
dotenv
View File

@@ -1,6 +1,6 @@
SERVER_PORT=3000 SERVER_PORT=3000
ROOT_PATH=/home/josepablocb/Documents/Work/EnRuta/SysS/ETAAPI ROOT_PATH=/home/josepablocb/Documents/Work/EnRuta/SysS/ETAAPI
API_CONFIG=config/apiConfig.json API_CONFIG=config/apiConfig_local.json
############################ ############################
# PATHS relative to ROOT # PATHS relative to ROOT
############################ ############################

2
index.js
View File

@@ -18,7 +18,7 @@ mongoose.connect(
apiConfig.mongodb, apiConfig.mongodb,
{ useNewUrlParser: true } { useNewUrlParser: true }
).then( ( val ) => { ).then( ( val ) => {
console.log( "MongoDB Connected" ); console.log( `MongoDB Connected : ${ apiConfig.mongodb }` );
});//catch throw error so service stops! });//catch throw error so service stops!
const app = express(); const app = express();

59
lib/Handlers/Generic.handler.js Normal file
View File

@@ -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 };

1
scripts/ci_functions.sh
View File

@@ -8,6 +8,7 @@ function build_docker(){
return -1 return -1
fi fi
CONTAINER_NAME=$1 CONTAINER_NAME=$1
cat config/apiConfig.json > config/apiConfig_local.json
set -x set -x
docker rmi -f "$AWS_ECR_REPO/$CONTAINER_NAME" docker rmi -f "$AWS_ECR_REPO/$CONTAINER_NAME"

6
sections/cities/routes.js
View File

@@ -2,8 +2,8 @@
const router = require('express').Router(); const router = require('express').Router();
const services= require('./services.js'); const services= require('./services.js');
router.get('/', services.getCitiesList); router.get('/', services.getList);
router.get('/find', services.findCitiesList); router.get('/find', services.findList);
router.get('/:id', services.getCity); router.get('/:id', services.getById);
module.exports = router; module.exports = router;

29
sections/cities/services.js
View File

@@ -1,28 +1,33 @@
"use strict"; "use strict";
const { ROOT_PATH, LIB_PATH, MODELS_PATH, HANDLERS_PATH } = process.env; const { ROOT_PATH, LIB_PATH, MODELS_PATH, HANDLERS_PATH } = process.env;
const { getPagination , getPage } = require( `${ROOT_PATH}/${LIB_PATH}/Misc.js` ); 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 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 { page , elements } = getPagination( req.query );
const retVal = await getPage( page , elements, Model ); const retVal = await generic.getList(page , elements);
res.send( retVal ); res.send( retVal );
}; };
const findCitiesList = async(req, res) => { const findList = async(req, res) => {
let filter=null; const findString = req.query.regex || null;
if( req.query.regex ){ const { page , elements } = getPagination( req.query );
const re = new RegExp( req.query.regex ); let retVal;
filter = { "city_name" : { $regex: re, $options: 'i' }}; 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 ); res.send( retVal );
}; };
const getCity = async(req, res) => { const getById = async(req, res) => {
const retVal = await Model.findById( req.params.id ); const id=req.params.id;
const retVal = await generic.getById( id );
res.send( retVal ); res.send( retVal );
}; };
module.exports = { getCitiesList , findCitiesList , getCity }; module.exports = { getList , findList , getById };

6
sections/countries/routes.js
View File

@@ -2,8 +2,8 @@
const router = require('express').Router(); const router = require('express').Router();
const services= require('./services.js'); const services= require('./services.js');
router.get('/', services.getCountriesList); router.get('/', services.getList);
router.get('/find', services.findCountriesList); router.get('/find', services.findList);
router.get('/:id', services.getCountry); router.get('/:id', services.getById);
module.exports = router; module.exports = router;

8
sections/countries/services.js
View File

@@ -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 { getPagination , getPage } = require( `${ROOT_PATH}/${LIB_PATH}/Misc.js` );
const Model = require( `${ROOT_PATH}/${MODELS_PATH}/countries.model.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 { page , elements } = getPagination( req.query );
const retVal = await getPage( page , elements, Model ); const retVal = await getPage( page , elements, Model );
res.send( retVal ); res.send( retVal );
}; };
const findCountriesList = async(req, res) => { const findList = async(req, res) => {
let filter=null; let filter=null;
if( req.query.regex ){ if( req.query.regex ){
const re = new RegExp( req.query.regex ); const re = new RegExp( req.query.regex );
@@ -20,9 +20,9 @@ const findCountriesList = async(req, res) => {
res.send( retVal ); res.send( retVal );
}; };
const getCountry = async(req, res) => { const getById = async(req, res) => {
const retVal = await Model.findById( req.params.id ); const retVal = await Model.findById( req.params.id );
res.send( retVal ); res.send( retVal );
}; };
module.exports = { getCountriesList, findCountriesList, getCountry }; module.exports = { getList, findList, getById };

6
sections/meta-data/routes.js
View File

@@ -2,8 +2,8 @@
const router = require('express').Router(); const router = require('express').Router();
const services= require('./services.js'); const services= require('./services.js');
router.get('/', services.getMetaDataList); router.get('/', services.getList);
router.get('/find', services.findMetaDataList); router.get('/find', services.findList);
router.get('/:id', services.getMetaData); router.get('/:id', services.getById);
module.exports = router; module.exports = router;

8
sections/meta-data/services.js
View File

@@ -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 { getPagination , getPage } = require( `${ROOT_PATH}/${LIB_PATH}/Misc.js` );
const Model = require( `${ROOT_PATH}/${MODELS_PATH}/meta-data.model.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 { page , elements } = getPagination( req.query );
const retVal = await getPage( page , elements, Model ); const retVal = await getPage( page , elements, Model );
res.send( retVal ); res.send( retVal );
}; };
const findMetaDataList = async(req, res) => { const findList = async(req, res) => {
let filter=null; let filter=null;
if( req.query.regex ){ if( req.query.regex ){
const re = new RegExp( req.query.regex ); const re = new RegExp( req.query.regex );
@@ -20,9 +20,9 @@ const findMetaDataList = async(req, res) => {
res.send( retVal ); res.send( retVal );
}; };
const getMetaData = async(req, res) => { const getById = async(req, res) => {
const retVal = await Model.findById( req.params.id ); const retVal = await Model.findById( req.params.id );
res.send( retVal ); res.send( retVal );
}; };
module.exports = { getMetaDataList, findMetaDataList, getMetaData }; module.exports = { getList, findList, getById };

6
sections/meta-groups/routes.js
View File

@@ -2,8 +2,8 @@
const router = require('express').Router(); const router = require('express').Router();
const services= require('./services.js'); const services= require('./services.js');
router.get('/', services.getMetaGroupsList); router.get('/', services.getList);
router.get('/find', services.findMetaGroupsList); router.get('/find', services.findList);
router.get('/:id', services.getMetaGroups); router.get('/:id', services.getById);
module.exports = router; module.exports = router;

8
sections/meta-groups/services.js
View File

@@ -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 { getPagination , getPage } = require( `${ROOT_PATH}/${LIB_PATH}/Misc.js` );
const Model = require( `${ROOT_PATH}/${MODELS_PATH}/meta-groups.model.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 { page , elements } = getPagination( req.query );
const retVal = await getPage( page , elements, Model ); const retVal = await getPage( page , elements, Model );
res.send( retVal ); res.send( retVal );
}; };
const findMetaGroupsList = async(req, res) => { const findList = async(req, res) => {
let filter=null; let filter=null;
if( req.query.regex ){ if( req.query.regex ){
const re = new RegExp( req.query.regex ); const re = new RegExp( req.query.regex );
@@ -20,9 +20,9 @@ const findMetaGroupsList = async(req, res) => {
res.send( retVal ); res.send( retVal );
}; };
const getMetaGroups = async(req, res) => { const getById = async(req, res) => {
const retVal = await Model.findById( req.params.id ); const retVal = await Model.findById( req.params.id );
res.send( retVal ); res.send( retVal );
}; };
module.exports = { getMetaGroupsList, findMetaGroupsList, getMetaGroups }; module.exports = { getList, findList, getById };

6
sections/product-categories/routes.js
View File

@@ -2,8 +2,8 @@
const router = require('express').Router(); const router = require('express').Router();
const services= require('./services.js'); const services= require('./services.js');
router.get('/', services.getProductCategoriesList); router.get('/', services.getList);
router.get('/find', services.findProductCategoriesList); router.get('/find', services.findList);
router.get('/:id', services.getProductCategory ); router.get('/:id', services.getById);
module.exports = router; module.exports = router;

8
sections/product-categories/services.js
View File

@@ -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 { getPagination , getPage } = require( `${ROOT_PATH}/${LIB_PATH}/Misc.js` );
const Model = require( `${ROOT_PATH}/${MODELS_PATH}/product-categories.model.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 { page , elements } = getPagination( req.query );
const retVal = await getPage( page , elements, Model ); const retVal = await getPage( page , elements, Model );
res.send( retVal ); res.send( retVal );
}; };
const findProductCategoriesList = async(req, res) => { const findList = async(req, res) => {
let filter=null; let filter=null;
if( req.query.regex ){ if( req.query.regex ){
const re = new RegExp( req.query.regex ); const re = new RegExp( req.query.regex );
@@ -20,9 +20,9 @@ const findProductCategoriesList = async(req, res) => {
res.send( retVal ); res.send( retVal );
}; };
const getProductCategory = async(req, res) => { const getById = async(req, res) => {
const retVal = await Model.findById( req.params.id ); const retVal = await Model.findById( req.params.id );
res.send( retVal ); res.send( retVal );
}; };
module.exports = { getProductCategoriesList, findProductCategoriesList, getProductCategory }; module.exports = { getList, findList, getById };

6
sections/products/routes.js
View File

@@ -2,8 +2,8 @@
const router = require('express').Router(); const router = require('express').Router();
const services= require('./services.js'); const services= require('./services.js');
router.get('/', services.getProductsList); router.get('/', services.getList);
router.get('/find', services.findProductsList); router.get('/find', services.findList);
router.get('/:id', services.getProduct); router.get('/:id', services.getById);
module.exports = router; module.exports = router;

8
sections/products/services.js
View File

@@ -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 { getPagination , getPage } = require( `${ROOT_PATH}/${LIB_PATH}/Misc.js` );
const Model = require( `${ROOT_PATH}/${MODELS_PATH}/products.model.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 { page , elements } = getPagination( req.query );
const retVal = await getPage( page , elements, Model ); const retVal = await getPage( page , elements, Model );
res.send( retVal ); res.send( retVal );
}; };
const findProductsList = async(req, res) => { const findList = async(req, res) => {
let filter=null; let filter=null;
if( req.query.regex ){ if( req.query.regex ){
const re = new RegExp( req.query.regex ); const re = new RegExp( req.query.regex );
@@ -20,9 +20,9 @@ const findProductsList = async(req, res) => {
res.send( retVal ); res.send( retVal );
}; };
const getProduct = async(req, res) => { const getById = async(req, res) => {
const retVal = await Model.findById( req.params.id ); const retVal = await Model.findById( req.params.id );
res.send( retVal ); res.send( retVal );
}; };
module.exports = { getProductsList, findProductsList, getProduct }; module.exports = { getList, findList, getById };

6
sections/states/routes.js
View File

@@ -2,8 +2,8 @@
const router = require('express').Router(); const router = require('express').Router();
const services= require('./services.js'); const services= require('./services.js');
router.get('/', services.getStatesList); router.get('/', services.getList);
router.get('/find', services.findStatesList); router.get('/find', services.findList);
router.get('/:id', services.getState); router.get('/:id', services.getById);
module.exports = router; module.exports = router;

8
sections/states/services.js
View File

@@ -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 { getPagination , getPage } = require( `${ROOT_PATH}/${LIB_PATH}/Misc.js` );
const Model = require( `${ROOT_PATH}/${MODELS_PATH}/states.model.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 { page , elements } = getPagination( req.query );
const retVal = await getPage( page , elements, Model ); const retVal = await getPage( page , elements, Model );
res.send( retVal ); res.send( retVal );
}; };
const findStatesList = async(req, res) => { const findList = async(req, res) => {
let filter=null; let filter=null;
if( req.query.regex ){ if( req.query.regex ){
const re = new RegExp( req.query.regex ); const re = new RegExp( req.query.regex );
@@ -20,9 +20,9 @@ const findStatesList = async(req, res) => {
res.send( retVal ); res.send( retVal );
}; };
const getState = async(req, res) => { const getById = async(req, res) => {
const retVal = await Model.findById( req.params.id ); const retVal = await Model.findById( req.params.id );
res.send( retVal ); res.send( retVal );
}; };
module.exports = { getStatesList, findStatesList, getState }; module.exports = { getList, findList, getById };