diff --git a/modules/entities/entity.routes.js b/modules/entities/entity.routes.js index 0e7cc95..d08b2f8 100644 --- a/modules/entities/entity.routes.js +++ b/modules/entities/entity.routes.js @@ -52,5 +52,13 @@ routes.get ('/entities/partners', ); +/******************************************************************************************************** + * ADMINISTRACIÓN + ********************************************************************************************************* + */ +routes.get('/admin/entities/partners/:id', + //isAdministratorUser, + entityController.findOne(), +); module.exports = routes; \ No newline at end of file diff --git a/modules/events/event.routes.js b/modules/events/event.routes.js index 843d75a..7db8131 100644 --- a/modules/events/event.routes.js +++ b/modules/events/event.routes.js @@ -328,6 +328,13 @@ routes.post('/admin/reservations', ); +routes.get('/admin/reservations/:id', + // isAdministratorUser, + //SchemaValidator(eventValidation.ReservationInputType, true), + eventReservationController.findOne(), + +); + /*// Un ponente routes.get('/admin/speakers/:id', isAdministratorUser, diff --git a/modules/events/events_reservations.service.js b/modules/events/events_reservations.service.js index 88124a9..b430fe7 100644 --- a/modules/events/events_reservations.service.js +++ b/modules/events/events_reservations.service.js @@ -20,9 +20,12 @@ const extraMethods = { _getPartners: (eventId) => { return models.EventReservation.findAll({ // attributes: [ [Sequelize.fn('DISTINCT', Sequelize.col('events_reservations.entityId'), Sequelize.col('events_reservations.eventId')), 'entities']], - attributes: ['entityId','eventId', 'state'], +// attributes: ['entityId','eventId', 'state'], where: { eventId: eventId }, include: [{ model: models.Entity }], + order: [[{ model: models.Entity }, 'name', 'asc']], + + }) },