diff --git a/modules/events/event.model.js b/modules/events/event.model.js index 6c9330c..694dc7e 100644 --- a/modules/events/event.model.js +++ b/modules/events/event.model.js @@ -367,11 +367,10 @@ module.exports = function (sequelize, DataTypes) { Event.addScope('onlyOfCity', (city) => { return { - where: { - city: { - [Sequelize.Op.eq]: city - } - }, + include: [{ + model: sequelize.models.Location, as: 'location', + where: { city: {[Sequelize.Op.eq]: city} }, + }], } }); diff --git a/modules/events/event.routes.js b/modules/events/event.routes.js index ef021d0..99aa062 100644 --- a/modules/events/event.routes.js +++ b/modules/events/event.routes.js @@ -35,18 +35,11 @@ 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: {where: {}}] + scopes: ['defaultScope', 'includeVenue', 'includeMultimedias', 'includeDetails', { method: ['onlyOfCity', req.body.city] }] })(req, res, next); } ); -/* -where: { - city: { - [Sequelize.Op.eq]: city - } -}, -*/ + routes.get('/events/cities', isLoggedUser, eventController.find({