a
This commit is contained in:
parent
b11c48626c
commit
6b76b5c0d7
@ -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) => {
|
deleteInscription: async (req, res, next) => {
|
||||||
const params = extractParamsFromRequest(req, res, {});
|
const params = extractParamsFromRequest(req, res, {});
|
||||||
const user = req.user;
|
const user = req.user;
|
||||||
|
|||||||
@ -266,7 +266,6 @@ routes.get('/tickets/:id/',
|
|||||||
// Esto da las inscripciones de un evento
|
// Esto da las inscripciones de un evento
|
||||||
routes.get('/admin/events/:id/inscriptions',
|
routes.get('/admin/events/:id/inscriptions',
|
||||||
isAdministratorUser,
|
isAdministratorUser,
|
||||||
PaginateMiddleware.middleware(),
|
|
||||||
eventController.getInscriptions,
|
eventController.getInscriptions,
|
||||||
);
|
);
|
||||||
|
|
||||||
@ -328,6 +327,11 @@ routes.get('/admin/events/:id/partners',
|
|||||||
eventController.findPartners,
|
eventController.findPartners,
|
||||||
);
|
);
|
||||||
|
|
||||||
|
routes.get('/admin/events/:id/colleges',
|
||||||
|
isAdministratorUser,
|
||||||
|
eventController.findColleges,
|
||||||
|
);
|
||||||
|
|
||||||
routes.get('/admin/events/:id/reservations/excel',
|
routes.get('/admin/events/:id/reservations/excel',
|
||||||
isAdministratorUser,
|
isAdministratorUser,
|
||||||
eventController.getReservationsExcel,
|
eventController.getReservationsExcel,
|
||||||
|
|||||||
@ -24,13 +24,22 @@ const extraMethods = {
|
|||||||
|
|
||||||
_getPartners: (eventId) => {
|
_getPartners: (eventId) => {
|
||||||
return models.EventReservation.findAll({
|
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 },
|
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']],
|
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']],
|
||||||
})
|
})
|
||||||
},
|
},
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user