feat: Adding no_of_proposals to loads

This commit is contained in:
2023-10-10 21:08:55 -06:00
parent 74ad7c5e3f
commit b3d3af91fb
3 changed files with 25 additions and 17 deletions

View File

@@ -2,7 +2,7 @@
const router = require('express').Router(); const router = require('express').Router();
const services= require('./services.js'); const services= require('./services.js');
router.get('/', services.getLoadsList); router.get('/', services.getList);
router.get('/:id', services.getLoad); router.get('/:id', services.getById);
module.exports = router; module.exports = router;

View File

@@ -1,9 +1,15 @@
"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 , queryPage } = require( `${ROOT_PATH}/${LIB_PATH}/Misc.js` ); const { getPagination , queryPage } = require( `${ROOT_PATH}/${LIB_PATH}/Misc.js` );
const { GenericHandler } = require( `${ROOT_PATH}/${HANDLERS_PATH}/Generic.handler.js` );
const Model = require( `${ROOT_PATH}/${MODELS_PATH}/loads.model.js` ); const Model = require( `${ROOT_PATH}/${MODELS_PATH}/loads.model.js` );
const UserModel = require( `${ROOT_PATH}/${MODELS_PATH}/users.model.js` ); const UserModel = require( `${ROOT_PATH}/${MODELS_PATH}/users.model.js` );
const CompaniesModel = require( `${ROOT_PATH}/${MODELS_PATH}/companies.model.js` ); const CompaniesModel = require( `${ROOT_PATH}/${MODELS_PATH}/companies.model.js` );
const VehiclesModel = require( `${ROOT_PATH}/${MODELS_PATH}/vehicles.model.js` );
const ProposalsModel = require( `${ROOT_PATH}/${MODELS_PATH}/proposals.model.js` );
const populate_list = ['product', 'company', 'carrier', 'vehicle'];
const generic = new GenericHandler( Model, null, populate_list );
async function getAuthorizationFilter( userId ){ async function getAuthorizationFilter( userId ){
const user = await UserModel.findById( userId ); const user = await UserModel.findById( userId );
@@ -16,22 +22,21 @@ async function getAuthorizationFilter( userId ){
}; };
} }
const getLoadsList = async(req, res) => { const getList = async(req, res) => {
const filter = await getAuthorizationFilter( req.JWT.payload.sub ); const filter = await getAuthorizationFilter( req.JWT.payload.sub );
const { page , elements } = getPagination( req.query ); const { page , elements } = getPagination( req.query );
const query = await queryPage( page , elements, Model, filter ); const retVal = await generic.getList(page , elements, filter );
const list = await query.query.populate('product') const load_list = retVal.data;
.populate('company') for(let i=0; i<load_list.length; i++){
.populate('carrier'); const load_id = load_list[ i ].id;
res.send({ load_list[i] = load_list[i].toObject();
total : query.total, const no_of_proposals = await ProposalsModel.count({ load : load_id });
limit : elements, retVal.data[i].no_of_proposals = no_of_proposals;
skip : query.skip, }
data : list res.send( retVal );
});
}; };
const getLoad = async(req, res) => { const getById = async(req, res) => {
const loadId = req.params.id; const loadId = req.params.id;
const CompanyAccessFilter = await getAuthorizationFilter( req.JWT.payload.sub ); const CompanyAccessFilter = await getAuthorizationFilter( req.JWT.payload.sub );
const filter = { const filter = {
@@ -40,8 +45,8 @@ const getLoad = async(req, res) => {
CompanyAccessFilter CompanyAccessFilter
] ]
}; };
const retVal = await Model.findOne( filter ).populate('product').populate('company').populate('carrier') || {}; const retVal = await Model.findOne( filter ).populate( populate_list ) || {};
res.send( retVal ); res.send( retVal );
}; };
module.exports = { getLoadsList, getLoad }; module.exports = { getList, getById };

View File

@@ -24,7 +24,7 @@ async function getPageQuery(page, elements, Model, filter=null, projection=null)
} }
class GenericHandler{ class GenericHandler{
constructor( Model, search_param, populate_list=null ) { constructor( Model, search_param=null, populate_list=null ) {
this.Model = Model; this.Model = Model;
this.search_param = search_param; this.search_param = search_param;
this.populate_list = populate_list || []; this.populate_list = populate_list || [];
@@ -49,6 +49,9 @@ class GenericHandler{
} }
async findList( find_string, page, elements, projection=null ){ async findList( find_string, page, elements, projection=null ){
if( !this.search_param ){
throw new Error( "No search parameter setted up" );
}
const search_param = this.search_param; const search_param = this.search_param;
const re = new RegExp( find_string ); const re = new RegExp( find_string );
const filter = {}; const filter = {};