diff --git a/modules/events/event.controller.js b/modules/events/event.controller.js index c3e8f8b..df5ce1d 100644 --- a/modules/events/event.controller.js +++ b/modules/events/event.controller.js @@ -52,52 +52,31 @@ const extraControllers = { createInscription: async(req, res, next) => { const params = extractParamsFromRequest(req, res, {}); - console.log('usuariooooooooooooo--CASO CON TOKEN'); - console.log(req.user); - - - console.log('aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa'); - console.log(params); - - //var origin = (req.user && req.user.role == 90) ? 'admin' : 'web'; - - var user = { - id: null, - email: req.body.email, - name: req.body.name, - surname: req.body.surname - }; - - var invitationCode = Buffer.from(req.body.encodedInvitationCode, 'base64').toString('ascii'); - console.log(user, invitationCode); - - - - - + //Iniciamos entidades relacionadas con la inscripción. let dataUser = { - id: req.user.id, - phone: req.user.phone, - name: req.user.name, - surname: req.user.surname, - email: req.user.email, - userResult: req.user, + id: (req.user) ? req.user.id : null, + phone: (req.user) ? req.user.phone : null, + name: (req.user) ? req.user.name : req.body.name, + surname: (req.user) ? req.user.surname : req.body.surname, + email: (req.user) ? req.user.email : req.body.email, + userResult: (req.user) ? req.user : null, } let dataInscription = { eventId: params.params.id, - encodedReservationCode: req.body.code, - reservationCode: req.body.code, //Buffer.from(req.body.code, 'base64').toString('ascii'); - event: null, - reservation: null, - inscription: null, + reservationCode: (req.user) ? req.body.code : Buffer.from(req.body.code, 'base64').toString('ascii'), + type: (req.body.code) ? 'reservation' : 'regular', ticket: null, //nº total de inscritos (libres + con reserva) - Para ticket - entrada validated: null, //si no esta validado la inscripción es a la lista de espera inscriptionsWithoutReservationCount: null, //nº total de inscritos sin reserva asignada inscriptionsWithReservationCount: null, //nº total de inscritos a la reserva asignada - type : (req.body.code) ? 'reservation' : 'regular', + event: null, + reservation: null, + inscription: null, } + + //SI VIENE CODIGO DE RESERVA, RECUPERAMOS LA RESERVA Y EL EVENTO if (dataInscription.reservationCode) { try { diff --git a/modules/events/event.validations.js b/modules/events/event.validations.js index 0f77175..81547a4 100644 --- a/modules/events/event.validations.js +++ b/modules/events/event.validations.js @@ -1,7 +1,7 @@ const Joi = require('joi'); const InscriptionInputType = Joi.object().keys({ - id: Joi.string().required(), +// id: Joi.string().required(), code: Joi.string().optional() });