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

a

Browse Source
This commit is contained in:
David Arranz 2019-08-28 14:00:59 +02:00
parent d1cbf79c26
commit fc43cee157
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/events/event.model.js
View File

@ -365,12 +365,12 @@ module.exports = function (sequelize, DataTypes) {
} }
}); });
Event.addScope('onlyOfCity', (city) => { Event.addScope('onlyOfLocation', (location) => {
return { return {
include: [{ include: [{
model: sequelize.models.Location, as: 'location', model: sequelize.models.Location, as: 'location',
where: { city: {[Sequelize.Op.eq]: city} },
}], }],
where: { locationId: { [Sequelize.Op.eq]: location } },
} }
}); });

4
modules/events/event.routes.js
View File

@ -29,13 +29,13 @@ routes.get('/events',
PaginateMiddleware.middleware(), PaginateMiddleware.middleware(),
SortMiddleware.middleware({ default: "-init_date" }), SortMiddleware.middleware({ default: "-init_date" }),
(req, res, next) => { (req, res, next) => {
if (!req.body.city) if (!req.body.locationId)
return eventController.find({ return eventController.find({
scopes: ['defaultScope', 'includeVenue', 'includeMultimedias', 'includeDetails'], scopes: ['defaultScope', 'includeVenue', 'includeMultimedias', 'includeDetails'],
})(req, res, next) })(req, res, next)
else else
return eventController.find({ return eventController.find({
scopes: ['defaultScope', 'includeVenue', 'includeMultimedias', 'includeDetails', { method: ['onlyOfCity', req.body.city] }] scopes: ['defaultScope', 'includeVenue', 'includeMultimedias', 'includeDetails', { method: ['onlyOfLocation', req.body.locationId] }]
})(req, res, next); })(req, res, next);
} }
); );