lqdvi/app2-api
2
0
Fork 0
Code Issues 24 Pull Requests Actions Packages Projects Releases Wiki Activity

a

Browse Source
This commit is contained in:
David Arranz 2019-08-30 19:03:41 +02:00
parent c9dc6cff33
commit 840dc9bd57
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
modules/events/event.controller.js
View File

@ -44,7 +44,7 @@ const extraControllers = {
//1. Todas las inscripciones de un evento, cuando el usuario es administrador //1. Todas las inscripciones de un evento, cuando el usuario es administrador
//2. Todas las inscripciones de un usuario, cuando no nos llega ningun param con id //2. Todas las inscripciones de un usuario, cuando no nos llega ningun param con id
getInscriptions: async (req, res, next) => { getInscriptions: async (req, res, next) => {
console.log('PASOOOOOO>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>');
const params = extractParamsFromRequest(req, res, {}); const params = extractParamsFromRequest(req, res, {});
const eventId = params.params.id; const eventId = params.params.id;
const userId = req.user.id; const userId = req.user.id;
@ -58,7 +58,6 @@ console.log(params);
else else
result = await eventInscriptionService._getInscriptionByEventAndUser(eventId, userId); result = await eventInscriptionService._getInscriptionByEventAndUser(eventId, userId);
console.log('resultado de inscirpcion>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>', result);
return handleResultResponse(result, null, params, res, (result === null) ? httpStatus.NOT_FOUND : httpStatus.OK); return handleResultResponse(result, null, params, res, (result === null) ? httpStatus.NOT_FOUND : httpStatus.OK);
} catch (error) { } catch (error) {
return handleErrorResponse(MODULE_NAME, 'getInscriptions', error, res) return handleErrorResponse(MODULE_NAME, 'getInscriptions', error, res)

2
modules/events/events_inscriptions.service.js
View File

@ -39,6 +39,7 @@ const extraMethods = {
_getInscriptionById: (id) => { _getInscriptionById: (id) => {
return models.EventInscription.scope('includeEventAndVenue').findOne({ return models.EventInscription.scope('includeEventAndVenue').findOne({
include: { model: models.EventReservation, as: 'reservation', require: false, },
where: { where: {
id: id, id: id,
}, },
@ -47,7 +48,6 @@ const extraMethods = {
_getInscriptionByEventAndUser: (eventId, userId) => { _getInscriptionByEventAndUser: (eventId, userId) => {
return models.EventInscription.scope('includeEventAndVenue').findOne({ return models.EventInscription.scope('includeEventAndVenue').findOne({
include: { model: models.EventReservation, as: 'reservation', require: false,},
where: { where: {
eventId: eventId, eventId: eventId,
userId: userId userId: userId