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

fix(loads): FindList requires access to any Load

Browse Source
This commit is contained in:
Josepablo C
2024-04-02 10:35:26 -06:00
parent 3c650138b9
commit eb08f4abb8
1 changed files with 25 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
src/apps/private/loads/services.js
View File

@@ -1,8 +1,8 @@
"use strict"; "use strict";
const { ROOT_PATH, LIB_PATH, MODELS_PATH, HANDLERS_PATH } = process.env; const { ROOT_PATH, LIB_PATH } = process.env;
const { getModel } = require( `${ROOT_PATH}/${MODELS_PATH}` ); const { getModel } = require( '../../../lib/Models' );
const { getPagination } = require( `${ROOT_PATH}/${LIB_PATH}/Misc.js` ); const { getPagination } = require( `${ROOT_PATH}/${LIB_PATH}/Misc.js` );
const { GenericHandler } = require( `${ROOT_PATH}/${HANDLERS_PATH}/Generic.handler.js` ); const { GenericHandler } = require( '../../../lib/Handlers//Generic.handler.js' );
const Model = getModel('loads'); const Model = getModel('loads');
const ProposalsModel = getModel('proposals'); const ProposalsModel = getModel('proposals');
@@ -11,8 +11,26 @@ const generic = new GenericHandler( Model, null, populate_list );
function getAndFilterList( query ){ function getAndFilterList( query ){
const filter_list = []; const filter_list = [];
const { status, posted_by_name, load_status, published_date, loaded_date, transit_date, categories, product, shipment_code } = query; const {
company,
carrier,
vehicle,
driver,
status,
posted_by_name,
load_status,
published_date,
loaded_date,
transit_date,
categories,
product,
shipment_code
} = query;
if( company ){ filter_list.push( { company } ); }
if( carrier ){ filter_list.push( { carrier } ); }
if( vehicle ){ filter_list.push( { vehicle } ); }
if( driver ){ filter_list.push( { driver } ); }
if( status ){ filter_list.push( { status } ); } if( status ){ filter_list.push( { status } ); }
if( posted_by_name ) { filter_list.push({ posted_by_name }); } if( posted_by_name ) { filter_list.push({ posted_by_name }); }
if( load_status ) { filter_list.push({ load_status }); } if( load_status ) { filter_list.push({ load_status }); }
@@ -23,28 +41,20 @@ function getAndFilterList( query ){
if( product ) { filter_list.push({ product }); } if( product ) { filter_list.push({ product }); }
if( shipment_code ) { filter_list.push({ shipment_code }); } if( shipment_code ) { filter_list.push({ shipment_code }); }
if( filter_list.length == 0 ){ if( filter_list.length == 0 ){
return null; return null;
} }
return filter_list; return filter_list;
} }
async function findLoads( companyId , query ){ async function findLoads( query ){
const { page, elements } = getPagination( query ); const { page, elements } = getPagination( query );
const andFilterList = getAndFilterList( query ); const andFilterList = getAndFilterList( query );
let filter; let filter;
if( andFilterList ){ if( andFilterList ){
andFilterList.push({$or : [
{ company : companyId },
{ carrier : companyId }
]});
filter = { $and : andFilterList }; filter = { $and : andFilterList };
}else{ }else{
filter = {$or : [ filter = null;
{ company : companyId },
{ carrier : companyId }
]};
} }
const { total , limit, skip, data } = await generic.getList( page , elements, filter ); const { total , limit, skip, data } = await generic.getList( page , elements, filter );
const load_list = data; const load_list = data;
@@ -77,8 +87,7 @@ async function findElementById( elementId ){
const findList = async(req, res) => { const findList = async(req, res) => {
try{ try{
const query = req.query || {}; const query = req.query || {};
const companyId = req.context.companyId; const retVal = await findLoads( query );
const retVal = await findLoads( companyId , query );
res.send( retVal ); res.send( retVal );
}catch(error){ }catch(error){
console.error( error ); console.error( error );