From 63fc909859ac40398d8a29951be3d901a4d73494 Mon Sep 17 00:00:00 2001 From: Andres2908 Date: Tue, 10 May 2022 23:36:28 -0500 Subject: [PATCH] separacion del credito --- server/controller/Admin/credito.js | 20 ++++++++++++++++++++ server/controller/Usuario/credito.js | 2 +- server/routes/Admin.js | 16 ++++++++++++++-- server/routes/Usuario.js | 23 ++++++++++++----------- 4 files changed, 47 insertions(+), 14 deletions(-) create mode 100644 server/controller/Admin/credito.js diff --git a/server/controller/Admin/credito.js b/server/controller/Admin/credito.js new file mode 100644 index 0000000..bda771e --- /dev/null +++ b/server/controller/Admin/credito.js @@ -0,0 +1,20 @@ +const dbPath = '../../db/tablas'; +const Usuario = require(`${dbPath}/Usuario`); +const { validarNumeroCuenta } = require('../../helper/validar'); + +const credito = async (body) => { + const numeroCuenta = validarNumeroCuenta( + body.numeroCuenta, + 'nĂºmero de cuenta', + true + ); + return Usuario.findOne({ + where: { numeroCuenta }, + }).then(() => { + return Usuario.findOne({ + attributes: ['credito', 'nombre', 'numeroCuenta'], + }); + }); +}; + +module.exports = credito; diff --git a/server/controller/Usuario/credito.js b/server/controller/Usuario/credito.js index bda771e..7ee7d19 100644 --- a/server/controller/Usuario/credito.js +++ b/server/controller/Usuario/credito.js @@ -12,7 +12,7 @@ const credito = async (body) => { where: { numeroCuenta }, }).then(() => { return Usuario.findOne({ - attributes: ['credito', 'nombre', 'numeroCuenta'], + attributes: ['credito'], }); }); }; diff --git a/server/routes/Admin.js b/server/routes/Admin.js index b5e18a0..dc38dae 100644 --- a/server/routes/Admin.js +++ b/server/routes/Admin.js @@ -15,6 +15,7 @@ const validarTicket = require(`${controllerPath}/validarTicket`); const reporte = require(`${controllerPath}/reporte`); const restarCredito = require(`${controllerPath}/restarCredito`); const ticketsImpresion = require(`${controllerPath}/ticketsImpresion`); +const credito = require(`${controllerPath}/credito`); app.post(`${route}/login`, (req, res) => { return login(req.body) @@ -109,7 +110,7 @@ app.get(`${route}/reporte`, verificaToken, (req, res) => { }); }); -app.put(`${route}/restar_credito`, (req, res) => { +app.put(`${route}/restar_credito`, verificaToken, (req, res) => { return restarCredito(req.body) .then((data) => { res.status(200).json(data); @@ -119,7 +120,7 @@ app.put(`${route}/restar_credito`, (req, res) => { }); }); -app.get(`${route}/tickets_impresion`, (req, res) => { +app.get(`${route}/tickets_impresion`, verificaToken, (req, res) => { return ticketsImpresion(req.query) .then((data) => { res.status(200).json(data); @@ -128,4 +129,15 @@ app.get(`${route}/tickets_impresion`, (req, res) => { res.status(400).json({ message: err.message }); }); }); + +app.get(`${route}/credito`, verificaToken, (req, res) => { + return credito(req.query) + .then((data) => { + res.status(200).json(data); + }) + .catch((err) => { + res.status(400).json({ message: err.message }); + }); +}); + module.exports = app; diff --git a/server/routes/Usuario.js b/server/routes/Usuario.js index b7ab269..4fe65e1 100644 --- a/server/routes/Usuario.js +++ b/server/routes/Usuario.js @@ -9,8 +9,8 @@ const controllerPath = '../controller/Usuario'; const login = require(`${controllerPath}/login`); const inscripciones = require(`${controllerPath}/inscripciones`); const inscripcionUsuario = require(`${controllerPath}/inscripcionUsuario`); -const credito = require(`${controllerPath}/credito`); const agregarCredito = require(`${controllerPath}/agregarCredito`); +const credito = require(`${controllerPath}/credito`); app.post(`${route}/login`, (req, res) => { return login(req.body) @@ -47,16 +47,6 @@ app.post( } ); -app.get(`${route}/credito`, (req, res) => { - return credito(req.query) - .then((data) => { - res.status(200).json(data); - }) - .catch((err) => { - res.status(400).json({ message: err.message }); - }); -}); - app.put(`${route}/agregar_credito`, (req, res) => { return agregarCredito(req.body) .then((data) => { @@ -66,4 +56,15 @@ app.put(`${route}/agregar_credito`, (req, res) => { res.status(400).json({ message: err.message }); }); }); + +app.get(`${route}/credito`, verificaToken, (req, res) => { + return credito(req.query) + .then((data) => { + res.status(200).json(data); + }) + .catch((err) => { + res.status(400).json({ message: err.message }); + }); +}); + module.exports = app;