This commit is contained in:
David Arranz 2019-08-20 21:13:30 +02:00
parent b11c48626c
commit 6b76b5c0d7
3 changed files with 29 additions and 6 deletions

View File

@ -125,6 +125,16 @@ console.log(params);
}
},
findColleges: async (req, res, next) => {
const params = extractParamsFromRequest(req, res, {});
try {
const result = await eventReservationService._getColleges(params.params.id);
return handleResultResponse(result, result.count, params, res, httpStatus.OK);
} catch (error) {
return handleErrorResponse(MODULE_NAME, 'findPartners', error, res)
}
},
deleteInscription: async (req, res, next) => {
const params = extractParamsFromRequest(req, res, {});
const user = req.user;

View File

@ -266,7 +266,6 @@ routes.get('/tickets/:id/',
// Esto da las inscripciones de un evento
routes.get('/admin/events/:id/inscriptions',
isAdministratorUser,
PaginateMiddleware.middleware(),
eventController.getInscriptions,
);
@ -328,6 +327,11 @@ routes.get('/admin/events/:id/partners',
eventController.findPartners,
);
routes.get('/admin/events/:id/colleges',
isAdministratorUser,
eventController.findColleges,
);
routes.get('/admin/events/:id/reservations/excel',
isAdministratorUser,
eventController.getReservationsExcel,

View File

@ -24,16 +24,25 @@ 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'],
where: { eventId: eventId },
include: [{ model: models.Entity }],
include: [{ model: models.Entity,
include: [{ model: models.EntityType, as:'types', where:{alias: 'partner'}}],
}],
order: [[{ model: models.Entity }, 'name', 'asc']],
})
},
_getColleges: (eventId) => {
return models.EventReservation.findAll({
where: { eventId: eventId },
include: [{
model: models.Entity,
include: [{ model: models.EntityType, as: 'types', where: { alias: 'college' } }],
}],
order: [[{ model: models.Entity }, 'name', 'asc']],
})
},
_updateConfirmedReservation: (id, confirmed) => {
return new Promise(function (resolve, reject) {
models.EventReservation.update(