From d1cbf79c26c6fc3e9be8f925b3fd5e0ae9f95622 Mon Sep 17 00:00:00 2001
From: david <darranz@rodax-software.com>
Date: Wed, 28 Aug 2019 13:41:47 +0200
Subject: [PATCH] a

---
 modules/events/event.model.js  |  9 ++++-----
 modules/events/event.routes.js | 11 ++---------
 2 files changed, 6 insertions(+), 14 deletions(-)

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({