lqdvi/app2-api
2
0
Fork 0
Code Issues 24 Pull Requests Actions Packages Projects Releases Wiki Activity

entities mejorado

Browse Source
This commit is contained in:
David Arranz 2019-07-11 12:05:31 +02:00
parent 081fac98ea
commit 8a7f56afed
3 changed files with 14 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules/entities/entity.controller.js
View File

@ -11,7 +11,11 @@ const controllerOptions = { MODULE_NAME };
const extraControllers = {
findColleges: async (req, res, next) => {
const params = extractParamsFromRequest(req, res, {});
console.log('aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-params');
console.log(params);
try {
const result = await entityService.fetch(params, { user: req.user, type: 'college' });
return handleResultResponse(result, result.count, params, res);
@ -23,7 +27,7 @@ const extraControllers = {
findPartners: async (req, res, next) => {
const params = extractParamsFromRequest(req, res, {});
try {
const result = await eventService.fetch(params, { user: req.user, type: 'partner' });
const result = await entityService.fetch(params, { user: req.user, type: 'partner' });
return handleResultResponse(result, result.count, params, res);
} catch (error) {
handleErrorResponse(MODULE_NAME, 'findNext', error, res);

8
modules/entities/entity.routes.js
View File

@ -12,12 +12,13 @@ const entityController = require('./entity.controller');
routes.get ('/entities',
isLoggedUser,
PaginateMiddleware.middleware(),
entityController.find);
routes.get ('/entities/colleges',
PaginateMiddleware.middleware(),
FieldMiddleware.middleware({
invalidFields: ['state', 'createdAt', 'updatedAt', 'EntityTypes.id']
invalidFields: ['state', 'createdAt', 'updatedAt']
}),
SortMiddleware.middleware({ default: "name" }),
entityController.findColleges
@ -25,7 +26,10 @@ routes.get ('/entities/colleges',
routes.get ('/entities/partners',
PaginateMiddleware.middleware(),
SortMiddleware.middleware({ default: "name" }),
FieldMiddleware.middleware({
invalidFields: ['state', 'createdAt', 'updatedAt']
}),
SortMiddleware.middleware({ default: "name" }),
entityController.findPartners
);

40
modules/entities/entity.service.js
View File

@ -11,51 +11,17 @@ const extraMethods = {
const type = context.type;
const findOptions = parseParamsToFindOptions(params);
console.log('ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZz');
console.log(findOptions);
// findOptions.where = { 'name': '(Colegio Cristo Rey)'};
switch (type) {
case 'college':
// findOptions.where = Object.assign({},
// findOptions.where, {
// 'EntityType.alias' : 'college'
// });
break;
case 'partner':
// findOptions.where = Object.assign({},
// findOptions.where, {
// date: {
// [Sequelize.Op.gte]: moment().startOf('day').utc(),
// [Sequelize.Op.lt]: moment().add(1, 'days').startOf('day').utc(),
// }
// });
break;
default:
break;
}
// Incluir
findOptions.include.push({
model: models.EntityType, where: { alias: 'college' }, attributes: ['name'],
model: models.EntityType, where: { alias: type }, attributes: [],
});
// findOptions.include.push({
// model: models.EventType,
// });
// findOptions.include.push({
// model: models.Venue,
// });
findOptions.where = Object.assign({},
findOptions.where, {
state: 'publish'
});
});
try {
return await models.Entity.findAll(findOptions);
return await models.Entity.findAndCountAll(findOptions);
} catch (error) {
throw error;
}