This commit is contained in:
David Arranz 2019-08-28 13:19:09 +02:00
parent 777bf55bf6
commit c36b593327
3 changed files with 15 additions and 8 deletions

View File

@ -35,11 +35,18 @@ routes.get('/events',
})(req, res, next)
else
return eventController.find({
scopes: ['defaultScope', 'includeVenue', 'includeMultimedias', 'includeDetails', { method: ['onlyOfCity', req.body.city] }]
// scopes: ['defaultScope', 'includeVenue', 'includeMultimedias', 'includeDetails', { method: ['onlyOfCity', req.body.city] }]
// scopes: ['defaultScope', 'includeVenue', 'includeMultimedias', 'includeDetails', { method: {where: {}}]
})(req, res, next);
}
);
/*
where: {
city: {
[Sequelize.Op.eq]: city
}
},
*/
routes.get('/events/cities',
isLoggedUser,
eventController.find({

View File

@ -61,9 +61,9 @@ module.exports = function (sequelize, DataTypes) {
model: sequelize.models.Event,
as: 'events',
required: false,
group: ['typeId'],
// group: ['typeId'],
// attributes: ['name', 'type.title',] //[sequelize.fn('COUNT', sequelize.col('events.typeId')), 'ediciones'],] // [sequelize.fn('SUM', sequelize.col('Event.assistants')), 'assistants']]
attributes: [[sequelize.fn('COUNT', sequelize.col('typeId')), 'ediciones'],] // [sequelize.fn('SUM', sequelize.col('Event.assistants')), 'assistants']]
// attributes: [[sequelize.fn('COUNT', sequelize.col('typeId')), 'ediciones'],] // [sequelize.fn('SUM', sequelize.col('Event.assistants')), 'assistants']]
// include: [{
// model: sequelize.models.MultimediaFile,
// as: "multimediaFile"

View File

@ -10,17 +10,17 @@ const locationController = require('./location.controller');
routes.get('/locations',
isLoggedUser,
// SortMiddleware.middleware({ default: "city" }),
SortMiddleware.middleware({ default: "city" }),
locationController.find({
scopes: ['includeMultimedias'] //, 'includeEvents'],
scopes: ['includeMultimedias'],
})
);
routes.get('/locations/:id',
isLoggedUser,
// SortMiddleware.middleware({ default: "city" }),
//SortMiddleware.middleware({ default: "city" }),
locationController.findOne({
scopes: ['includeMultimedias',]
scopes: ['includeMultimedias']
})
);