From 061ea3abe12289fc0e60f90543e32be72880eb73 Mon Sep 17 00:00:00 2001 From: alfredojl Date: Thu, 17 Sep 2020 21:24:57 -0500 Subject: [PATCH] AddPrinter funcionando al cien --- server/controller/addPrinter/post.js | 2 +- server/controller/user/computers/computers.js | 11 -------- server/controller/user/computers/get.js | 2 +- server/controller/user/computers/post.js | 25 ------------------- server/controller/user/computers/put.js | 11 -------- server/controller/user/printers/get.js | 2 +- server/controller/user/printers/printers.js | 5 ---- server/middlewares/authentication.js | 3 ++- server/routes/user.js | 17 +++---------- 9 files changed, 9 insertions(+), 69 deletions(-) delete mode 100644 server/controller/user/computers/computers.js delete mode 100644 server/controller/user/computers/post.js delete mode 100644 server/controller/user/computers/put.js delete mode 100644 server/controller/user/printers/printers.js diff --git a/server/controller/addPrinter/post.js b/server/controller/addPrinter/post.js index 068e50e..2440c1b 100644 --- a/server/controller/addPrinter/post.js +++ b/server/controller/addPrinter/post.js @@ -2,10 +2,10 @@ const Printers = require('../../models/tablas/Printers'); const Inventario = require('../../models/tablas/Inventario'); const post = async(req, res) => { + const idActivoFijo = 6; const noSerie = req.body.noSerie; const noInventario = req.body.noInventario; const modelo = req.body.modelo; - const idActivoFijo = req.body.idActivoFijo; const idMarca = req.body.idMarca; const idTipo = req.body.idTipo; const descripcion = req.body.descripcion; diff --git a/server/controller/user/computers/computers.js b/server/controller/user/computers/computers.js deleted file mode 100644 index f18ef51..0000000 --- a/server/controller/user/computers/computers.js +++ /dev/null @@ -1,11 +0,0 @@ -const get = require('./get'); - -const post = require('./post'); - -const put = require('./put'); - -module.exports = { - get, - post, - put -}; \ No newline at end of file diff --git a/server/controller/user/computers/get.js b/server/controller/user/computers/get.js index 696703d..f50a288 100644 --- a/server/controller/user/computers/get.js +++ b/server/controller/user/computers/get.js @@ -18,7 +18,7 @@ const get = async(req, res) => { INNER JOIN uResponsable UR ON UR.idUnidadResponsable = I.idUnidadResponsable INNER JOIN ubicacion Ub ON Ub.idUbicacion = I.idUbicacion INNER JOIN uso U ON U.idUso = I.idUso - ORDER BY AF.activoFijo`, { type: QueryTypes.SELECT }) + ORDER BY E.createdAt DESC`, { type: QueryTypes.SELECT }) .then(equipo => { return res.json({ equipo diff --git a/server/controller/user/computers/post.js b/server/controller/user/computers/post.js deleted file mode 100644 index 173d63b..0000000 --- a/server/controller/user/computers/post.js +++ /dev/null @@ -1,25 +0,0 @@ -const sequelize = require('../../../config/sequelize.conf'); - -const { QueryTypes } = require('sequelize') - -const post = async(req, res) => { - let body = req.body; - - await sequelize.query(` - INSERT INTO equipo(modelo, noSerie, procesador, vProcesador, memoria, memoriasz, vMemoria, graficos, hdd, idActivoFIjo, noInventario, idMarca, idOS) - VALUES (${body.modelo}, ${body.noSerie}, ${body.procesador}, ${body.vProcesador}, ${body.memoria}, ${body.memoriasz}, ${body.vMemoria}, ${body.graficos}, ${body.hdd}, ${body.idActivoFijo}, ${body.noInventario}, ${body.idMarca}, ${body.idOS}) - `) - .catch(() => { throw new Error('Equipo error.') }); - - await sequelize.query(` - INSERT INTO printers (noInventario, noSerie, modelo, descripcion, idMarca, idTipo, idActivoFijo) - VALUES (${body.noInventario}, ${body.noSerie}, ${body.modelo}, ${body.descripcion}, ${body.idMarca}, ${body.idTipo}, ${body.idActivoFijo}) - `) - .catch(() => { throw new Error('Printers error.') }); - - await sequelize.query(` - INSERT INTO inventario (noResguardo, idActivoFijo, noInventario, idUnidadResponsable, idUbicacion, idUso) - VALUES (${body.noResguardo}, ${body.idActivoFijo}, ${body.noInventario}, ${body.idUnidadResponsable}, ${body.idUbicacion}, ${body.idUso}) - `) - .catch(() => { throw new Error('Inventario error') }); -}; \ No newline at end of file diff --git a/server/controller/user/computers/put.js b/server/controller/user/computers/put.js deleted file mode 100644 index 5e3a5e3..0000000 --- a/server/controller/user/computers/put.js +++ /dev/null @@ -1,11 +0,0 @@ -const sequelize = require('../../../config/sequelize.conf'); - -const { QueryTypes } = require('sequelize'); - -const put = async(req, res) => { - let body = req.body; - - -}; - -module.exports = put; \ No newline at end of file diff --git a/server/controller/user/printers/get.js b/server/controller/user/printers/get.js index 4bdbc3f..58d9ae1 100644 --- a/server/controller/user/printers/get.js +++ b/server/controller/user/printers/get.js @@ -10,7 +10,7 @@ const get = async(req, res) => { INNER JOIN printers P ON P.noInventario = I.noInventario INNER JOIN marca M ON M.idMarca = P.idMarca INNER JOIN tipo T ON T.idTipo = P.idTipo - ORDER BY T.tipo + ORDER BY P.createdAt DESC `, { type: QueryTypes.SELECT }) .then(printers => { return res.json({ diff --git a/server/controller/user/printers/printers.js b/server/controller/user/printers/printers.js deleted file mode 100644 index dac01a4..0000000 --- a/server/controller/user/printers/printers.js +++ /dev/null @@ -1,5 +0,0 @@ -const get = require('./get'); - -module.exports = { - get -}; \ No newline at end of file diff --git a/server/middlewares/authentication.js b/server/middlewares/authentication.js index bfc1055..7ec11ae 100644 --- a/server/middlewares/authentication.js +++ b/server/middlewares/authentication.js @@ -1,3 +1,4 @@ +9 const jwt = require('jsonwebtoken'); const verifyToken = (req, res, next) => { @@ -13,7 +14,7 @@ const verifyToken = (req, res, next) => { jwt.verify(localToken, process.env.TOKEN_SEED, (err, decoded) => { if (err) { - return res.status(401).json({ + return res.status(409).json({ err: { message: 'Invalid token.' } diff --git a/server/routes/user.js b/server/routes/user.js index 5926597..2e08a86 100644 --- a/server/routes/user.js +++ b/server/routes/user.js @@ -3,8 +3,8 @@ let app = express(); // const computers_get = require('../controller/user/computers/get'); // const printers = require('../controller/user/printers/get'); -const computers = require('../controller/user/computers/computers'); -const printers = require('../controller/user/printers/printers'); +const computers = require('../controller/user/computers/get'); +const printers = require('../controller/user/printers/get'); const { verifyToken, verifyAdmin } = require('../middlewares/authentication'); const computersRoute = '/api/computers'; @@ -14,24 +14,15 @@ const printersRoute = '/api/printers'; computer =============================================*/ app.get('/api/computers', verifyToken, (req, res) => { - return computers.get(req, res); + return computers(req, res); }); -app.post(computersRoute, [verifyToken, verifyAdmin], (req, res) => { - return computers.post(req, res); -}); - -app.put(computersRoute, [verifyToken, verifyAdmin], (req, res) => { - return computers.put(req, res); -}); - - /*============================================= printers =============================================*/ app.get(printersRoute, verifyToken, (req, res) => { - return printers.get(req, res); + return printers(req, res); });