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

.

Browse Source
This commit is contained in:
David Arranz 2019-11-29 13:23:37 +01:00
parent a6a1c3f0f1
commit 1ab447a842
3 changed files with 21 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/environments/production.js
View File

@ -30,7 +30,7 @@ module.exports = {
server: { server: {
hostname: process.env.HOSTNAME || '127.0.0.1', hostname: process.env.HOSTNAME || '127.0.0.1',
port: process.env.PORT || 18888, port: process.env.PORT || 18888,
public_url: "https://apiapp2.loquedeverdadimporta.org/api/v2/" public_url: "https://apiapp2.loquedeverdadimporta.org/api/v2"
}, },
cdn: { cdn: {

10
helpers/qr.helper.js
View File

@ -5,7 +5,7 @@ const moment = require('moment');
const config = require('../config'); const config = require('../config');
module.exports.getInscriptionQRCodeUrl = function (inscriptionId) { module.exports.getInscriptionQRCodeUrl = function (inscriptionId) {
return encodeURI(`${config.server.public_url}/inscriptions/${inscriptionId}/qrimage`); return encodeURI(`${config.server.public_url}/inscriptions/${inscriptionId}/qrimage`);
} }
/* params = { /* params = {
@ -17,8 +17,8 @@ module.exports.getInscriptionQRCodeUrl = function (inscriptionId) {
} */ } */
module.exports.getInscriptionQRCode = async function (params) { module.exports.getInscriptionQRCode = function (params) {
const result = new Promise(function (resolve, reject) { return new Promise(function (resolve, reject) {
var texto = _.padStart(params.code, 4, '0') + '\n' + moment(params.date).format('DD/MM/YY HH:mm ') + params.name + ' ' + params.surname; var texto = _.padStart(params.code, 4, '0') + '\n' + moment(params.date).format('DD/MM/YY HH:mm ') + params.name + ' ' + params.surname;
var options = { var options = {
errorCorrectionLevel: 'M', errorCorrectionLevel: 'M',
@ -45,9 +45,7 @@ module.exports.getInscriptionQRCode = async function (params) {
resolve(qrcode); resolve(qrcode);
}); });
*/ */
}); })
return await result;
}; };

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

@ -25,7 +25,7 @@ const userService = require('../auth/user.service');
const MODULE_NAME = '[event.controller]'; const MODULE_NAME = '[event.controller]';
const controllerOptions = { MODULE_NAME }; const controllerOptions = { MODULE_NAME };
function generateMemberInscription (user, inscription, reservation) { async function generateMemberInscription (user, inscription, reservation) {
let memberInscription = null; let memberInscription = null;
if (user && inscription) { if (user && inscription) {
memberInscription = { memberInscription = {
@ -47,10 +47,6 @@ function generateMemberInscription (user, inscription, reservation) {
qrConfig: null, qrConfig: null,
qrCode: null, qrCode: null,
} }
memberInscription.qrConfig = generateQRConfig(memberInscription);
memberInscription.qrCode = QRHelper.getInscriptionQRCode(memberInscription.qrConfig);
memberInscription.qrCodeUrl = QRHelper.getInscriptionQRCodeUrl(inscription.id);
} }
return memberInscription; return memberInscription;
@ -279,9 +275,9 @@ console.log('>>>>>>>>>>>>>>><NewConfirmedEvent: ', NewConfirmedEvent);
var member = generateMemberInscription(inscription.user, inscription, inscription.reservation); var member = generateMemberInscription(inscription.user, inscription, inscription.reservation);
member.marketing_memberId = await eventInscriptionService._addMember(marketingListIdEvent, member); member.marketing_memberId = await eventInscriptionService._addMember(marketingListIdEvent, member);
eventInscriptionService._updateMarketingMemberOfInscription(inscription.id, member.marketing_memberId); eventInscriptionService._updateMarketingMemberOfInscription(inscription.id, member.marketing_memberId);
/*member.qrConfig = generateQRConfig(member); member.qrConfig = generateQRConfig(member);
member.qrCode = await QRHelper.getInscriptionQRCode(member.qrConfig); member.qrCode = await QRHelper.getInscriptionQRCode(member.qrConfig);
member.qrCodeUrl = QRHelper.getInscriptionQRCodeUrl(inscription.id); */ member.qrCodeUrl = QRHelper.getInscriptionQRCodeUrl(inscription.id);
console.log('mandar correo>>>>>>>>>>>>>await QRHelper.getInscriptionQRCode(member.qrConfig); >>>>>>>> ', member); console.log('mandar correo>>>>>>>>>>>>>await QRHelper.getInscriptionQRCode(member.qrConfig); >>>>>>>> ', member);
emailHelper.sendTicket(generateHeaderMail(member), generateBodyMail(member)) emailHelper.sendTicket(generateHeaderMail(member), generateBodyMail(member))
} catch (error) { } catch (error) {
@ -365,9 +361,9 @@ console.log('>>>>>>>>>>>>>> ', NewConfirmed);
await eventInscriptionService._deleteMember(marketingListId, inscription.marketing_memberId); await eventInscriptionService._deleteMember(marketingListId, inscription.marketing_memberId);
var member = generateMemberInscription(inscription.user, inscription, inscription.reservation); var member = generateMemberInscription(inscription.user, inscription, inscription.reservation);
/*member.qrConfig = generateQRConfig(member); member.qrConfig = generateQRConfig(member);
member.qrCode = await QRHelper.getInscriptionQRCode(member.qrConfig); member.qrCode = await QRHelper.getInscriptionQRCode(member.qrConfig);
member.qrCodeUrl = QRHelper.getInscriptionQRCodeUrl(inscription.id); */ member.qrCodeUrl = QRHelper.getInscriptionQRCodeUrl(inscription.id);
let headerMail = generateHeaderMail(member); let headerMail = generateHeaderMail(member);
headerMail.subject = 'Cancelación de ' + headerMail.subject; headerMail.subject = 'Cancelación de ' + headerMail.subject;
@ -656,9 +652,9 @@ console.log('No se ha podido actualizar el aforo del evento');
}; };
/*member.qrConfig = generateQRConfig(member); member.qrConfig = generateQRConfig(member);
member.qrCode = await QRHelper.getInscriptionQRCode(member.qrConfig); member.qrCode = await QRHelper.getInscriptionQRCode(member.qrConfig);
member.qrCodeUrl = QRHelper.getInscriptionQRCodeUrl(inscription.id); */ member.qrCodeUrl = QRHelper.getInscriptionQRCodeUrl(inscription.id);
console.log('Mandamos mail con entrada>>>>>>>>>>>>>>>>>>>>>>>>>>>'); console.log('Mandamos mail con entrada>>>>>>>>>>>>>>>>>>>>>>>>>>>');
//console.log(headerMail, bodyMail); //console.log(headerMail, bodyMail);
@ -691,9 +687,9 @@ console.log('Mandamos mail con entrada>>>>>>>>>>>>>>>>>>>>>>>>>>>');
//Creamos objeto member para facilitar inserción en mailchimp y envio de correo //Creamos objeto member para facilitar inserción en mailchimp y envio de correo
var member = generateMemberInscription(req.user, inscription.inscription, inscription.reservation); var member = generateMemberInscription(req.user, inscription.inscription, inscription.reservation);
/*member.qrConfig = generateQRConfig(member); member.qrConfig = generateQRConfig(member);
member.qrCode = await QRHelper.getInscriptionQRCode(member.qrConfig); member.qrCode = await QRHelper.getInscriptionQRCode(member.qrConfig);
member.qrCodeUrl = QRHelper.getInscriptionQRCodeUrl(inscription.id); */ member.qrCodeUrl = QRHelper.getInscriptionQRCodeUrl(inscription.id);
return handleResultResponse(member.qrCode, null, params, res, httpStatus.OK); return handleResultResponse(member.qrCode, null, params, res, httpStatus.OK);
@ -739,8 +735,9 @@ console.log('Mandamos mail con entrada>>>>>>>>>>>>>>>>>>>>>>>>>>>');
//Creamos objeto member para facilitar inserción en mailchimp y envio de correo //Creamos objeto member para facilitar inserción en mailchimp y envio de correo
var member = generateMemberInscription(userInscription, inscription, inscription.reservation); var member = generateMemberInscription(userInscription, inscription, inscription.reservation);
/*member.qrConfig = generateQRConfig(member); member.qrConfig = generateQRConfig(member);
member.qrCode = await QRHelper.getInscriptionQRCode(member.qrConfig);*/ member.qrCode = await QRHelper.getInscriptionQRCode(member.qrConfig);
member.qrCodeUrl = QRHelper.getInscriptionQRCodeUrl(inscription.id);
console.log('Mandamos mail con entrada>>>>>>>>>>>>>>>>>>>>>>>>>>>'); console.log('Mandamos mail con entrada>>>>>>>>>>>>>>>>>>>>>>>>>>>');
//console.log(headerMail, bodyMail); //console.log(headerMail, bodyMail);
@ -792,6 +789,10 @@ console.log('Mandamos mail con entrada>>>>>>>>>>>>>>>>>>>>>>>>>>>');
//Creamos objeto member para facilitar inserción en mailchimp y envio de correo //Creamos objeto member para facilitar inserción en mailchimp y envio de correo
let member = generateMemberInscription(inscription.user, inscription, inscription.reservation); let member = generateMemberInscription(inscription.user, inscription, inscription.reservation);
member.qrConfig = generateQRConfig(member);
member.qrCode = await QRHelper.getInscriptionQRCode(member.qrConfig);
let buffer = new Buffer(member.qrCode.split(",")[1], 'base64'); let buffer = new Buffer(member.qrCode.split(",")[1], 'base64');
res.setHeader('Content-Type', 'image/png'); res.setHeader('Content-Type', 'image/png');