From 18df5afb80dad9003b5b55ffac2fc5e2be455d73 Mon Sep 17 00:00:00 2001
From: Lemuel Marquez <lemuel@iMac-de-Lemuel.local>
Date: Thu, 20 May 2021 14:32:48 -0500
Subject: [PATCH] usuarios y usaurio solo trae a los que tienen pass

---
 server/controller/Operador/crear.js               |  5 +++--
 server/controller/Operador/login.js               | 10 ++++++----
 server/controller/Operador/operadores.js          |  5 +++--
 server/controller/Usuario/cargaMasivaPosgrados.js |  5 +++--
 server/controller/Usuario/crear.js                |  7 ++++---
 server/controller/Usuario/login.js                |  5 +++--
 server/controller/Usuario/usuario.js              |  5 +++--
 server/controller/Usuario/usuarios.js             |  2 ++
 8 files changed, 27 insertions(+), 17 deletions(-)

diff --git a/server/controller/Operador/crear.js b/server/controller/Operador/crear.js
index c4c359b..ea8d344 100644
--- a/server/controller/Operador/crear.js
+++ b/server/controller/Operador/crear.js
@@ -1,5 +1,6 @@
-const { encriptar } = require('../../helper/encriptar');
-const validar = require('../../helper/validar');
+const helperPath = '../../helper';
+const { encriptar } = require(`${helperPath}/encriptar`);
+const validar = require(`${helperPath}/validar`);
 const Operador = require('../../db/tablas/Operador');
 
 const crear = async (body) => {
diff --git a/server/controller/Operador/login.js b/server/controller/Operador/login.js
index b33d08f..6c401e8 100644
--- a/server/controller/Operador/login.js
+++ b/server/controller/Operador/login.js
@@ -1,8 +1,10 @@
-const { comparar } = require('../../helper/encriptar');
 const { crearTokenOperador } = require('../../middleware/autentificacion');
-const validar = require('../../helper/validar');
-const Operador = require('../../db/tablas/Operador');
-const TipoUsuario = require('../../db/tablas/TipoUsuario');
+const helperPath = '../../helper';
+const { comparar } = require(`${helperPath}/encriptar`);
+const validar = require(`${helperPath}/validar`);
+const dbPath = '../../db/tablas';
+const Operador = require(`${dbPath}/Operador`);
+const TipoUsuario = require(`${dbPath}/TipoUsuario`);
 
 const login = async (body) => {
   const operador = validar.validarTexto(body.operador, 'El operador', 60);
diff --git a/server/controller/Operador/operadores.js b/server/controller/Operador/operadores.js
index e6dc5b6..b3a7687 100644
--- a/server/controller/Operador/operadores.js
+++ b/server/controller/Operador/operadores.js
@@ -1,6 +1,7 @@
 const validar = require('../../helper/validar');
-const Operador = require('../../db/tablas/Operador');
-const TipoUsuario = require('../../db/tablas/TipoUsuario');
+const dbPath = '../../db/tablas';
+const Operador = require(`${dbPath}/Operador`);
+const TipoUsuario = require(`${dbPath}/TipoUsuario`);
 
 const operadores = async (body) => {
   const pagina = validar.validarNumero(body.pagina, true);
diff --git a/server/controller/Usuario/cargaMasivaPosgrados.js b/server/controller/Usuario/cargaMasivaPosgrados.js
index 5378e16..6b1c9f6 100644
--- a/server/controller/Usuario/cargaMasivaPosgrados.js
+++ b/server/controller/Usuario/cargaMasivaPosgrados.js
@@ -1,6 +1,7 @@
 const csv = require('csvtojson');
-const { validarObjetoVacio } = require('../../helper/validar');
-const { eliminarArchivo } = require('../../helper/helper');
+const helperPath = '../../helper';
+const { validarObjetoVacio } = require(`${helperPath}/validar`);
+const { eliminarArchivo } = require(`${helperPath}/helper`);
 const dbPath = '../../db/tablas';
 const Usuario = require(`${dbPath}/Usuario`);
 const Carrera = require(`${dbPath}/Carrera`);
diff --git a/server/controller/Usuario/crear.js b/server/controller/Usuario/crear.js
index 27def62..93d8669 100644
--- a/server/controller/Usuario/crear.js
+++ b/server/controller/Usuario/crear.js
@@ -1,6 +1,7 @@
-const gmail = require('../../helper/gmail');
-const encriptar = require('../../helper/encriptar');
-const validar = require('../../helper/validar');
+const helperPath = '../../helper';
+const gmail = require(`${helperPath}/gmail`);
+const encriptar = require(`${helperPath}/encriptar`);
+const validar = require(`${helperPath}/validar`);
 const Usuario = require('../../db/tablas/Usuario');
 
 const crear = async (body) => {
diff --git a/server/controller/Usuario/login.js b/server/controller/Usuario/login.js
index fbd9ca7..6610b17 100644
--- a/server/controller/Usuario/login.js
+++ b/server/controller/Usuario/login.js
@@ -1,7 +1,8 @@
 const { Op } = require('sequelize');
-const encriptar = require('../../helper/encriptar');
-const validar = require('../../helper/validar');
 const { crearTokenUsuario } = require('../../middleware/autentificacion');
+const helperPath = '../../helper';
+const encriptar = require(`${helperPath}/encriptar`);
+const validar = require(`${helperPath}/validar`);
 const dbPath = '../../db/tablas';
 const Usuario = require(`${dbPath}/Usuario`);
 const TipoUsuario = require(`${dbPath}/TipoUsuario`);
diff --git a/server/controller/Usuario/usuario.js b/server/controller/Usuario/usuario.js
index 7a2b884..270e4ef 100644
--- a/server/controller/Usuario/usuario.js
+++ b/server/controller/Usuario/usuario.js
@@ -1,3 +1,4 @@
+const { Op } = require('sequelize');
 const validar = require('../../helper/validar');
 const dbPath = '../../db/tablas';
 const Usuario = require(`${dbPath}/Usuario`);
@@ -8,14 +9,14 @@ const usuario = async (body) => {
   const usuario = validar.validarNumeroCuenta(body.usuario);
 
   return Usuario.findOne({
-    where: { usuario },
+    where: { usuario, password: { [Op.ne]: null } },
     include: [{ model: TipoUsuario }, { model: Carrera }],
   }).then((res) => {
     if (!res) throw new Error('No existe este usuario.');
     delete res.dataValues.password;
     delete res.dataValues.idTipoUsuario;
+    if (!res.idCarrera) delete res.dataValues.Carrera;
     delete res.dataValues.idCarrera;
-    if (res.Carrera) delete res.dataValues.Carrera;
     return res;
   });
 };
diff --git a/server/controller/Usuario/usuarios.js b/server/controller/Usuario/usuarios.js
index 496d668..3bdb47d 100644
--- a/server/controller/Usuario/usuarios.js
+++ b/server/controller/Usuario/usuarios.js
@@ -1,3 +1,4 @@
+const { Op } = require('sequelize');
 const validar = require('../../helper/validar');
 const dbPath = '../../db/tablas';
 const Usuario = require(`${dbPath}/Usuario`);
@@ -9,6 +10,7 @@ const usuarios = async (body) => {
   // filtros
 
   return Usuario.findAndCountAll({
+    where: { password: { [Op.ne]: null } },
     include: [{ model: TipoUsuario }, { model: Carrera }],
     limit: 25,
     offset: 25 * (pagina - 1),