diff --git a/core/passport.js b/core/passport.js index 06bf6a5..702fd48 100644 --- a/core/passport.js +++ b/core/passport.js @@ -101,6 +101,7 @@ passport.use('jwt', new CustomStrategy(async (req, done) => { const result = securityHelper.verify(token); if (result) { + console.log(result); //recuperamos el usuario de la petición let user = await authService.extraMethods.findUser({ phone: result.phone}); if (user){ diff --git a/modules/events/event.model.js b/modules/events/event.model.js index a3b1409..d3b7e3b 100644 --- a/modules/events/event.model.js +++ b/modules/events/event.model.js @@ -177,6 +177,15 @@ module.exports = function (sequelize, DataTypes) { } }); + Event.addScope('includeInscription', (userId) => { + return { + include: [ + { model: sequelize.models.EventInscription, as: 'inscriptions', where: {userId: userId} } + ] + } + }); + + Event.addScope('includeSpeakers', () => { return { include: [{ @@ -201,7 +210,7 @@ module.exports = function (sequelize, DataTypes) { }] }] } - }) + }); Event.addScope('next', { where: { diff --git a/modules/events/event.routes.js b/modules/events/event.routes.js index fd2d2cc..5b1d170 100644 --- a/modules/events/event.routes.js +++ b/modules/events/event.routes.js @@ -72,7 +72,7 @@ routes.get('/events/:id', invalidFields: generalInvalidFields }), eventController.findOne({ - scopes: ['defaultScope', 'includeVenue', 'includeMultimedias', 'includeSpeakers'], + scopes: ['defaultScope', 'includeVenue', 'includeMultimedias', 'includeSpeakers', '{ method: ["includeInscription", 19] }' ] }), ); @@ -127,7 +127,12 @@ routes.get('/events/:id/reservations/:encodedInvitationCode', eventController.checkReservationCode ); - +/* +routes.get('/tickets/:id/', + isLoggedUser, + eventController.findComments +); +*/ //routes.get('/venues', isLoggedUser, SortMiddleware.middleware({ default: "name" }), venueController.find); //routes.get('/venues/:id', isLoggedUser, venueController.findOne);