1.3.3
This commit is contained in:
parent
80f3449839
commit
d5c445fd74
@ -147,7 +147,7 @@ const extraControllers = {
|
|||||||
const userId = req.user.id;
|
const userId = req.user.id;
|
||||||
var result = null;
|
var result = null;
|
||||||
|
|
||||||
//console.log(params, req.user.level);
|
//console.log('>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>', params, req.user.level);
|
||||||
if (!eventId)
|
if (!eventId)
|
||||||
return handleResultResponse("Es necesario el ID del evento", null, params, res, httpStatus.NOT_FOUND);
|
return handleResultResponse("Es necesario el ID del evento", null, params, res, httpStatus.NOT_FOUND);
|
||||||
|
|
||||||
@ -282,7 +282,7 @@ const extraControllers = {
|
|||||||
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 = QRHelper.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(
|
console.log(
|
||||||
|
|||||||
@ -8,9 +8,10 @@ const eventService = require("./event.service");
|
|||||||
const mailService = require("./mail.service");
|
const mailService = require("./mail.service");
|
||||||
const marketingListService = require("./marketing_list.service");
|
const marketingListService = require("./marketing_list.service");
|
||||||
const QRHelper = require("../../helpers/qr.helper");
|
const QRHelper = require("../../helpers/qr.helper");
|
||||||
const { extractParamsFromRequest, handleResultResponse } = require("../../helpers/controller.helper");
|
const { extractParamsFromRequest, handleResultResponse, handleErrorResponse } = require("../../helpers/controller.helper");
|
||||||
const { data } = require("../../core/logger");
|
const { data } = require("../../core/logger");
|
||||||
const lodash = require("lodash");
|
const lodash = require("lodash");
|
||||||
|
const userService = require("../auth/user.service");
|
||||||
|
|
||||||
// Module Name
|
// Module Name
|
||||||
const MODULE_NAME = "[eventInscription.controller]";
|
const MODULE_NAME = "[eventInscription.controller]";
|
||||||
@ -20,13 +21,7 @@ const controllerOptions = { MODULE_NAME };
|
|||||||
async function refreshConfirmed(inscription) {
|
async function refreshConfirmed(inscription) {
|
||||||
|
|
||||||
if (!inscription) {
|
if (!inscription) {
|
||||||
return handleResultResponse(
|
throw new Error("Error al eliminar inscripción, no puedo cambiar confirmados a la reserva asociada");
|
||||||
"Error al eliminar inscripción, no puedo cambiar confirmados a la reserva asociada",
|
|
||||||
null,
|
|
||||||
params,
|
|
||||||
res,
|
|
||||||
httpStatus.NOT_FOUND
|
|
||||||
);
|
|
||||||
};
|
};
|
||||||
|
|
||||||
if (inscription.type === "online")
|
if (inscription.type === "online")
|
||||||
@ -74,25 +69,15 @@ async function refreshConfirmed (inscription){
|
|||||||
if (inscription.reservationId != null) {
|
if (inscription.reservationId != null) {
|
||||||
console.log(">>>>>>>>>>>>>>Voy a actualizar aforo reserva", EventOrReservationChangeId);
|
console.log(">>>>>>>>>>>>>>Voy a actualizar aforo reserva", EventOrReservationChangeId);
|
||||||
console.log(">>>>>>>>>>>>>> ", NewConfirmed);
|
console.log(">>>>>>>>>>>>>> ", NewConfirmed);
|
||||||
if (!(await eventReservationService._updateConfirmedReservation(EventOrReservationChangeId, NewConfirmed)))
|
if (!(await eventReservationService._updateConfirmedReservation(EventOrReservationChangeId, NewConfirmed))) {
|
||||||
return handleResultResponse(
|
throw new Error("Error al eliminar inscripción, no puedo cambiar confirmados a la reserva asociada");
|
||||||
"Error al eliminar inscripción, no puedo cambiar confirmados a la reserva asociada",
|
}
|
||||||
null,
|
|
||||||
params,
|
|
||||||
res,
|
|
||||||
httpStatus.NOT_FOUND
|
|
||||||
);
|
|
||||||
} else {
|
} else {
|
||||||
console.log(">>>>>>>>>>>>>>Voy a actualizar aforo evento", EventOrReservationChangeId);
|
console.log(">>>>>>>>>>>>>>Voy a actualizar aforo evento", EventOrReservationChangeId);
|
||||||
console.log(">>>>>>>>>>>>>> ", NewConfirmed);
|
console.log(">>>>>>>>>>>>>> ", NewConfirmed);
|
||||||
if (!(await eventService._updateConfirmedEvent(EventOrReservationChangeId, NewConfirmed)))
|
if (!(await eventService._updateConfirmedEvent(EventOrReservationChangeId, NewConfirmed))) {
|
||||||
return handleResultResponse(
|
throw new Error("Error al eliminar inscripción, no puedo cambiar confirmados a la inscripcion");
|
||||||
"Error al eliminar inscripción, no puedo cambiar confirmados a la inscripcion",
|
}
|
||||||
null,
|
|
||||||
params,
|
|
||||||
res,
|
|
||||||
httpStatus.NOT_FOUND
|
|
||||||
);
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -59,14 +59,6 @@ const extraMethods = {
|
|||||||
});
|
});
|
||||||
},
|
},
|
||||||
|
|
||||||
_getInscriptionByEvent: (eventId) => {
|
|
||||||
return models.EventInscription.scope("defaultScope").findAll({
|
|
||||||
where: {
|
|
||||||
eventId: eventId,
|
|
||||||
},
|
|
||||||
});
|
|
||||||
},
|
|
||||||
|
|
||||||
_getInscriptionByEventAndValidated: (eventId, validated) => {
|
_getInscriptionByEventAndValidated: (eventId, validated) => {
|
||||||
return models.EventInscription.scope("defaultScope").findAll({
|
return models.EventInscription.scope("defaultScope").findAll({
|
||||||
where: {
|
where: {
|
||||||
|
|||||||
@ -237,7 +237,8 @@ const extraControllers = {
|
|||||||
params,
|
params,
|
||||||
res,
|
res,
|
||||||
httpStatus.NOT_FOUND
|
httpStatus.NOT_FOUND
|
||||||
)};
|
)
|
||||||
|
};
|
||||||
|
|
||||||
const reservationData = {
|
const reservationData = {
|
||||||
reservation_code: eventReservationService._generateReservatioCode(dataInscription.event, dataUser.entityName),
|
reservation_code: eventReservationService._generateReservatioCode(dataInscription.event, dataUser.entityName),
|
||||||
@ -332,7 +333,7 @@ const extraControllers = {
|
|||||||
);
|
);
|
||||||
|
|
||||||
//Si se ha llenado ponemos el evento en SOLD_OUT
|
//Si se ha llenado ponemos el evento en SOLD_OUT
|
||||||
if (eventToDiscountAssistants.confirmed == newAforo)
|
if (eventToDiscountAssistants.confirmed >= newAforo)
|
||||||
await eventService._updateSoldOutEvent(eventToDiscountAssistants.id, true);
|
await eventService._updateSoldOutEvent(eventToDiscountAssistants.id, true);
|
||||||
|
|
||||||
//Finalmente publicamos la reserva solo si no está asociada a la lista de espera
|
//Finalmente publicamos la reserva solo si no está asociada a la lista de espera
|
||||||
|
|||||||
@ -125,7 +125,8 @@ module.exports = function (sequelize, DataTypes) {
|
|||||||
required: false,
|
required: false,
|
||||||
include: [{
|
include: [{
|
||||||
model: sequelize.models.MultimediaFile,
|
model: sequelize.models.MultimediaFile,
|
||||||
as: "multimediaFile"
|
as: "multimediaFile",
|
||||||
|
order: [['createdAt', 'DESC']],
|
||||||
}]
|
}]
|
||||||
},
|
},
|
||||||
]
|
]
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "lqdvi-api3",
|
"name": "lqdvi-api3",
|
||||||
"version": "1.3.0",
|
"version": "1.3.3",
|
||||||
"description": "",
|
"description": "",
|
||||||
"author": "Rodax Software",
|
"author": "Rodax Software",
|
||||||
"license": "ISC",
|
"license": "ISC",
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user