From 86446f2bd30729c484f10147dcb82a9b685b8041 Mon Sep 17 00:00:00 2001
From: david <darranz@rodax-software.com>
Date: Wed, 14 Aug 2019 22:50:04 +0200
Subject: [PATCH] .

---
 modules/events/event.controller.js            |  2 +-
 modules/events/event.model.js                 | 25 ++++++++++++++-----
 modules/events/events_reservations.service.js |  4 +--
 3 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/modules/events/event.controller.js b/modules/events/event.controller.js
index 6b9bf80..3bf0e5d 100644
--- a/modules/events/event.controller.js
+++ b/modules/events/event.controller.js
@@ -119,7 +119,7 @@ const extraControllers = {
             const result = await eventReservationService._getPartners(params.params.id);
             console.log('xxxxxx2');
             console.log(result)
-            return handleResultResponse({ count: result }, null, params, res, httpStatus.OK);
+            return handleResultResponse(result, result.count, params, res, httpStatus.OK);
         } catch (error) {
             console.log('xxxxxxxx3');
             return handleErrorResponse(MODULE_NAME, 'findPartners', error, res)
diff --git a/modules/events/event.model.js b/modules/events/event.model.js
index 929431f..9cc8ce2 100644
--- a/modules/events/event.model.js
+++ b/modules/events/event.model.js
@@ -202,7 +202,9 @@ module.exports = function (sequelize, DataTypes) {
 //            required: false });
         Event.Type = Event.belongsTo(models.EventType, { foreignKey: 'typeId', as: "type" });
         Event.UserCreate = Event.belongsTo(models.User, { foreignKey: 'userId', as: "user" });
-        Event.Venue = Event.belongsTo(models.Venue, { foreignKey: 'venueId', as: "venue" });
+        Event.Venue = Event.belongsTo(models.Venue, { foreignKey: 'venueId', as: "venue",
+            required: false, 
+        });
 
         Event.Details = Event.hasMany(models.EventDetail, { foreignKey: 'eventId', as: "details" });
 
@@ -213,17 +215,28 @@ module.exports = function (sequelize, DataTypes) {
             scope: {
                 entityName: 'event'
             },
-            as: "comments"
+            as: "comments",
+            required: false, 
         });
 
         Event.Multimedias = Event.hasMany(models.Multimedia, {
             foreignKey: 'entityId',
-            as: { singular: 'multimedia', plural: 'multimedias' }
+            as: { singular: 'multimedia', plural: 'multimedias' },
+            required: false, 
         });
 
-        Event.Reservations = Event.hasMany(models.EventReservation, { foreignKey: 'eventId', as: "reservations" });
-        Event.Inscriptions = Event.hasMany(models.EventInscription, { foreignKey: 'eventId', as: "inscriptions" });
-        Event.Questions = Event.hasMany(models.EventQuestion, { foreignKey: 'eventId', as: "questions" });        
+        Event.Reservations = Event.hasMany(models.EventReservation, { 
+            foreignKey: 'eventId', as: "reservations",
+            required: false, 
+        });
+        Event.Inscriptions = Event.hasMany(models.EventInscription, { 
+            foreignKey: 'eventId', as: "inscriptions",
+            required: false, 
+        });
+        Event.Questions = Event.hasMany(models.EventQuestion, { 
+            foreignKey: 'eventId', as: "questions" ,
+            required: false, 
+        });        
     };
     
     Event.addScope('includeVenue', () => {
diff --git a/modules/events/events_reservations.service.js b/modules/events/events_reservations.service.js
index c4812a8..aed7c73 100644
--- a/modules/events/events_reservations.service.js
+++ b/modules/events/events_reservations.service.js
@@ -18,8 +18,8 @@ const extraMethods = {
     },
 
     _getPartners: (eventId) => {
-        return models.EventReservation.findAll({
-            attributes: [ [Sequelize.fn('DISTINCT', Sequelize.col('events_reservations.entityId'), Sequelize.col('events_reservations.eventId')), 'entities']],
+        return models.EventReservation.findAndCountAll({
+            //attributes: [ [Sequelize.fn('DISTINCT', Sequelize.col('events_reservations.entityId'), Sequelize.col('events_reservations.eventId')), 'entities']],
             where: { eventId: eventId },
             include: [{ model: models.Entity }],
         })