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

fix(loads): populate company and carrier fields

Browse Source
This commit is contained in:
Josepablo C.
2023-10-06 20:28:12 -06:00
parent d019017600
commit e538e229f3
12 changed files with 51 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
lib/Misc.js
View File

@@ -25,7 +25,7 @@ function getPagination( query ){
return limit; return limit;
} }
async function queryPage( page, elements, model, filter=null, projection=null){ async function getPage( page, elements, model, filter=null, projection=null){
const skip = elements * page; const skip = elements * page;
const total = await model.count( filter ); const total = await model.count( filter );
const list = await model.find( filter , projection, { skip : skip , limit : elements } ); const list = await model.find( filter , projection, { skip : skip , limit : elements } );
@@ -37,4 +37,14 @@ async function queryPage( page, elements, model, filter=null, projection=null){
} }
} }
module.exports = { getPagination , queryPage }; async function queryPage(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
};
}
module.exports = { getPagination , getPage, queryPage };

2
lib/Models/companies.model.js
View File

@@ -62,4 +62,4 @@ const schema = new Schema({
is_hidden: { type: Boolean, default: false }, is_hidden: { type: Boolean, default: false },
}); });
module.exports = mongoose.model( "branches", schema ); module.exports = mongoose.model( "companies", schema );

6
sections/cities/services.js
View File

@@ -1,11 +1,11 @@
"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 , getPage } = require( `${ROOT_PATH}/${LIB_PATH}/Misc.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 getCitiesList = async(req, res) => {
const { page , elements } = getPagination( req.query ); const { page , elements } = getPagination( req.query );
const retVal = await queryPage( page , elements, Model ); const retVal = await getPage( page , elements, Model );
res.send( retVal ); res.send( retVal );
}; };
@@ -16,7 +16,7 @@ const findCitiesList = async(req, res) => {
filter = { "city_name" : { $regex: re, $options: 'i' }}; filter = { "city_name" : { $regex: re, $options: 'i' }};
} }
const { page , elements } = getPagination( req.query ); const { page , elements } = getPagination( req.query );
const retVal = await queryPage( page, elements, Model, filter ); const retVal = await getPage( page, elements, Model, filter );
res.send( retVal ); res.send( retVal );
}; };

6
sections/countries/services.js
View File

@@ -1,11 +1,11 @@
"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 , 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 getCountriesList = async(req, res) => {
const { page , elements } = getPagination( req.query ); const { page , elements } = getPagination( req.query );
const retVal = await queryPage( page , elements, Model ); const retVal = await getPage( page , elements, Model );
res.send( retVal ); res.send( retVal );
}; };
@@ -16,7 +16,7 @@ const findCountriesList = async(req, res) => {
filter = { "country_name" : { $regex: re, $options: 'i' }}; filter = { "country_name" : { $regex: re, $options: 'i' }};
} }
const { page , elements } = getPagination( req.query ); const { page , elements } = getPagination( req.query );
const retVal = await queryPage( page, elements, Model, filter ); const retVal = await getPage( page, elements, Model, filter );
res.send( retVal ); res.send( retVal );
}; };

6
sections/load-attachments/services.js
View File

@@ -1,6 +1,6 @@
"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 , getPage } = require( `${ROOT_PATH}/${LIB_PATH}/Misc.js` );
const Model = require( `${ROOT_PATH}/${MODELS_PATH}/load-attachments.model.js` ); const Model = require( `${ROOT_PATH}/${MODELS_PATH}/load-attachments.model.js` );
const UserModel = require( `${ROOT_PATH}/${MODELS_PATH}/users.model.js` ); const UserModel = require( `${ROOT_PATH}/${MODELS_PATH}/users.model.js` );
const LoadsModel = require( `${ROOT_PATH}/${MODELS_PATH}/loads.model.js` ); const LoadsModel = require( `${ROOT_PATH}/${MODELS_PATH}/loads.model.js` );
@@ -32,7 +32,7 @@ const getAttachment = async(req, res) => {
const getAttachmentList = async(req, res) => { const getAttachmentList = 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 retVal = await queryPage( page, elements, Model, filter ); const retVal = await getPage( page, elements, Model, filter );
res.send( retVal ); res.send( retVal );
}; };
@@ -46,7 +46,7 @@ const getLoadAttachmentList = async(req, res) => {
] ]
}; };
const { page , elements } = getPagination( req.query ); const { page , elements } = getPagination( req.query );
const retVal = await queryPage( page, elements, Model, filter ); const retVal = await getPage( page, elements, Model, filter );
res.send( retVal ); res.send( retVal );
}; };

15
sections/loads/services.js
View File

