diff --git a/v1/src/apps/private/loads/carrier.services.js b/v1/src/apps/private/loads/carrier.services.js index 1539b8c..680d6cf 100644 --- a/v1/src/apps/private/loads/carrier.services.js +++ b/v1/src/apps/private/loads/carrier.services.js @@ -65,6 +65,7 @@ function getAndFilterList( query ){ truck_type, state, city, + privacy, } = query; if( company ){ filter_list.push( { company } ); } @@ -85,6 +86,7 @@ function getAndFilterList( query ){ if( destination_warehouse ) { filter_list.push({ destination_warehouse }); } if( alert_list ) { filter_list.push({ alert_list }); } if( truck_type ) { filter_list.push({ truck_type }); } + if( privacy ) { filter_list.push({ privacy }); } if( state ) { filter_list.push({ @@ -158,25 +160,19 @@ async function findLoads( companyId, query ){ const { $sort, company_name } = query; const { page, elements } = getPagination( query ); const andFilterList = getAndFilterList( query ) || []; - - const { privacy } = query; - const privacyVal = ( privacy && ( privacy >= 1 || privacy.toLowerCase() === 'true' ))? true: false; + /// Get list of companyIds that gave authorization to see the loads + const companiesIds = await getCompanyIdListFromGroups( companyId ) || []; let filter = {}; - - if( privacyVal ){ - const companiesIds = await getCompanyIdListFromGroups( companyId ) || []; - filter = { - company : { $in : companiesIds }, - privacy: true, - } - }else{ - filter = { - $or : [ - { privacy : false }, - { privacy : { $exists : false } } - ] - } + filter = { + $or : [ + { privacy : false }, + { privacy : { $exists : false } }, + { + company : { $in : companiesIds }, + privacy: true + } + ] } if( company_name ){