From 6b02b3892857eb519625984b975890da27fe5a74 Mon Sep 17 00:00:00 2001 From: david Date: Mon, 2 Sep 2019 13:16:45 +0200 Subject: [PATCH 01/11] a --- modules/events/event.controller.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/events/event.controller.js b/modules/events/event.controller.js index 4b3f734..137ebaa 100644 --- a/modules/events/event.controller.js +++ b/modules/events/event.controller.js @@ -199,7 +199,7 @@ console.log('>>>>>>>>>>>>>>Voy a actualizar aforo evento'); //Esta función se puede llamar desde APP y desde WEB createInscription: async(req, res, next) => { const params = extractParamsFromRequest(req, res, {}); - +console.log('CREATE INSCRIPTION>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>< ', params); //Iniciamos entidades relacionadas con la inscripción. let dataUser = { id: (req.user) ? req.user.id : null, From 551967a9daefbda04d8ce4f58dd5d855451cb8ff Mon Sep 17 00:00:00 2001 From: david Date: Mon, 2 Sep 2019 13:54:10 +0200 Subject: [PATCH 02/11] a --- helpers/mail.helper.js | 1 + 1 file changed, 1 insertion(+) diff --git a/helpers/mail.helper.js b/helpers/mail.helper.js index e973fce..b7b6c44 100644 --- a/helpers/mail.helper.js +++ b/helpers/mail.helper.js @@ -40,6 +40,7 @@ function send(header, body) { }) request .then((result) => { + console.log('EEEEEEEEEEEEEEEEEEEENNNNNNNNNNNNNNNNNNVIO correo>>>>'); console.log(result.body) return result; }) From 8c275c044ce8009a47b2b8aebb8bdfd7d0ef2873 Mon Sep 17 00:00:00 2001 From: david Date: Mon, 2 Sep 2019 13:57:58 +0200 Subject: [PATCH 03/11] a --- helpers/mail.helper.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/helpers/mail.helper.js b/helpers/mail.helper.js index b7b6c44..ef0230e 100644 --- a/helpers/mail.helper.js +++ b/helpers/mail.helper.js @@ -41,11 +41,12 @@ function send(header, body) { request .then((result) => { console.log('EEEEEEEEEEEEEEEEEEEENNNNNNNNNNNNNNNNNNVIO correo>>>>'); - console.log(result.body) + console.log(result.body); return result; }) .catch((error) => { - console.log(error.statusCode) + console.log(error.statusCode); + console.log(error); return error; }) }; From 392263a2d6e3181fd0494a6a074ccf125745139b Mon Sep 17 00:00:00 2001 From: david Date: Mon, 2 Sep 2019 14:03:01 +0200 Subject: [PATCH 04/11] a --- helpers/mail.helper.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/helpers/mail.helper.js b/helpers/mail.helper.js index ef0230e..8c1b905 100644 --- a/helpers/mail.helper.js +++ b/helpers/mail.helper.js @@ -80,7 +80,7 @@ function sendTicket(header, values) { "codeTicket": values.codeTicket, "eventName": values.eventName, "dateInscription": values.dateInscription, - "color": values.color, + "color": (values.color)? values.color : 'gray', } }; @@ -101,7 +101,7 @@ function sendListaEspera(header, values) { "tipoEntrada": values.tipoEntrada, "eventName": values.eventName, "dateInscription": values.dateInscription, - "color": values.color, + "color": (values.color) ? values.color : 'gray', } }; From 354adca8ef90c6d58f7cbf42f54901303ae5e48b Mon Sep 17 00:00:00 2001 From: david Date: Mon, 2 Sep 2019 17:02:00 +0200 Subject: [PATCH 05/11] a --- modules/events/event.controller.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/modules/events/event.controller.js b/modules/events/event.controller.js index 137ebaa..dfbcfde 100644 --- a/modules/events/event.controller.js +++ b/modules/events/event.controller.js @@ -34,7 +34,7 @@ const extraControllers = { try { const result = await eventReservationService._getReservaByCode(eventId, registrationCode); - return handleResultResponse(!!result, null, params, res, (result === null) ? httpStatus.NOT_FOUND : httpStatus.OK); + return handleResultResponse(!!result, null, params, res, httpStatus.OK); } catch(error) { return handleErrorResponse(MODULE_NAME, 'checkReservationCode', error, res) } @@ -391,7 +391,10 @@ console.log('actualizo confirmados de la nueva reserva'); dataInscription.validated = false; //Actualizamos aforo de la lista de espera del evento y creamos inscripcion +console.log('evento de lista de espera que debo actulizar sus confirmados>>>>>>>>>>>>>>>>>>>>>', dataInscription.event.overflow_eventId); + console.log('cantidad>>>>>>>>>>>>>>>>>>>>>', dataInscription.inscriptionsWithoutReservationCount); if (await eventService._updateConfirmedEvent(dataInscription.event.overflow_eventId, dataInscription.inscriptionsWithoutReservationCount)) +console.log('voy a crearrrrrr la inscripcion'); dataInscription.inscription = await eventInscriptionService._createInscription(dataInscription.event.id, dataUser.userResult.user.id, dataInscription.type, From c52a2b7b14bfeaa82bec77260709e7086a5e4b8f Mon Sep 17 00:00:00 2001 From: david Date: Mon, 2 Sep 2019 17:04:11 +0200 Subject: [PATCH 06/11] a --- modules/events/event.controller.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/modules/events/event.controller.js b/modules/events/event.controller.js index dfbcfde..537a7ca 100644 --- a/modules/events/event.controller.js +++ b/modules/events/event.controller.js @@ -393,7 +393,7 @@ console.log('actualizo confirmados de la nueva reserva'); //Actualizamos aforo de la lista de espera del evento y creamos inscripcion console.log('evento de lista de espera que debo actulizar sus confirmados>>>>>>>>>>>>>>>>>>>>>', dataInscription.event.overflow_eventId); console.log('cantidad>>>>>>>>>>>>>>>>>>>>>', dataInscription.inscriptionsWithoutReservationCount); - if (await eventService._updateConfirmedEvent(dataInscription.event.overflow_eventId, dataInscription.inscriptionsWithoutReservationCount)) + if (await eventService._updateConfirmedEvent(dataInscription.event.overflow_eventId, dataInscription.inscriptionsWithoutReservationCount)) { console.log('voy a crearrrrrr la inscripcion'); dataInscription.inscription = await eventInscriptionService._createInscription(dataInscription.event.id, dataUser.userResult.user.id, @@ -401,7 +401,8 @@ console.log('voy a crearrrrrr la inscripcion'); dataInscription.validated, dataInscription.source, null, - dataInscription.event.overflow_eventId) + dataInscription.event.overflow_eventId); + } else return handleResultResponse("No se ha podido actualizar el aforo del evento", null, params, res, httpStatus.NOT_FOUND); } From c7938219f7d09487e817b7f51af3f3811442127d Mon Sep 17 00:00:00 2001 From: david Date: Mon, 2 Sep 2019 17:22:12 +0200 Subject: [PATCH 07/11] a --- modules/events/event.controller.js | 25 ++++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/modules/events/event.controller.js b/modules/events/event.controller.js index 537a7ca..d9729bf 100644 --- a/modules/events/event.controller.js +++ b/modules/events/event.controller.js @@ -448,9 +448,13 @@ console.log('voy a crearrrrrr la inscripcion'); console.log('member a añadir a mailchimp y envio correo'); console.log(member); - - member.marketing_memberId = await eventInscriptionService._addMember(marketingListOfInscription, member); - eventInscriptionService._updateMarketingMemberOfInscription(dataInscription.inscription.id, member.marketing_memberId); + try + { + member.marketing_memberId = await eventInscriptionService._addMember(marketingListOfInscription, member); + eventInscriptionService._updateMarketingMemberOfInscription(dataInscription.inscription.id, member.marketing_memberId); + } catch (error) { + console.log('No se ha podido añadir email a mailchimp'); + }; //MADAMOS MAIL CON LA ENTRADA @@ -478,12 +482,19 @@ console.log(member); eventName: dataInscription.event.name, dateInscription: moment(dataInscription.event.init_date).format('D [de] MMMM [de] YYYY'), } + console.log('Mandamos mail con entrada>>>>>>>>>>>>>>>>>>>>>>>>>>>'); console.log(headerMail, bodyMail); - if (member.validated) - emailHelper.sendTicket(headerMail, bodyMail) - else - emailHelper.sendListaEspera(headerMail, bodyMail); + + try + { + if (member.validated) + emailHelper.sendTicket(headerMail, bodyMail) + else + emailHelper.sendListaEspera(headerMail, bodyMail); + } catch (error) { + console.log('No se ha podido mandar email con entrada'); + }; return handleResultResponse(await dataInscription.inscription.toJSON(), null, params, res, httpStatus.CREATED) }, From a0b24cd9565ffd7fb3b9c6c5e0c11caae9decc82 Mon Sep 17 00:00:00 2001 From: david Date: Mon, 2 Sep 2019 17:33:40 +0200 Subject: [PATCH 08/11] a --- modules/events/event.service.js | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/modules/events/event.service.js b/modules/events/event.service.js index e0c5909..c918b2c 100644 --- a/modules/events/event.service.js +++ b/modules/events/event.service.js @@ -58,10 +58,10 @@ const extraMethods = { where: { id: eventId } }) .then(function (result) { - //const aaa = result[0]; - //console.log('aaaaaaaaaaaaaaaaaaaaaaaaaaa'); - //console.log(aaa); - resolve((result[0] === 1)); + if (result) + resolve((result[0] === 1)) + else + resolve(false); }) .catch(function (error) { reject(error) @@ -79,10 +79,10 @@ const extraMethods = { where: { id: eventId } }) .then(function (result) { - //const aaa = result[0]; - //console.log('aaaaaaaaaaaaaaaaaaaaaaaaaaa'); - //console.log(aaa); - resolve((result[0] === 1)); + if (result) + resolve((result[0] === 1)) + else + resolve(false); }) .catch(function (error) { reject(error) From 26f89aa0f2f0fe432eb57c41eca452f78a94ef3e Mon Sep 17 00:00:00 2001 From: david Date: Mon, 2 Sep 2019 17:37:00 +0200 Subject: [PATCH 09/11] a --- modules/events/event.service.js | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/events/event.service.js b/modules/events/event.service.js index c918b2c..df2bd78 100644 --- a/modules/events/event.service.js +++ b/modules/events/event.service.js @@ -58,6 +58,7 @@ const extraMethods = { where: { id: eventId } }) .then(function (result) { +console.log('>>>>>>>>>>>>>>>>>>>>>>>>> Date: Mon, 2 Sep 2019 17:38:49 +0200 Subject: [PATCH 10/11] a --- modules/events/event.service.js | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/events/event.service.js b/modules/events/event.service.js index df2bd78..b9d97f2 100644 --- a/modules/events/event.service.js +++ b/modules/events/event.service.js @@ -80,6 +80,7 @@ console.log('>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> Date: Mon, 2 Sep 2019 18:00:34 +0200 Subject: [PATCH 11/11] a --- modules/events/event.controller.js | 4 +++- modules/events/event.service.js | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/modules/events/event.controller.js b/modules/events/event.controller.js index d9729bf..5430dce 100644 --- a/modules/events/event.controller.js +++ b/modules/events/event.controller.js @@ -403,8 +403,10 @@ console.log('voy a crearrrrrr la inscripcion'); null, dataInscription.event.overflow_eventId); } - else + else { +console.log('No se ha podido actualizar el aforo del evento'); return handleResultResponse("No se ha podido actualizar el aforo del evento", null, params, res, httpStatus.NOT_FOUND); + } } else return handleResultResponse("Aforo completo y no hay lista de espera", null, params, res, httpStatus.NOT_FOUND); diff --git a/modules/events/event.service.js b/modules/events/event.service.js index b9d97f2..325d648 100644 --- a/modules/events/event.service.js +++ b/modules/events/event.service.js @@ -55,7 +55,7 @@ const extraMethods = { confirmed: confirmed, }, { - where: { id: eventId } + where: { id: eventId, typeId: { [Sequelize.Op.ne]: null} } }) .then(function (result) { console.log('>>>>>>>>>>>>>>>>>>>>>>>>>