From ccbc2863698b4eec0102372c69ba76d44982f8a0 Mon Sep 17 00:00:00 2001
From: alfredojl <alfredo.jl323@gmail.com>
Date: Mon, 21 Sep 2020 14:48:10 -0500
Subject: [PATCH] Error and improvements added(fixed).

---
 helpers/fillDB.js                      | 13 +++++++++++--
 server/controller/addEquip/addEquip.js |  4 +---
 server/controller/addEquip/delete.js   |  0
 server/controller/addEquip/post.js     | 24 ++++++++++++++++--------
 server/middlewares/authentication.js   | 12 ++----------
 server/routes/addEquip.js              |  4 ----
 6 files changed, 30 insertions(+), 27 deletions(-)
 delete mode 100644 server/controller/addEquip/delete.js

diff --git a/helpers/fillDB.js b/helpers/fillDB.js
index 93f9a7f..a89d7e2 100644
--- a/helpers/fillDB.js
+++ b/helpers/fillDB.js
@@ -15,6 +15,7 @@ faker.locale = "es_MX";
 const colors = require('colors');
 const symbols = require('log-symbols');
 const progress = require('cli-progress');
+const Inventario = require('../server/models/tablas/Inventario');
 
 let rows = 100;
 let faileds = 0;
@@ -58,7 +59,11 @@ async function fillingEquipo() {
                 throw new Error();
             });
         await fillEquipo(noInventario, idActivoFijo)
-            .catch(() => {
+            .catch(async() => {
+                await Inventario.destroy({
+                    where: noInventario
+                })
+                then(() => censo--);
                 console.log(symbols.warning, 'Error creating «equipo»');
                 barequipo.stop();
                 throw new Error();
@@ -102,7 +107,11 @@ async function fillingPrinters() {
                 throw new Error();
             });
         await fillPrinters(noInventario, idActivoFijo)
-            .catch(() => {
+            .catch(async() => {
+                await Inventario.destroy({
+                        where: noInventario
+                    })
+                    .then(() => censo--);
                 console.log(symbols.warning, 'Error creating «printers»');
                 barprinters.stop();
                 throw new Error();
diff --git a/server/controller/addEquip/addEquip.js b/server/controller/addEquip/addEquip.js
index 07b07e4..851506a 100644
--- a/server/controller/addEquip/addEquip.js
+++ b/server/controller/addEquip/addEquip.js
@@ -1,11 +1,9 @@
 const get = require('./get');
 const post = require('./post');
 const put = require('./put');
-const delet = require('./delete');
 
 module.exports = {
     get,
     post,
-    put,
-    delete: delet
+    put
 };
\ No newline at end of file
diff --git a/server/controller/addEquip/delete.js b/server/controller/addEquip/delete.js
deleted file mode 100644
index e69de29..0000000
diff --git a/server/controller/addEquip/post.js b/server/controller/addEquip/post.js
index cea7f32..d632ea0 100644
--- a/server/controller/addEquip/post.js
+++ b/server/controller/addEquip/post.js
@@ -20,6 +20,8 @@ const post = async(req, res) => {
     const idUbicacion = req.body.idUbicacion;
     const idUso = req.body.idUso;
 
+    let err = '';
+
     await Inventario.create({
             noInventario,
             idActivoFijo,
@@ -28,10 +30,8 @@ const post = async(req, res) => {
             idUbicacion,
             idUso
         })
-        .catch((e) => res.json({
-            ok: false,
-            error: e
-        }));
+        .then()
+        .catch((e) => err = e);
 
     await Equipo.create({
             modelo,
@@ -52,10 +52,18 @@ const post = async(req, res) => {
             ok: true,
             message: 'Equipo agregado en inventario con éxito.'
         }))
-        .catch((e) => res.json({
-            ok: false,
-            error: e
-        }));
+        .catch(async(e) => {
+            await Inventario.destroy({
+                where: {
+                    noInventario
+                }
+            });
+            res.status(500).json({
+                ok: false,
+                error: [e, err],
+                message: 'Equipo'
+            })
+        });
 };
 
 module.exports = post;
\ No newline at end of file
diff --git a/server/middlewares/authentication.js b/server/middlewares/authentication.js
index 7ec11ae..def91f9 100644
--- a/server/middlewares/authentication.js
+++ b/server/middlewares/authentication.js
@@ -1,22 +1,14 @@
-9
 const jwt = require('jsonwebtoken');
 
 const verifyToken = (req, res, next) => {
-
-    // if (typeof localStorage === "undefined" || localStorage === null) {
-    //     var LocalStorage = require('node-localstorage').LocalStorage;
-    //     localStorage = new LocalStorage('./scratch');
-    // }
-    // let localToken = localStorage.getItem('token');
-
-    // let localToken = req.get('token');
     let localToken = req.header('token');
 
     jwt.verify(localToken, process.env.TOKEN_SEED, (err, decoded) => {
         if (err) {
             return res.status(409).json({
                 err: {
-                    message: 'Invalid token.'
+                    message: 'Invalid token.',
+                    token: localToken
                 }
             })
         }
diff --git a/server/routes/addEquip.js b/server/routes/addEquip.js
index b264c6a..0708a41 100644
--- a/server/routes/addEquip.js
+++ b/server/routes/addEquip.js
@@ -18,8 +18,4 @@ app.put(route, [verifyToken, verifyAdmin], (req, res) => {
     return addEquip.put(req, res);
 });
 
-app.delete(route, [verifyToken, verifyAdmin], (req, res) => {
-    return addEquip.delete(req, res);
-});
-
 module.exports = app;
\ No newline at end of file