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

---
 helpers/composes.helper.js                    |  1 -
 modules/comments/comment.routes.js            | 10 ++++++++++
 modules/events/event.controller.js            |  3 ++-
 modules/events/event.routes.js                |  7 +------
 modules/events/events_reservations.service.js | 11 ++++++++++-
 5 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/helpers/composes.helper.js b/helpers/composes.helper.js
index cbc7f3d..8ebed49 100644
--- a/helpers/composes.helper.js
+++ b/helpers/composes.helper.js
@@ -14,7 +14,6 @@ const citiesComposer = (city) => {
 }
 
 const commentComposer = (comment, context) => {
-
     if (comment.user) {
         comment.user_name = comment.user.name + '---';
         comment.profile_picture = cdnHelper.getCDNMediaUrl(comment.user.profile_picture);
diff --git a/modules/comments/comment.routes.js b/modules/comments/comment.routes.js
index 22851d8..564421f 100644
--- a/modules/comments/comment.routes.js
+++ b/modules/comments/comment.routes.js
@@ -57,6 +57,16 @@ routes.get('/comments/speakers',
  *********************************************************************************************************
  */
 
+routes.get('/admin/comments/events/:entityId',
+    isAdministratorUser,
+//    PaginateMiddleware.middleware(),
+    SortMiddleware.middleware({ default: "createdAt" }),
+    commentController.find({
+        scopes: ['defaultScope', 'onlyEvents'],
+    }),
+);
+
+
 // Borrado
 routes.delete('/admin/comments/:id',
     isAdministratorUser,
diff --git a/modules/events/event.controller.js b/modules/events/event.controller.js
index a917ea4..2bbc036 100644
--- a/modules/events/event.controller.js
+++ b/modules/events/event.controller.js
@@ -475,9 +475,10 @@ console.log(mailOptions);
     getReservationsExcel: async (req, res, next) => {
         const params = extractParamsFromRequest(req, res, {});
         const eventId = params.params.id;
+        const type = params.params.type;
         const userId = req.user.id;
 
-        const reservations = await eventReservationService._getReservationsExcel(req.user, eventId, null, function(result, status){
+        const reservations = await eventReservationService._getReservationsExcel(req.user, eventId, null, type, function(result, status){
             if (result.messenger.code == "S99001") {
                 console.log(result);
                 res.setHeader('Content-Type', 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet');
diff --git a/modules/events/event.routes.js b/modules/events/event.routes.js
index efd0cad..6296870 100644
--- a/modules/events/event.routes.js
+++ b/modules/events/event.routes.js
@@ -337,12 +337,7 @@ routes.get('/admin/events/:id/reservations/excel',
     eventController.getReservationsExcel,
 );
 
-routes.get('/admin/events/:id/reservations/partners/excel',
-    isAdministratorUser,
-    eventController.getReservationsExcel,
-);
-
-routes.get('/admin/events/:id/reservations/colleges/excel',
+routes.get('/admin/events/:id/reservations/:type/excel',
     isAdministratorUser,
     eventController.getReservationsExcel,
 );
diff --git a/modules/events/events_reservations.service.js b/modules/events/events_reservations.service.js
index 8fdbabb..4fe01bd 100644
--- a/modules/events/events_reservations.service.js
+++ b/modules/events/events_reservations.service.js
@@ -79,7 +79,15 @@ const extraMethods = {
         });
     },
 
-    _getReservationsExcel: (user, eventId, partnerId, callback) => {
+    _getReservationsExcel: (user, eventId, partnerId, type, callback) => {
+        console.log('>>>>>>>>>>>>>>>>>>>><consulta con type:', type);
+        
+        var whereType = {};
+        if (type == 'partners') 
+            whereType = { alias: 'partner'}
+        else if (type == 'colleges') 
+            whereType = { alias: 'college' };
+
         models.EventReservation.findAll({
             where: {
                 eventId: eventId,
@@ -89,6 +97,7 @@ const extraMethods = {
                 attributes: ['id', 'name'],
             }, {
                 model: models.Entity,
+                    include: [{ model: models.EntityType, as: 'types', where: whereType }]
             },
             {
                 model: models.EventInscription,