AddPrinter funcionando al cien

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;

server/controller/user/computers/computers.js

@@ -1,11 +0,0 @@
-const get = require('./get');
-
-const post = require('./post');
-
-const put = require('./put');
-
-module.exports = {
-    get,
-    post,
-    put
-};

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

server/controller/user/computers/post.js

@@ -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') });
-};

server/controller/user/computers/put.js

@@ -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;

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({

server/controller/user/printers/printers.js

@@ -1,5 +0,0 @@
-const get = require('./get');
-
-module.exports = {
-    get
-};

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.'
                 }

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);
 
 });