From b0498dd74635e3ad4c2ad3713e8593dc191c1443 Mon Sep 17 00:00:00 2001
From: david <darranz@rodax-software.com>
Date: Thu, 22 Aug 2019 14:19:41 +0200
Subject: [PATCH] a

---
 helpers/composes.helper.js    | 8 +++++---
 modules/events/event.model.js | 9 ++++-----
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/helpers/composes.helper.js b/helpers/composes.helper.js
index 8ebed49..27d2621 100644
--- a/helpers/composes.helper.js
+++ b/helpers/composes.helper.js
@@ -116,9 +116,11 @@ const speakerComposer = (speaker, context) => {
 const eventComposer = (event, context) => {
 
     if ((context.scopes) && (context.scopes.includes('includeVenue'))){
-        delete event.venue.updatedAt;
-        delete event.venue.createdAt;
-        //event.venue.image_url = cdnHelper.getCDNCityMediaUrl(event.venue.city); <-- se hace en el modelo
+        if (event.venue) {
+            delete event.venue.updatedAt;
+            delete event.venue.createdAt;
+            //event.venue.image_url = cdnHelper.getCDNCityMediaUrl(event.venue.city); <-- se hace en el modelo
+        }
     };
 
     let multimedias = []
diff --git a/modules/events/event.model.js b/modules/events/event.model.js
index 07b880d..2bbfcfe 100644
--- a/modules/events/event.model.js
+++ b/modules/events/event.model.js
@@ -352,11 +352,10 @@ module.exports = function (sequelize, DataTypes) {
     });
 
 
-    Event.addScope('CitiesOfEvents', () => {
-        return {
-            group: ['city'],
-            attributes: ['city', [sequelize.fn('COUNT', sequelize.col('id')), 'ediciones']]
-        }
+    Event.addScope('CitiesOfEvents', {
+            include : [{ model: sequelize.models.EventType, as: 'type', attributes:['name', 'title'] }],
+            group: ['city', 'typeId'], 
+        attributes: ['city', 'type.name', 'type.title', [sequelize.fn('COUNT', sequelize.col('typeId')), 'ediciones'], [sequelize.fn('SUM', sequelize.col('assistants')), 'assistants']]
     });
 
     Event.addScope('onlyOfCity', (city) => {