@@ -3,6 +3,7 @@ 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 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` );
async function getAuthorizationFilter( userId ){ async function getAuthorizationFilter( userId ){
const user = await UserModel.findById( userId ); const user = await UserModel.findById( userId );
@@ -18,8 +19,16 @@ async function getAuthorizationFilter( userId ){
const getLoadsList = async(req, res) => { const getLoadsList = 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 retVal = await queryPage( page , elements, Model, filter ); const query = await queryPage( page , elements, Model, filter );
res.send( retVal ); const list = await query.query.populate('product')
.populate('company')
.populate('carrier');
res.send({
total : query.total,
limit : elements,
skip : query.skip,
data : list
});
}; };
const getLoad = async(req, res) => { const getLoad = async(req, res) => {
@@ -31,7 +40,7 @@ const getLoad = async(req, res) => {
CompanyAccessFilter CompanyAccessFilter
] ]
}; };
const retVal = await Model.findOne( filter ).populate('product').populate('categories') || {}; const retVal = await Model.findOne( filter ).populate('product').populate('company').populate('carrier') || {};
res.send( retVal ); res.send( retVal );
}; };

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

@@ -1,11 +1,11 @@
"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 , 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 getMetaDataList = async(req, res) => {
const { page , elements } = getPagination( req.query ); const { page , elements } = getPagination( req.query );
const retVal = await queryPage( page , elements, Model ); const retVal = await getPage( page , elements, Model );
res.send( retVal ); res.send( retVal );
}; };
@@ -16,7 +16,7 @@ const findMetaDataList = async(req, res) => {
filter = { "meta_value" : { $regex: re, $options: 'i' }}; filter = { "meta_value" : { $regex: re, $options: 'i' }};
} }
const { page , elements } = getPagination( req.query ); const { page , elements } = getPagination( req.query );
const retVal = await queryPage( page, elements, Model, filter ); const retVal = await getPage( page, elements, Model, filter );
res.send( retVal ); res.send( retVal );
}; };

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

@@ -1,11 +1,11 @@
"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 , 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 getMetaGroupsList = async(req, res) => {
const { page , elements } = getPagination( req.query ); const { page , elements } = getPagination( req.query );
const retVal = await queryPage( page , elements, Model ); const retVal = await getPage( page , elements, Model );
res.send( retVal ); res.send( retVal );
}; };
@@ -16,7 +16,7 @@ const findMetaGroupsList = async(req, res) => {
filter = { "group_label" : { $regex: re, $options: 'i' }}; filter = { "group_label" : { $regex: re, $options: 'i' }};
} }
const { page , elements } = getPagination( req.query ); const { page , elements } = getPagination( req.query );
const retVal = await queryPage( page, elements, Model, filter ); const retVal = await getPage( page, elements, Model, filter );
res.send( retVal ); res.send( retVal );
}; };

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

@@ -1,11 +1,11 @@
"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 , 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 getProductCategoriesList = async(req, res) => {
const { page , elements } = getPagination( req.query ); const { page , elements } = getPagination( req.query );
const retVal = await queryPage( page , elements, Model ); const retVal = await getPage( page , elements, Model );
res.send( retVal ); res.send( retVal );
}; };
@@ -16,7 +16,7 @@ const findProductCategoriesList = async(req, res) => {
filter = { "name" : { $regex: re, $options: 'i' }}; filter = { "name" : { $regex: re, $options: 'i' }};
} }
const { page , elements } = getPagination( req.query ); const { page , elements } = getPagination( req.query );
const retVal = await queryPage( page, elements, Model, filter ); const retVal = await getPage( page, elements, Model, filter );
res.send( retVal ); res.send( retVal );
}; };

6
sections/products/services.js
View File

@@ -1,11 +1,11 @@
"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 , 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 getProductsList = async(req, res) => {
const { page , elements } = getPagination( req.query ); const { page , elements } = getPagination( req.query );
const retVal = await queryPage( page , elements, Model ); const retVal = await getPage( page , elements, Model );
res.send( retVal ); res.send( retVal );
}; };
@@ -16,7 +16,7 @@ const findProductsList = async(req, res) => {
filter = { "name" : { $regex: re, $options: 'i' }}; filter = { "name" : { $regex: re, $options: 'i' }};
} }
const { page , elements } = getPagination( req.query ); const { page , elements } = getPagination( req.query );
const retVal = await queryPage( page, elements, Model, filter ); const retVal = await getPage( page, elements, Model, filter );
res.send( retVal ); res.send( retVal );
}; };

4
sections/public-vehicles/services.js
View File

@@ -1,6 +1,6 @@
"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 , getPage } = require( `${ROOT_PATH}/${LIB_PATH}/Misc.js` );
const Model = require( `${ROOT_PATH}/${MODELS_PATH}/vehicles.model.js` ); const Model = require( `${ROOT_PATH}/${MODELS_PATH}/vehicles.model.js` );
const getPublicVehiclesList = async(req, res) => { const getPublicVehiclesList = async(req, res) => {
@@ -18,7 +18,7 @@ const getPublicVehiclesList = async(req, res) => {
"status" "status"
]; ];
const { page , elements } = getPagination( req.query ); const { page , elements } = getPagination( req.query );
const retVal = await queryPage( page , elements, Model, filter, select ); const retVal = await getPage( page , elements, Model, filter, select );
res.send( retVal ); res.send( retVal );
}; };

6
sections/states/services.js
View File

@@ -1,11 +1,11 @@
"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 , 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 getStatesList = async(req, res) => {
const { page , elements } = getPagination( req.query ); const { page , elements } = getPagination( req.query );
const retVal = await queryPage( page , elements, Model ); const retVal = await getPage( page , elements, Model );
res.send( retVal ); res.send( retVal );
}; };
@@ -16,7 +16,7 @@ const findStatesList = async(req, res) => {
filter = { "state_name" : { $regex: re, $options: 'i' }}; filter = { "state_name" : { $regex: re, $options: 'i' }};
} }
const { page , elements } = getPagination( req.query ); const { page , elements } = getPagination( req.query );
const retVal = await queryPage( page, elements, Model, filter ); const retVal = await getPage( page, elements, Model, filter );
res.send( retVal ); res.send( retVal );
}; };