From 70cc64a813ae222d690522ea7bba9cf36654bd13 Mon Sep 17 00:00:00 2001 From: lemuel Date: Wed, 16 Feb 2022 15:28:43 -0600 Subject: [PATCH 1/5] =?UTF-8?q?producci=C3=B3n?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- server/socket.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/server/socket.js b/server/socket.js index 15560d0..87fe162 100644 --- a/server/socket.js +++ b/server/socket.js @@ -8,10 +8,10 @@ module.exports = { origin: [ // 'http://localhost:3046', // 'http://localhost:3056', - 'http://132.248.80.196:3045', - 'http://132.248.80.196:3055', - // 'https://pcpuma.acatlan.unam.mx', - // 'https://pcpuma.acatlan.unam.mx:8080', + // 'http://132.248.80.196:3045', + // 'http://132.248.80.196:3055', + 'https://pcpuma.acatlan.unam.mx', + 'https://pcpuma.acatlan.unam.mx:8080', ], }, }); From 5aa6544e30f9fa3b4395c13393ef41e6fa581f1e Mon Sep 17 00:00:00 2001 From: lemuel Date: Wed, 23 Feb 2022 13:28:32 -0600 Subject: [PATCH 2/5] hisotirial --- server/controller/Prestamo/historial.js | 1 - 1 file changed, 1 deletion(-) diff --git a/server/controller/Prestamo/historial.js b/server/controller/Prestamo/historial.js index 8986572..916ba4b 100644 --- a/server/controller/Prestamo/historial.js +++ b/server/controller/Prestamo/historial.js @@ -94,7 +94,6 @@ const historial = async (body) => { ], limit: 25, offset: 25 * (pagina - 1), - order: [['createdAt', 'DESC']], }); }; From 1d1461cf1b68422ec29313d7b511854328cd51bf Mon Sep 17 00:00:00 2001 From: lemuel Date: Sun, 27 Feb 2022 11:33:55 -0600 Subject: [PATCH 3/5] resetear prestado a false --- server/helper/equiposDiario.js | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 server/helper/equiposDiario.js diff --git a/server/helper/equiposDiario.js b/server/helper/equiposDiario.js new file mode 100644 index 0000000..b7fb3a8 --- /dev/null +++ b/server/helper/equiposDiario.js @@ -0,0 +1,3 @@ +const Equipo = require('../db/tablas/Equipo'); + +Equipo.update({ prestado: false }); From 5f5a0e9e28c5587c2f57e3519b046b0faf1105fb Mon Sep 17 00:00:00 2001 From: lemuel Date: Sun, 27 Feb 2022 16:07:58 -0600 Subject: [PATCH 4/5] distinto mensaje para sesion terminada --- server/middleware/autentificacion.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/middleware/autentificacion.js b/server/middleware/autentificacion.js index dbf9e97..110056e 100644 --- a/server/middleware/autentificacion.js +++ b/server/middleware/autentificacion.js @@ -13,7 +13,7 @@ const verificaToken = (req, res, next) => { let message = ''; if (err.message === 'invalid signature') - message = 'El token no es valido. Inicia sesión de nuevo.'; + message = 'Se termino el tiempo de tu sesión. Inicia sesión de nuevo.'; if (err.message === 'jwt expired') message = 'El token expiro. Inicia sesión de nuevo.'; if (err.message === 'jwt malformed') From e1b0e21ed7b3f0cecabecff9110c6a8ab9d625bf Mon Sep 17 00:00:00 2001 From: lemuel Date: Sun, 27 Feb 2022 21:06:55 -0600 Subject: [PATCH 5/5] multa por usuario --- server/controller/Multa/multarUsuario.js | 27 ++++++++++++++++++++++++ server/db/tablas/Multa.js | 5 +++++ 2 files changed, 32 insertions(+) create mode 100644 server/controller/Multa/multarUsuario.js diff --git a/server/controller/Multa/multarUsuario.js b/server/controller/Multa/multarUsuario.js new file mode 100644 index 0000000..4035771 --- /dev/null +++ b/server/controller/Multa/multarUsuario.js @@ -0,0 +1,27 @@ +const validar = require('../../helper/validar'); +const dbPath = '../../db/tablas'; +const Multa = require(`${dbPath}/Multa`); +const Usuario = require(`${dbPath}/Usuario`); + +const multar = async (body) => { + const idUsuario = validar.validarNumeroEntero( + body.idUsuario, + 'id usuario', + true + ); + + return Usuario.findOne({ where: { idUsuario } }) + .then((res) => { + if (!res) throw new Error('No existe este usuario.'); + return Multa.findAll({ where: { idUsuario, activo: true } }); + }) + .then((res) => { + if (res.length > 2) + throw new Error( + 'El usuario tiene más de 2 multas activas, favor de notificar a un operador sobre este problema.' + ); + return res; + }); +}; + +module.exports = multar; diff --git a/server/db/tablas/Multa.js b/server/db/tablas/Multa.js index 2d0ad74..b62565d 100644 --- a/server/db/tablas/Multa.js +++ b/server/db/tablas/Multa.js @@ -22,6 +22,11 @@ Multa.init( type: DataTypes.DATE, allowNull: false, }, + activo: { + type: DataTypes.BOOLEAN, + allowNull: false, + defaultValue: true, + }, }, { sequelize,