From fc43cee157d5f0b3405c959b32024b5f151f5ac4 Mon Sep 17 00:00:00 2001 From: david Date: Wed, 28 Aug 2019 14:00:59 +0200 Subject: [PATCH] a --- modules/events/event.model.js | 4 ++-- modules/events/event.routes.js | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/events/event.model.js b/modules/events/event.model.js index 694dc7e..7127c22 100644 --- a/modules/events/event.model.js +++ b/modules/events/event.model.js @@ -365,12 +365,12 @@ module.exports = function (sequelize, DataTypes) { } }); - Event.addScope('onlyOfCity', (city) => { + Event.addScope('onlyOfLocation', (location) => { return { include: [{ model: sequelize.models.Location, as: 'location', - where: { city: {[Sequelize.Op.eq]: city} }, }], + where: { locationId: { [Sequelize.Op.eq]: location } }, } }); diff --git a/modules/events/event.routes.js b/modules/events/event.routes.js index 99aa062..be43378 100644 --- a/modules/events/event.routes.js +++ b/modules/events/event.routes.js @@ -29,13 +29,13 @@ routes.get('/events', PaginateMiddleware.middleware(), SortMiddleware.middleware({ default: "-init_date" }), (req, res, next) => { - if (!req.body.city) + if (!req.body.locationId) return eventController.find({ scopes: ['defaultScope', 'includeVenue', 'includeMultimedias', 'includeDetails'], })(req, res, next) else 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); } );