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 2024-08-30 12:24:31 +02:00
parent eb3b8ade3b
commit 219e2081c8
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
modules/auth/user.service.js
View File

@ -138,7 +138,7 @@ const extraMethods = {
where: { where: {
email: dataUser.email, email: dataUser.email,
}, },
// include: [{ model: models.Entity }], // include: [{ model: models.Entity }], /lo quitamos porque el join con entidad vacia nunca lo encuentra y siempre crea el correo.
defaults: { defaults: {
email: dataUser.email, email: dataUser.email,
name: dataUser.name, name: dataUser.name,
@ -150,9 +150,6 @@ const extraMethods = {
}, },
}).then(([user, created]) => { }).then(([user, created]) => {
user = user.toJSON(); user = user.toJSON();
console.log ("{ user: user, isCreated: created }>>>>> ", created, user);
result = { user: user, isCreated: created }; result = { user: user, isCreated: created };
}); });
} }

2
modules/events/events_inscriptions.controller.js
View File

@ -98,7 +98,7 @@ const extraControllers = {
reservationCode: req.user ? req.body.code : Buffer.from(req.body.code, "base64").toString("ascii"), reservationCode: req.user ? req.body.code : Buffer.from(req.body.code, "base64").toString("ascii"),
type: typeInscription, type: typeInscription,
groupSize: req.body.group_size ? req.body.group_size : 1, //Si no viene group_size será uno porque es una inscripcion de la APP antigua groupSize: req.body.group_size ? req.body.group_size : 1, //Si no viene group_size será uno porque es una inscripcion de la APP antigua
source: req.user ? "app" : "web", //En el caso de tener ya usuario viene por APP sino viene por web source: req.user ? (lodash.isEmpty(req.user)? "web4V": "app" ) : "web", //En el caso de tener ya usuario, si es vacio viene de formulario WEBV4, si no por la APP, y en caso de no tener user el formulario web actual
validated: false, //si no esta validado la inscripción es a la lista de espera validated: false, //si no esta validado la inscripción es a la lista de espera
inscriptionsWithoutReservationAndOverflowCount: null, //nº total de inscritos sin reserva y sin overflow asignada inscriptionsWithoutReservationAndOverflowCount: null, //nº total de inscritos sin reserva y sin overflow asignada
inscriptionsWithReservationCount: null, //nº total de inscritos a la reserva asignada inscriptionsWithReservationCount: null, //nº total de inscritos a la reserva asignada