From 0b6bb666c5fd3ce4e77d807f97b6529ced39dcff Mon Sep 17 00:00:00 2001 From: Lemuel Marquez Date: Thu, 13 May 2021 14:06:07 -0500 Subject: [PATCH] =?UTF-8?q?organizaci=C3=B3n=20de=20endpoints?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/CasoEspecial/casoEspecial.js | 4 +- server/controller/CasoEspecial/liberacion.js | 9 +- server/controller/CasoEspecial/nuevo.js | 5 +- server/controller/CasoEspecial/update.js | 2 +- server/controller/CuestionarioAlumno/get.js | 11 +- server/controller/CuestionarioPrograma/get.js | 10 +- server/controller/Programa/cargaMasiva.js | 8 +- server/controller/Programa/programasAdmin.js | 4 +- .../Programa/programasResponsable.js | 4 +- server/controller/Servicio/admin.js | 4 +- server/controller/Servicio/alumno.js | 4 +- server/controller/Servicio/cancelar.js | 4 +- server/controller/Servicio/cartaAceptacion.js | 2 +- server/controller/Servicio/cartaTermino.js | 2 +- server/controller/Servicio/gustavoBazPrada.js | 11 +- server/controller/Servicio/informeGlobal.js | 2 +- server/controller/Servicio/liberacion.js | 4 +- server/controller/Servicio/nuevo.js | 2 +- .../controller/Servicio/rechazarAceptacion.js | 4 +- server/controller/Servicio/rechazarInforme.js | 4 +- server/controller/Servicio/rechazarTermino.js | 4 +- server/controller/Servicio/registro.js | 4 +- .../controller/Servicio/registroValidado.js | 4 +- server/controller/Servicio/reporte.js | 19 +-- server/controller/Servicio/update.js | 4 +- server/controller/Usuario/escolares.js | 4 +- .../controller/Usuario/newPasswordAlumno.js | 4 +- .../Usuario/newPasswordResponsable.js | 4 +- .../controller/Usuario/responsableUpdate.js | 2 +- server/helper/helper.js | 37 +++++ server/helper/validar.js | 38 +---- server/routes/CasoEspecial.js | 33 ++--- server/routes/CuestionarioAlumno.js | 4 +- server/routes/CuestionarioPrograma.js | 4 +- server/routes/Programa.js | 46 +++--- server/routes/Servicio.js | 137 +++++++++--------- server/routes/Usuario.js | 27 ++-- server/routes/index.js | 8 +- 38 files changed, 251 insertions(+), 232 deletions(-) create mode 100644 server/helper/helper.js diff --git a/server/controller/CasoEspecial/casoEspecial.js b/server/controller/CasoEspecial/casoEspecial.js index c0bf8da..4a0d66d 100644 --- a/server/controller/CasoEspecial/casoEspecial.js +++ b/server/controller/CasoEspecial/casoEspecial.js @@ -1,4 +1,4 @@ -const validar = require('../../helper/validar'); +const { validarId } = require('../../helper/validar'); const dbPath = '../../db/tablas'; const Carrera = require(`${dbPath}/Carrera`); const CasoEspecial = require(`${dbPath}/CasoEspecial`); @@ -7,7 +7,7 @@ const TipoUsuario = require(`${dbPath}/TipoUsuario`); const Usuario = require(`${dbPath}/Usuario`); const admin = async (body) => { - const idCasoEspecial = validar.validarId(body.idCasoEspecial); + const idCasoEspecial = validarId(body.idCasoEspecial); return CasoEspecial.findOne({ where: { idCasoEspecial }, diff --git a/server/controller/CasoEspecial/liberacion.js b/server/controller/CasoEspecial/liberacion.js index 6da5f5a..3913d88 100644 --- a/server/controller/CasoEspecial/liberacion.js +++ b/server/controller/CasoEspecial/liberacion.js @@ -1,12 +1,13 @@ -const validar = require('../../helper/validar'); -const gmail = require('../../helper/gmail'); -const correos = require('../../helper/correos'); +const helperPath = '../../helper'; +const correos = require(`${helperPath}/correos`); +const gmail = require(`${helperPath}/gmail`); +const { validarId } = require(`${helperPath}/validar`); const dbPath = '../../db/tablas'; const CasoEspecial = require(`${dbPath}/CasoEspecial`); const Usuario = require(`${dbPath}/Usuario`); const liberacion = async (body) => { - const idCasoEspecial = validar.validarId(body.idCasoEspecial); + const idCasoEspecial = validarId(body.idCasoEspecial); let update = {}; return CasoEspecial.findOne({ diff --git a/server/controller/CasoEspecial/nuevo.js b/server/controller/CasoEspecial/nuevo.js index cb356b3..82f65d4 100644 --- a/server/controller/CasoEspecial/nuevo.js +++ b/server/controller/CasoEspecial/nuevo.js @@ -1,5 +1,6 @@ -const validar = require('../../helper/validar'); -const drive = require('../../helper/drive'); +const helperPath = '../../helper'; +const drive = require(`${helperPath}/drive`); +const validar = require(`${helperPath}/validar`); const dbPath = '../../db/tablas'; const Carrera = require(`${dbPath}/Carrera`); const CasoEspecial = require(`${dbPath}/CasoEspecial`); diff --git a/server/controller/CasoEspecial/update.js b/server/controller/CasoEspecial/update.js index c55f96a..213678f 100644 --- a/server/controller/CasoEspecial/update.js +++ b/server/controller/CasoEspecial/update.js @@ -41,7 +41,7 @@ const update = async (body) => { 'El texto motivo.', 1 ); - if (validar.isObjectEmpty(dataUpdate)) + if (validar.validarObjetoVacio(dataUpdate)) throw new Error( 'No se envio nada para actualizar este Caso Especial.' ); diff --git a/server/controller/CuestionarioAlumno/get.js b/server/controller/CuestionarioAlumno/get.js index 6d32567..e93ce54 100644 --- a/server/controller/CuestionarioAlumno/get.js +++ b/server/controller/CuestionarioAlumno/get.js @@ -1,7 +1,8 @@ -const fs = require('fs'); const { convertArrayToCSV } = require('convert-array-to-csv'); const { Op } = require('sequelize'); -const validar = require('../../helper/validar'); +const helperPath = '../../helper'; +const helper = require(`${helperPath}/helper`); +const { validarNumero } = require(`${helperPath}/validar`); const dbPath = '../../db/tablas'; const CuestionarioAlumno = require(`${dbPath}/CuestionarioAlumno`); const Programa = require(`${dbPath}/Programa`); @@ -9,7 +10,7 @@ const Servicio = require(`${dbPath}/Servicio`); const Usuario = require(`${dbPath}/Usuario`); const get = async (body) => { - const year = validar.validarNumero(body.year, 4); + const year = validarNumero(body.year, 4); const path = `server/uploads/${year}_cuestionario_alumno.csv`; const data = []; @@ -67,10 +68,10 @@ const get = async (body) => { p30: res[i].CuestionarioAlumno.p30, createdAt: res[i].CuestionarioAlumno.createdAt, }); - await validar.eliminarArchivo(path).catch((err) => { + await helper.eliminarArchivo(path).catch((err) => { console.log(err); }); - return validar.crearArchivo(path, convertArrayToCSV(data)); + return helper.crearArchivo(path, convertArrayToCSV(data)); }) .then((res) => { return path; diff --git a/server/controller/CuestionarioPrograma/get.js b/server/controller/CuestionarioPrograma/get.js index 18fb2f4..ec3366f 100644 --- a/server/controller/CuestionarioPrograma/get.js +++ b/server/controller/CuestionarioPrograma/get.js @@ -1,7 +1,9 @@ const fs = require('fs'); const { convertArrayToCSV } = require('convert-array-to-csv'); const { Op } = require('sequelize'); -const validar = require('../../helper/validar'); +const helperPath = '../../helper'; +const helper = require(`${helperPath}/helper`); +const { validarNumero } = require(`${helperPath}/validar`); const dbPath = '../../db/tablas'; const CuestionarioPrograma = require(`${dbPath}/CuestionarioPrograma`); const Servicio = require(`${dbPath}/Servicio`); @@ -9,7 +11,7 @@ const Programa = require(`${dbPath}/Programa`); const Usuario = require(`${dbPath}/Usuario`); const get = async (body) => { - const year = validar.validarNumero(body.year, 4); + const year = validarNumero(body.year, 4); const path = `server/uploads/${year}_cuestionario_programa.csv`; const data = []; @@ -43,10 +45,10 @@ const get = async (body) => { p7: res[i].CuestionarioPrograma.p7, createdAt: res[i].CuestionarioPrograma.createdAt, }); - await validar.eliminarArchivo(path).catch((err) => { + await helper.eliminarArchivo(path).catch((err) => { console.log(err); }); - return validar.crearArchivo(path, convertArrayToCSV(data)); + return helper.crearArchivo(path, convertArrayToCSV(data)); }) .then((res) => { return path; diff --git a/server/controller/Programa/cargaMasiva.js b/server/controller/Programa/cargaMasiva.js index d3ffe51..a5767f2 100644 --- a/server/controller/Programa/cargaMasiva.js +++ b/server/controller/Programa/cargaMasiva.js @@ -1,11 +1,11 @@ const fs = require('fs'); -const moment = require('moment'); const csv = require('csvtojson'); +const moment = require('moment'); const helperPath = '../../helper'; -const gmail = require(`${helperPath}/gmail`); const correos = require(`${helperPath}/correos`); const encriptar = require(`${helperPath}/encriptar`); -const validar = require(`${helperPath}/validar`); +const gmail = require(`${helperPath}/gmail`); +const { validarCorreo } = require(`${helperPath}/validar`); const dbPath = '../../db/tablas'; const Programa = require(`${dbPath}/Programa`); const Usuario = require(`${dbPath}/Usuario`); @@ -34,7 +34,7 @@ const cargaMasiva = async (file) => { continue; } try { - validar.validarCorreo(programas[i].correo); + validarCorreo(programas[i].correo); } catch (err) { console.log(err); mensaje += 'Esta linea contiene un correo no valido.\n\n'; diff --git a/server/controller/Programa/programasAdmin.js b/server/controller/Programa/programasAdmin.js index b0fe14a..b181a73 100644 --- a/server/controller/Programa/programasAdmin.js +++ b/server/controller/Programa/programasAdmin.js @@ -1,10 +1,10 @@ -const validar = require('../../helper/validar'); +const { validarId } = require('../../helper/validar'); const dbPath = '../../db/tablas'; const Programa = require(`${dbPath}/Programa`); const Usuario = require(`${dbPath}/Usuario`); const programasAdmin = async (body) => { - const idUsuario = validar.validarId(body.idUsuario); + const idUsuario = validarId(body.idUsuario); return Usuario.findOne({ where: { idUsuario }, diff --git a/server/controller/Programa/programasResponsable.js b/server/controller/Programa/programasResponsable.js index 71e9855..b602cf1 100644 --- a/server/controller/Programa/programasResponsable.js +++ b/server/controller/Programa/programasResponsable.js @@ -1,10 +1,10 @@ -const validar = require('../../helper/validar'); +const { validarId } = require('../../helper/validar'); const dbPath = '../../db/tablas'; const Programa = require(`${dbPath}/Programa`); const Usuario = require(`${dbPath}/Usuario`); const programasResponsable = async (body) => { - const idUsuario = validar.validarId(body.idUsuario); + const idUsuario = validarId(body.idUsuario); return Usuario.findOne({ where: { idUsuario }, diff --git a/server/controller/Servicio/admin.js b/server/controller/Servicio/admin.js index 4a40624..c9227e2 100644 --- a/server/controller/Servicio/admin.js +++ b/server/controller/Servicio/admin.js @@ -1,4 +1,4 @@ -const validar = require('../../helper/validar'); +const { validarId } = require('../../helper/validar'); const dbPath = '../../db/tablas'; const Carrera = require(`${dbPath}/Carrera`); const Programa = require(`${dbPath}/Programa`); @@ -8,7 +8,7 @@ const TipoUsuario = require(`${dbPath}/TipoUsuario`); const Usuario = require(`${dbPath}/Usuario`); const admin = async (body) => { - const idServicio = validar.validarId(body.idServicio); + const idServicio = validarId(body.idServicio); return Servicio.findOne({ where: { idServicio }, diff --git a/server/controller/Servicio/alumno.js b/server/controller/Servicio/alumno.js index 292ac27..11866bd 100644 --- a/server/controller/Servicio/alumno.js +++ b/server/controller/Servicio/alumno.js @@ -1,5 +1,5 @@ const { Op } = require('sequelize'); -const validar = require('../../helper/validar'); +const { validarId } = require('../../helper/validar'); const dbPath = '../../db/tablas'; const Carrera = require(`${dbPath}/Carrera`); const Programa = require(`${dbPath}/Programa`); @@ -8,7 +8,7 @@ const Status = require(`${dbPath}/Status`); const Usuario = require(`${dbPath}/Usuario`); const alumno = async (body) => { - let idUsuario = validar.validarId(body.idUsuario); + let idUsuario = validarId(body.idUsuario); return Usuario.findOne({ where: { idUsuario } }) .then((res) => { diff --git a/server/controller/Servicio/cancelar.js b/server/controller/Servicio/cancelar.js index d503a11..3bdceed 100644 --- a/server/controller/Servicio/cancelar.js +++ b/server/controller/Servicio/cancelar.js @@ -1,7 +1,7 @@ const helperPath = '../../helper'; -const validar = require(`${helperPath}/validar`); -const gmail = require(`${helperPath}/gmail`); const correos = require(`${helperPath}/correos`); +const gmail = require(`${helperPath}/gmail`); +const validar = require(`${helperPath}/validar`); const dbPath = '../../db/tablas'; const Programa = require(`${dbPath}/Programa`); const Servicio = require(`${dbPath}/Servicio`); diff --git a/server/controller/Servicio/cartaAceptacion.js b/server/controller/Servicio/cartaAceptacion.js index c2ee64d..ee93ba3 100644 --- a/server/controller/Servicio/cartaAceptacion.js +++ b/server/controller/Servicio/cartaAceptacion.js @@ -1,6 +1,6 @@ const helperPath = '../../helper'; -const validar = require(`${helperPath}/validar`); const drive = require(`${helperPath}/drive`); +const validar = require(`${helperPath}/validar`); const Servicio = require('../../db/tablas/Servicio'); const cartaTermino = async (body, file) => { diff --git a/server/controller/Servicio/cartaTermino.js b/server/controller/Servicio/cartaTermino.js index e27ad14..e30b238 100644 --- a/server/controller/Servicio/cartaTermino.js +++ b/server/controller/Servicio/cartaTermino.js @@ -1,6 +1,6 @@ const helperPath = '../../helper'; -const validar = require(`${helperPath}/validar`); const drive = require(`${helperPath}/drive`); +const validar = require(`${helperPath}/validar`); const Servicio = require('../../db/tablas/Servicio'); const cartaTermino = async (body, file) => { diff --git a/server/controller/Servicio/gustavoBazPrada.js b/server/controller/Servicio/gustavoBazPrada.js index 82c26dc..dbda0c3 100644 --- a/server/controller/Servicio/gustavoBazPrada.js +++ b/server/controller/Servicio/gustavoBazPrada.js @@ -1,8 +1,9 @@ -const fs = require('fs'); const moment = require('moment'); const { convertArrayToCSV } = require('convert-array-to-csv'); const { Op } = require('sequelize'); -const validar = require('../../helper/validar'); +const helperPath = '../../helper'; +const helper = require(`${helperPath}/helper`); +const validar = require(`${helperPath}/validar`); const dbPath = '../../db/tablas'; const Carrera = require(`${dbPath}/Carrera`); const Servicio = require(`${dbPath}/Servicio`); @@ -32,12 +33,12 @@ const gustavoBazPrada = async (body) => { nombre: res[i].Usuario.nombre, licenciatura: res[i].Carrera.carrera, correo: res[i].correo, - fechaLiberacion: validar.crearDDMMAAAA(res[i].fechaLiberacion), + fechaLiberacion: helper.crearDDMMAAAA(res[i].fechaLiberacion), }); - await validar.eliminarArchivo(path).catch((err) => { + await helper.eliminarArchivo(path).catch((err) => { console.log(err); }); - return validar.crearArchivo(path, convertArrayToCSV(data)); + return helper.crearArchivo(path, convertArrayToCSV(data)); }) .then((res) => { return path; diff --git a/server/controller/Servicio/informeGlobal.js b/server/controller/Servicio/informeGlobal.js index 9443122..dbcf654 100644 --- a/server/controller/Servicio/informeGlobal.js +++ b/server/controller/Servicio/informeGlobal.js @@ -1,6 +1,6 @@ const helperPath = '../../helper'; -const validar = require(`${helperPath}/validar`); const drive = require(`${helperPath}/drive`); +const validar = require(`${helperPath}/validar`); const Servicio = require('../../db/tablas/Servicio'); const informeGlobal = async (body, file) => { diff --git a/server/controller/Servicio/liberacion.js b/server/controller/Servicio/liberacion.js index ad01cde..8fbd2cc 100644 --- a/server/controller/Servicio/liberacion.js +++ b/server/controller/Servicio/liberacion.js @@ -1,8 +1,8 @@ const moment = require('moment'); const helperPath = '../../helper'; -const validar = require(`${helperPath}/validar`); -const gmail = require(`${helperPath}/gmail`); const correos = require(`${helperPath}/correos`); +const gmail = require(`${helperPath}/gmail`); +const validar = require(`${helperPath}/validar`); const dbPath = '../../db/tablas'; const Programa = require(`${dbPath}/Programa`); const Servicio = require(`${dbPath}/Servicio`); diff --git a/server/controller/Servicio/nuevo.js b/server/controller/Servicio/nuevo.js index d98f8da..3360de3 100644 --- a/server/controller/Servicio/nuevo.js +++ b/server/controller/Servicio/nuevo.js @@ -1,7 +1,7 @@ const { Op } = require('sequelize'); const helperPath = '../../helper'; -const validar = require(`${helperPath}/validar`); const drive = require(`${helperPath}/drive`); +const validar = require(`${helperPath}/validar`); const dbPath = '../../db/tablas'; const Carrera = require(`${dbPath}/Carrera`); const Programa = require(`${dbPath}/Programa`); diff --git a/server/controller/Servicio/rechazarAceptacion.js b/server/controller/Servicio/rechazarAceptacion.js index 764471e..99d7521 100644 --- a/server/controller/Servicio/rechazarAceptacion.js +++ b/server/controller/Servicio/rechazarAceptacion.js @@ -1,7 +1,7 @@ const helperPath = '../../helper'; -const validar = require(`${helperPath}/validar`); -const gmail = require(`${helperPath}/gmail`); const correos = require(`${helperPath}/correos`); +const gmail = require(`${helperPath}/gmail`); +const validar = require(`${helperPath}/validar`); const dbPath = '../../db/tablas'; const Programa = require(`${dbPath}/Programa`); const Servicio = require(`${dbPath}/Servicio`); diff --git a/server/controller/Servicio/rechazarInforme.js b/server/controller/Servicio/rechazarInforme.js index 04022d3..a36bf06 100644 --- a/server/controller/Servicio/rechazarInforme.js +++ b/server/controller/Servicio/rechazarInforme.js @@ -1,7 +1,7 @@ const helperPath = '../../helper'; -const validar = require(`${helperPath}/validar`); -const gmail = require(`${helperPath}/gmail`); const correos = require(`${helperPath}/correos`); +const gmail = require(`${helperPath}/gmail`); +const validar = require(`${helperPath}/validar`); const dbPath = '../../db/tablas'; const Programa = require(`${dbPath}/Programa`); const Servicio = require(`${dbPath}/Servicio`); diff --git a/server/controller/Servicio/rechazarTermino.js b/server/controller/Servicio/rechazarTermino.js index ee25eec..c6fb084 100644 --- a/server/controller/Servicio/rechazarTermino.js +++ b/server/controller/Servicio/rechazarTermino.js @@ -1,7 +1,7 @@ const helperPath = '../../helper'; -const validar = require(`${helperPath}/validar`); -const gmail = require(`${helperPath}/gmail`); const correos = require(`${helperPath}/correos`); +const gmail = require(`${helperPath}/gmail`); +const validar = require(`${helperPath}/validar`); const dbPath = '../../db/tablas'; const Programa = require(`${dbPath}/Programa`); const Servicio = require(`${dbPath}/Servicio`); diff --git a/server/controller/Servicio/registro.js b/server/controller/Servicio/registro.js index 51fb385..6f84032 100644 --- a/server/controller/Servicio/registro.js +++ b/server/controller/Servicio/registro.js @@ -1,8 +1,8 @@ const helperPath = '../../helper'; -const validar = require(`${helperPath}/validar`); +const correos = require(`${helperPath}/correos`); const encriptar = require(`${helperPath}/encriptar`); const gmail = require(`${helperPath}/gmail`); -const correos = require(`${helperPath}/correos`); +const validar = require(`${helperPath}/validar`); const dbPath = '../../db/tablas'; const Servicio = require(`${dbPath}/Servicio`); const Usuario = require(`${dbPath}/Usuario`); diff --git a/server/controller/Servicio/registroValidado.js b/server/controller/Servicio/registroValidado.js index b6b0217..f90c61e 100644 --- a/server/controller/Servicio/registroValidado.js +++ b/server/controller/Servicio/registroValidado.js @@ -1,7 +1,7 @@ const helperPath = '../../helper'; -const validar = require(`${helperPath}/validar`); -const gmail = require(`${helperPath}/gmail`); const correos = require(`${helperPath}/correos`); +const gmail = require(`${helperPath}/gmail`); +const validar = require(`${helperPath}/validar`); const dbPath = '../../db/tablas'; const Programa = require(`${dbPath}/Programa`); const Servicio = require(`${dbPath}/Servicio`); diff --git a/server/controller/Servicio/reporte.js b/server/controller/Servicio/reporte.js index e2889cd..39e3dec 100644 --- a/server/controller/Servicio/reporte.js +++ b/server/controller/Servicio/reporte.js @@ -1,7 +1,8 @@ -const fs = require('fs'); const { convertArrayToCSV } = require('convert-array-to-csv'); const { Op } = require('sequelize'); -const validar = require('../../helper/validar'); +const helperPath = '../../helper'; +const helper = require(`${helperPath}/helper`); +const { validarFecha } = require(`${helperPath}/validar`); const dbPath = '../../db/tablas'; const Carrera = require(`${dbPath}/Carrera`); const Programa = require(`${dbPath}/Programa`); @@ -10,8 +11,8 @@ const Status = require(`${dbPath}/Status`); const Usuario = require(`${dbPath}/Usuario`); const reporte = async (body) => { - const inicio = validar.validarFecha(body.inicio); - const fin = validar.validarFecha(body.fin); + const inicio = validarFecha(body.inicio); + const fin = validarFecha(body.fin); const path = `server/uploads/reporte.csv`; const data = []; @@ -37,9 +38,9 @@ const reporte = async (body) => { nombre: res[i].Usuario.nombre, licenciatura: res[i].Carrera.carrera, correo: res[i].correo, - fechaInicio: validar.crearDDMMAAAA(res[i].fechaInicio), - fechaFin: validar.crearDDMMAAAA(res[i].fechaFin), - fechaLiberacion: validar.crearDDMMAAAA(res[i].fechaLiberacion), + fechaInicio: helper.crearDDMMAAAA(res[i].fechaInicio), + fechaFin: helper.crearDDMMAAAA(res[i].fechaFin), + fechaLiberacion: helper.crearDDMMAAAA(res[i].fechaLiberacion), institucion: res[i].Programa.institucion, dependencia: res[i].Programa.dependencia, programa: res[i].Programa.programa, @@ -47,10 +48,10 @@ const reporte = async (body) => { clave: res[i].Programa.clavePrograma, status: res[i].Status.status, }); - await validar.eliminarArchivo(path).catch((err) => { + await helper.eliminarArchivo(path).catch((err) => { console.log(err); }); - return validar.crearArchivo(path, convertArrayToCSV(data)); + return helper.crearArchivo(path, convertArrayToCSV(data)); }) .then((res) => { return path; diff --git a/server/controller/Servicio/update.js b/server/controller/Servicio/update.js index a75c4df..32d7e3a 100644 --- a/server/controller/Servicio/update.js +++ b/server/controller/Servicio/update.js @@ -1,6 +1,6 @@ const helperPath = '../../helper'; -const validar = require(`${helperPath}/validar`); const drive = require(`${helperPath}/drive`); +const validar = require(`${helperPath}/validar`); const Servicio = require('../../db/tablas/Servicio'); const update = async (body, files) => { @@ -52,7 +52,7 @@ const update = async (body, files) => { ); if (body.telefono) dataUpdate.telefono = validar.validarNumero(body.telefono, 15); - if (validar.isObjectEmpty(dataUpdate)) + if (validar.validarObjetoVacio(dataUpdate)) throw new Error( 'No se envio nada para actualizar este Servicio Social' ); diff --git a/server/controller/Usuario/escolares.js b/server/controller/Usuario/escolares.js index c4b9f9b..ea04b1b 100644 --- a/server/controller/Usuario/escolares.js +++ b/server/controller/Usuario/escolares.js @@ -1,12 +1,12 @@ require('../../config/config'); const axios = require('axios'); -const validar = require('../../helper/validar'); +const { validarNumeroCuenta } = require('../../helper/validar'); const dbPath = '../../db/tablas'; const Usuario = require(`${dbPath}/Usuario`); const Carrera = require(`${dbPath}/Carrera`); const escolares = async (body) => { - const numeroCuenta = validar.validarNumeroCuenta(body.numeroCuenta); + const numeroCuenta = validarNumeroCuenta(body.numeroCuenta); let alumno; return axios({ diff --git a/server/controller/Usuario/newPasswordAlumno.js b/server/controller/Usuario/newPasswordAlumno.js index bc09e59..932aa1e 100644 --- a/server/controller/Usuario/newPasswordAlumno.js +++ b/server/controller/Usuario/newPasswordAlumno.js @@ -1,5 +1,5 @@ const helperPath = '../../helper'; -const validar = require(`${helperPath}/validar`); +const { validarId } = require(`${helperPath}/validar`); const gmail = require(`${helperPath}/gmail`); const correos = require(`${helperPath}/correos`); const encriptar = require(`${helperPath}/encriptar`); @@ -8,7 +8,7 @@ const Usuario = require(`${dbPath}/Usuario`); const Servicio = require(`${dbPath}/Servicio`); const newPasswordAlumno = async (body) => { - const idServicio = validar.validarId(body.idServicio); + const idServicio = validarId(body.idServicio); const password = encriptar.generarPassword(); let idUsuario; let correo = {}; diff --git a/server/controller/Usuario/newPasswordResponsable.js b/server/controller/Usuario/newPasswordResponsable.js index e5cb551..2a7a86c 100644 --- a/server/controller/Usuario/newPasswordResponsable.js +++ b/server/controller/Usuario/newPasswordResponsable.js @@ -1,12 +1,12 @@ const helperPath = '../../helper'; -const validar = require(`${helperPath}/validar`); +const { validarId } = require(`${helperPath}/validar`); const gmail = require(`${helperPath}/gmail`); const correos = require(`${helperPath}/correos`); const encriptar = require(`${helperPath}/encriptar`); const Usuario = require('../../db/tablas/Usuario'); const newPasswordResponsable = async (body) => { - const idUsuario = await validar.validarId(body.idUsuario); + const idUsuario = await validarId(body.idUsuario); const password = encriptar.generarPassword(); let correo = {}; diff --git a/server/controller/Usuario/responsableUpdate.js b/server/controller/Usuario/responsableUpdate.js index cbc6535..cdfbfec 100644 --- a/server/controller/Usuario/responsableUpdate.js +++ b/server/controller/Usuario/responsableUpdate.js @@ -26,7 +26,7 @@ const responsableUpdate = async (body) => { if (body.nombre) dataUpdate.nombre = validar.validarTexto(body.nombre, 'el nombre', 70); - if (validar.isObjectEmpty(dataUpdate)) + if (validar.validarObjetoVacio(dataUpdate)) throw new Error('No se a envio nada para actualizar.'); return Usuario.update(dataUpdate, { where: { idUsuario } }); }) diff --git a/server/helper/helper.js b/server/helper/helper.js new file mode 100644 index 0000000..f269aa5 --- /dev/null +++ b/server/helper/helper.js @@ -0,0 +1,37 @@ +const fs = require('fs'); +const moment = require('moment'); + +const crearDDMMAAAA = (date) => { + const fechaMoment = moment(date); + let ddmmaaaa = ''; + + if (fechaMoment.isValid()) + ddmmaaaa = `${fechaMoment.date()}/${ + fechaMoment.month() + 1 + }/${fechaMoment.year()}`; + return ddmmaaaa; +}; + +const eliminarArchivo = (path) => { + return new Promise((resolve, reject) => { + fs.unlink(path, (err) => { + if (err) reject(err); + resolve({ message: 'Se elimino el archivo correctamente.' }); + }); + }); +}; + +const crearArchivo = (path, texto) => { + return new Promise((resolve, reject) => { + fs.appendFile(path, texto, (err) => { + if (err) reject(err); + resolve({ message: 'Se creo el archivo correctamente.' }); + }); + }); +}; + +module.exports = { + crearDDMMAAAA, + eliminarArchivo, + crearArchivo, +}; diff --git a/server/helper/validar.js b/server/helper/validar.js index db4b1a9..54ca01b 100644 --- a/server/helper/validar.js +++ b/server/helper/validar.js @@ -1,4 +1,4 @@ -const fs = require('fs'); +// const fs = require('fs'); const moment = require('moment'); const validator = require('validator'); const Servicio = require('../db/tablas/Servicio'); @@ -144,42 +144,13 @@ const validarAccesibilidad = (usuariosValidos = [], idTipoUsuario) => { throw new Error('Este usuario no tiene permitido usar esta linea de la API.'); }; -const isObjectEmpty = (obj) => { +const validarObjetoVacio = (obj) => { for (let key in obj) { if (obj.hasOwnProperty(key)) return false; } return true; }; -const crearDDMMAAAA = (date) => { - const fechaMoment = moment(date); - let ddmmaaaa = ''; - - if (fechaMoment.isValid()) - ddmmaaaa = `${fechaMoment.date()}/${ - fechaMoment.month() + 1 - }/${fechaMoment.year()}`; - return ddmmaaaa; -}; - -const eliminarArchivo = (path) => { - return new Promise((resolve, reject) => { - fs.unlink(path, (err) => { - if (err) reject(err); - resolve({ message: 'Se elimino el archivo correctamente.' }); - }); - }); -}; - -const crearArchivo = (path, texto) => { - return new Promise((resolve, reject) => { - fs.appendFile(path, texto, (err) => { - if (err) reject(err); - resolve({ message: 'Se creo el archivo correctamente.' }); - }); - }); -}; - module.exports = { validar, noValido, @@ -194,8 +165,5 @@ module.exports = { validarNumero, validarPreTermino, validarAccesibilidad, - isObjectEmpty, - crearDDMMAAAA, - eliminarArchivo, - crearArchivo, + validarObjetoVacio, }; diff --git a/server/routes/CasoEspecial.js b/server/routes/CasoEspecial.js index 4db1f99..b393b7b 100644 --- a/server/routes/CasoEspecial.js +++ b/server/routes/CasoEspecial.js @@ -1,21 +1,18 @@ -const fs = require('fs'); const express = require('express'); const multer = require('multer'); const app = express(); const upload = multer({ dest: 'server/uploads' }); const { verificaToken } = require('../middleware/autentificacion'); +const { eliminarArchivo } = require('../helper/helper'); const route = '/caso_especial'; const controllerPath = '../controller/CasoEspecial'; -const nuevo = require(`${controllerPath}/nuevo`); -const serviciosEspeciales = require(`${controllerPath}/serviciosEspeciales`); const casoEspecial = require(`${controllerPath}/casoEspecial`); const liberacion = require(`${controllerPath}/liberacion`); +const nuevo = require(`${controllerPath}/nuevo`); +const serviciosEspeciales = require(`${controllerPath}/serviciosEspeciales`); const update = require(`${controllerPath}/update`); -const eliminarArchivo = (filename) => { - fs.unlinkSync(`./server/uploads/${filename}`); -}; - +// POST app.post( `${route}/nuevo`, // verificaToken, @@ -32,16 +29,7 @@ app.post( } ); -app.get(`${route}/servicios_especiales`, verificaToken, (req, res) => { - return serviciosEspeciales(req.query) - .then((data) => { - res.status(200).json(data); - }) - .catch((err) => { - res.status(400).json({ message: err.message }); - }); -}); - +// GET app.get(`${route}`, verificaToken, (req, res) => { return casoEspecial(req.query) .then((data) => { @@ -52,6 +40,17 @@ app.get(`${route}`, verificaToken, (req, res) => { }); }); +app.get(`${route}/servicios_especiales`, verificaToken, (req, res) => { + return serviciosEspeciales(req.query) + .then((data) => { + res.status(200).json(data); + }) + .catch((err) => { + res.status(400).json({ message: err.message }); + }); +}); + +// PUT app.put(`${route}/liberacion`, verificaToken, (req, res) => { return liberacion(req.body) .then((data) => { diff --git a/server/routes/CuestionarioAlumno.js b/server/routes/CuestionarioAlumno.js index 11c84b6..764bb4a 100644 --- a/server/routes/CuestionarioAlumno.js +++ b/server/routes/CuestionarioAlumno.js @@ -3,9 +3,10 @@ const app = express(); const { verificaToken } = require('../middleware/autentificacion'); const route = '/cuestionario_alumno'; const controllerPath = '../controller/CuestionarioAlumno'; -const nuevo = require(`${controllerPath}/nuevo`); const get = require(`${controllerPath}/get`); +const nuevo = require(`${controllerPath}/nuevo`); +// POST app.post(`${route}`, verificaToken, (req, res) => { return nuevo(req.body) .then((data) => { @@ -16,6 +17,7 @@ app.post(`${route}`, verificaToken, (req, res) => { }); }); +// GET app.get(`${route}`, verificaToken, (req, res) => { return get(req.query) .then((data) => { diff --git a/server/routes/CuestionarioPrograma.js b/server/routes/CuestionarioPrograma.js index 16f5a1f..7183d54 100644 --- a/server/routes/CuestionarioPrograma.js +++ b/server/routes/CuestionarioPrograma.js @@ -3,9 +3,10 @@ const app = express(); const { verificaToken } = require('../middleware/autentificacion'); const route = '/cuestionario_programa'; const controllerPath = '../controller/CuestionarioPrograma'; -const nuevo = require(`${controllerPath}/nuevo`); const get = require(`${controllerPath}/get`); +const nuevo = require(`${controllerPath}/nuevo`); +// POST app.post(`${route}`, verificaToken, (req, res) => { return nuevo(req.body) .then((data) => { @@ -16,6 +17,7 @@ app.post(`${route}`, verificaToken, (req, res) => { }); }); +// GET app.get(`${route}`, verificaToken, (req, res) => { return get(req.query) .then((data) => { diff --git a/server/routes/Programa.js b/server/routes/Programa.js index e0595d8..469fcb0 100644 --- a/server/routes/Programa.js +++ b/server/routes/Programa.js @@ -5,30 +5,11 @@ const upload = multer({ dest: 'server/uploads' }); const { verificaToken } = require('../middleware/autentificacion'); const route = '/programa'; const controllerPath = '../controller/Programa'; -const programasResponsable = require(`${controllerPath}/programasResponsable`); -const programasAdmin = require(`${controllerPath}/programasAdmin`); const cargaMasiva = require(`${controllerPath}/cargaMasiva`); +const programasAdmin = require(`${controllerPath}/programasAdmin`); +const programasResponsable = require(`${controllerPath}/programasResponsable`); -app.get(`${route}/programas_responsable`, verificaToken, (req, res) => { - return programasResponsable(req.query) - .then((data) => { - res.status(200).json(data); - }) - .catch((err) => { - res.status(400).json({ message: err.message }); - }); -}); - -app.get(`${route}/programas_admin`, verificaToken, (req, res) => { - return programasAdmin(req.query) - .then((data) => { - res.status(200).json(data); - }) - .catch((err) => { - res.status(400).json({ message: err.message }); - }); -}); - +// POST app.post( `${route}/carga_masiva`, // verificaToken, @@ -49,4 +30,25 @@ app.post( } ); +// GET +app.get(`${route}/programas_admin`, verificaToken, (req, res) => { + return programasAdmin(req.query) + .then((data) => { + res.status(200).json(data); + }) + .catch((err) => { + res.status(400).json({ message: err.message }); + }); +}); + +app.get(`${route}/programas_responsable`, verificaToken, (req, res) => { + return programasResponsable(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/Servicio.js b/server/routes/Servicio.js index 11d4a0e..217155b 100644 --- a/server/routes/Servicio.js +++ b/server/routes/Servicio.js @@ -1,9 +1,9 @@ -const fs = require('fs'); const express = require('express'); const multer = require('multer'); const app = express(); const upload = multer({ dest: 'server/uploads' }); const { verificaToken } = require('../middleware/autentificacion'); +const { eliminarArchivo } = require('../helper/helper'); const route = '/servicio'; const controllerPath = '../controller/Servicio'; const nuevo = require(`${controllerPath}/nuevo`); @@ -25,10 +25,7 @@ const update = require(`${controllerPath}/update`); const reporte = require(`${controllerPath}/reporte`); const gustavoBazPrada = require(`${controllerPath}/gustavoBazPrada`); -const eliminarArchivo = (filename) => { - fs.unlinkSync(`./server/uploads/${filename}`); -}; - +// POST app.post( `${route}/nuevo`, // verificaToken, @@ -45,6 +42,47 @@ app.post( } ); +// GET +app.get(`${route}/admin`, verificaToken, (req, res) => { + return admin(req.query) + .then((data) => { + res.status(200).json(data); + }) + .catch((err) => { + res.status(400).json({ message: err.message }); + }); +}); + +app.get(`${route}/alumno`, verificaToken, (req, res) => { + return alumno(req.query) + .then((data) => { + res.status(200).json(data); + }) + .catch((err) => { + res.status(400).json({ message: err.message }); + }); +}); + +app.get(`${route}/gustavo_baz_prada`, verificaToken, (req, res) => { + return gustavoBazPrada(req.query) + .then((data) => { + res.download(data); + }) + .catch((err) => { + res.status(400).json({ message: err.message }); + }); +}); + +app.get(`${route}/reporte`, verificaToken, (req, res) => { + return reporte(req.query) + .then((data) => { + res.download(data); + }) + .catch((err) => { + res.status(400).json({ message: err.message }); + }); +}); + app.get(`${route}/servicios_admin`, verificaToken, (req, res) => { return serviciosAdmin(req.query) .then((data) => { @@ -65,46 +103,7 @@ app.get(`${route}/servicios_responsable`, verificaToken, (req, res) => { }); }); -app.get(`${route}/admin`, verificaToken, (req, res) => { - return admin(req.query) - .then((data) => { - res.status(200).json(data); - }) - .catch((err) => { - res.status(400).json({ message: err.message }); - }); -}); - -app.get(`${route}/alumno`, verificaToken, (req, res) => { - return alumno(req.query) - .then((data) => { - res.status(200).json(data); - }) - .catch((err) => { - res.status(400).json({ message: err.message }); - }); -}); - -app.get(`${route}/reporte`, verificaToken, (req, res) => { - return reporte(req.query) - .then((data) => { - res.download(data); - }) - .catch((err) => { - res.status(400).json({ message: err.message }); - }); -}); - -app.get(`${route}/gustavo_baz_prada`, verificaToken, (req, res) => { - return gustavoBazPrada(req.query) - .then((data) => { - res.download(data); - }) - .catch((err) => { - res.status(400).json({ message: err.message }); - }); -}); - +// PUT app.put(`${route}/cancelar`, verificaToken, (req, res) => { return cancelar(req.body) .then((data) => { @@ -115,26 +114,6 @@ app.put(`${route}/cancelar`, verificaToken, (req, res) => { }); }); -app.put(`${route}/registro`, verificaToken, (req, res) => { - return registro(req.body) - .then((data) => { - res.status(200).json(data); - }) - .catch((err) => { - res.status(400).json({ message: err.message }); - }); -}); - -app.put(`${route}/registro_validado`, verificaToken, (req, res) => { - return registroValidado(req.body) - .then((data) => { - res.status(200).json(data); - }) - .catch((err) => { - res.status(400).json({ message: err.message }); - }); -}); - app.put( `${route}/carta_aceptacion`, // verificaToken, @@ -193,6 +172,26 @@ app.put(`${route}/liberacion`, verificaToken, (req, res) => { }); }); +app.put(`${route}/registro`, verificaToken, (req, res) => { + return registro(req.body) + .then((data) => { + res.status(200).json(data); + }) + .catch((err) => { + res.status(400).json({ message: err.message }); + }); +}); + +app.put(`${route}/registro_validado`, verificaToken, (req, res) => { + return registroValidado(req.body) + .then((data) => { + res.status(200).json(data); + }) + .catch((err) => { + res.status(400).json({ message: err.message }); + }); +}); + app.put(`${route}/rechazar_aceptacion`, verificaToken, (req, res) => { return rechazarAceptacion(req.body) .then((data) => { @@ -203,8 +202,8 @@ app.put(`${route}/rechazar_aceptacion`, verificaToken, (req, res) => { }); }); -app.put(`${route}/rechazar_termino`, verificaToken, (req, res) => { - return rechazarTermino(req.body) +app.put(`${route}/rechazar_informe`, verificaToken, (req, res) => { + return rechazarInforme(req.body) .then((data) => { res.status(200).json(data); }) @@ -213,8 +212,8 @@ app.put(`${route}/rechazar_termino`, verificaToken, (req, res) => { }); }); -app.put(`${route}/rechazar_informe`, verificaToken, (req, res) => { - return rechazarInforme(req.body) +app.put(`${route}/rechazar_termino`, verificaToken, (req, res) => { + return rechazarTermino(req.body) .then((data) => { res.status(200).json(data); }) diff --git a/server/routes/Usuario.js b/server/routes/Usuario.js index 0581268..7ed175c 100644 --- a/server/routes/Usuario.js +++ b/server/routes/Usuario.js @@ -5,11 +5,12 @@ const route = '/usuario'; const controllerPath = '../controller/Usuario'; const escolares = require(`${controllerPath}/escolares`); const login = require(`${controllerPath}/login`); -const responsables = require(`${controllerPath}/responsables`); -const responsableUpdate = require(`${controllerPath}/responsableUpdate`); const newPasswordAlumno = require(`${controllerPath}/newPasswordAlumno`); const newPasswordResponsable = require(`${controllerPath}/newPasswordResponsable`); +const responsables = require(`${controllerPath}/responsables`); +const responsableUpdate = require(`${controllerPath}/responsableUpdate`); +// POST app.post(`${route}/login`, (req, res) => { return login(req.body) .then((data) => { @@ -20,6 +21,7 @@ app.post(`${route}/login`, (req, res) => { }); }); +// GET app.get(`${route}/escolares`, verificaToken, (req, res) => { return escolares(req.query) .then((data) => { @@ -40,16 +42,7 @@ app.get(`${route}/responsables`, verificaToken, (req, res) => { }); }); -app.put(`${route}/responsable/update`, verificaToken, (req, res) => { - return responsableUpdate(req.body) - .then((data) => { - res.status(200).json(data); - }) - .catch((err) => { - res.status(400).json({ message: err.message }); - }); -}); - +// PUT app.put(`${route}/new_password_alumno`, verificaToken, (req, res) => { return newPasswordAlumno(req.body) .then((data) => { @@ -70,4 +63,14 @@ app.put(`${route}/new_password_responsable`, verificaToken, (req, res) => { }); }); +app.put(`${route}/responsable/update`, verificaToken, (req, res) => { + return responsableUpdate(req.body) + .then((data) => { + res.status(200).json(data); + }) + .catch((err) => { + res.status(400).json({ message: err.message }); + }); +}); + module.exports = app; diff --git a/server/routes/index.js b/server/routes/index.js index 69195f8..69d782f 100644 --- a/server/routes/index.js +++ b/server/routes/index.js @@ -1,12 +1,12 @@ const express = require('express'); const app = express(); -app.use(require('./Status')); -app.use(require('./Usuario')); -app.use(require('./Servicio')); app.use(require('./CasoEspecial')); -app.use(require('./Programa')); app.use(require('./CuestionarioAlumno')); app.use(require('./CuestionarioPrograma')); +app.use(require('./Programa')); +app.use(require('./Servicio')); +app.use(require('./Status')); +app.use(require('./Usuario')); module.exports = app;