From 2c14d4ee0821c22200b2712a4ba8a643eae2aebd Mon Sep 17 00:00:00 2001
From: lemuel <lemuelhelonmarquezrosas@gmail.com>
Date: Sat, 23 Oct 2021 06:14:30 -0500
Subject: [PATCH] get alumno y horarios

---
 server/controller/Alumno/get.js  | 40 ++++++++++----------------------
 server/controller/Horario/get.js | 34 ++++-----------------------
 server/routes/Alumno.js          |  4 ++--
 server/routes/Horario.js         | 18 ++++++++++++++
 server/routes/index.js           |  3 ++-
 5 files changed, 39 insertions(+), 60 deletions(-)
 create mode 100644 server/routes/Horario.js

diff --git a/server/controller/Alumno/get.js b/server/controller/Alumno/get.js
index 3206592..2841135 100644
--- a/server/controller/Alumno/get.js
+++ b/server/controller/Alumno/get.js
@@ -1,35 +1,19 @@
 const { validarNumeroCuenta } = require('../../helper/validar');
 const dbPath = '../../db/tablas';
-// const Carrera = require(`${dbPath}/Carrera`);
-// const Grupo = require(`${dbPath}/Grupo`);
-// const Horario = require(`${dbPath}/Horario`);
-// const GrupoHorario = require(`${dbPath}/GrupoHorario`);
-// const TercerSemestre = require(`${dbPath}/TercerSemestre`);
+const Carrera = require(`${dbPath}/Carrera`);
+const Alumno = require(`${dbPath}/Alumno`);
 
 const get = async (body) => {
-  // const numeroCuenta = validarNumeroCuenta(body.numeroCuenta);
-  // let alumnoTercerSemestre = {};
-  // return TercerSemestre.findOne({
-  //   where: { numeroCuenta },
-  //   include: [{ model: Grupo, include: [{ model: Carrera }] }],
-  // })
-  //   .then((res) => {
-  //     if (!res) throw new Error('No existe esta alumno.');
-  //     if (res.deseaAsistir)
-  //       throw new Error('Ya se registro a este alumno al recorrido.');
-  //     alumnoTercerSemestre = res;
-  //     delete alumnoTercerSemestre.dataValues.idGrupo;
-  //     delete alumnoTercerSemestre.dataValues.Grupo.dataValues.idCarrera;
-  //     return GrupoHorario.findOne({
-  //       where: { idGrupo: alumnoTercerSemestre.Grupo.idGrupo },
-  //       include: [{ model: Horario }],
-  //     });
-  //   })
-  //   .then((res) => {
-  //     delete res.dataValues.idHorario;
-  //     delete res.dataValues.idGrupo;
-  //     return { alumnoTercerSemestre, GrupoHorario: res };
-  //   });
+  const numeroCuenta = validarNumeroCuenta(body.numeroCuenta);
+
+  return Alumno.findOne({
+    where: { numeroCuenta },
+    include: [{ model: Carrera }],
+  }).then((res) => {
+    if (!res) throw new Error('No existe este número de cuenta.');
+    delete res.idCarrera;
+    return res;
+  });
 };
 
 module.exports = get;
diff --git a/server/controller/Horario/get.js b/server/controller/Horario/get.js
index 3206592..bbea297 100644
--- a/server/controller/Horario/get.js
+++ b/server/controller/Horario/get.js
@@ -1,35 +1,11 @@
-const { validarNumeroCuenta } = require('../../helper/validar');
+const { validarTexto, validar } = require('../../helper/validar');
 const dbPath = '../../db/tablas';
-// const Carrera = require(`${dbPath}/Carrera`);
-// const Grupo = require(`${dbPath}/Grupo`);
-// const Horario = require(`${dbPath}/Horario`);
-// const GrupoHorario = require(`${dbPath}/GrupoHorario`);
-// const TercerSemestre = require(`${dbPath}/TercerSemestre`);
+const Horario = require(`${dbPath}/Horario`);
 
 const get = async (body) => {
-  // const numeroCuenta = validarNumeroCuenta(body.numeroCuenta);
-  // let alumnoTercerSemestre = {};
-  // return TercerSemestre.findOne({
-  //   where: { numeroCuenta },
-  //   include: [{ model: Grupo, include: [{ model: Carrera }] }],
-  // })
-  //   .then((res) => {
-  //     if (!res) throw new Error('No existe esta alumno.');
-  //     if (res.deseaAsistir)
-  //       throw new Error('Ya se registro a este alumno al recorrido.');
-  //     alumnoTercerSemestre = res;
-  //     delete alumnoTercerSemestre.dataValues.idGrupo;
-  //     delete alumnoTercerSemestre.dataValues.Grupo.dataValues.idCarrera;
-  //     return GrupoHorario.findOne({
-  //       where: { idGrupo: alumnoTercerSemestre.Grupo.idGrupo },
-  //       include: [{ model: Horario }],
-  //     });
-  //   })
-  //   .then((res) => {
-  //     delete res.dataValues.idHorario;
-  //     delete res.dataValues.idGrupo;
-  //     return { alumnoTercerSemestre, GrupoHorario: res };
-  //   });
+  const turno = validarTexto(body.turno, 'El turno', 1);
+
+  return Horario.findAll({ where: { turno } });
 };
 
 module.exports = get;
diff --git a/server/routes/Alumno.js b/server/routes/Alumno.js
index ba3183b..fb49ec8 100644
--- a/server/routes/Alumno.js
+++ b/server/routes/Alumno.js
@@ -1,7 +1,7 @@
 const express = require('express');
 const app = express();
-const route = '/tercer_semestre';
-const controllerPath = '../controller/TercerSemestre';
+const route = '/alumno';
+const controllerPath = '../controller/Alumno';
 const get = require(`${controllerPath}/get`);
 
 // GET
diff --git a/server/routes/Horario.js b/server/routes/Horario.js
new file mode 100644
index 0000000..2c4595d
--- /dev/null
+++ b/server/routes/Horario.js
@@ -0,0 +1,18 @@
+const express = require('express');
+const app = express();
+const route = '/horario';
+const controllerPath = '../controller/Horario';
+const get = require(`${controllerPath}/get`);
+
+// GET
+app.get(`${route}`, (req, res) => {
+  return get(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/index.js b/server/routes/index.js
index c4be554..f116fb5 100644
--- a/server/routes/index.js
+++ b/server/routes/index.js
@@ -2,6 +2,7 @@ const express = require('express');
 const app = express();
 
 app.use(require('./Alumno'));
-app.use(require('./AlumnoHorario'));
+// app.use(require('./AlumnoHorario'));
+app.use(require('./Horario'));
 
 module.exports = app;