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

---
 modules/events/event.routes.js       | 11 +++++++++--
 modules/locations/location.model.js  |  4 ++--
 modules/locations/location.routes.js |  8 ++++----
 3 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/modules/events/event.routes.js b/modules/events/event.routes.js
index 99aa062..ef021d0 100644
--- a/modules/events/event.routes.js
+++ b/modules/events/event.routes.js
@@ -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({
diff --git a/modules/locations/location.model.js b/modules/locations/location.model.js
index d6ac15f..befd36a 100644
--- a/modules/locations/location.model.js
+++ b/modules/locations/location.model.js
@@ -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"
diff --git a/modules/locations/location.routes.js b/modules/locations/location.routes.js
index f992362..a30d523 100644
--- a/modules/locations/location.routes.js
+++ b/modules/locations/location.routes.js
@@ -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']
     })
 );