From 5df8e9e00daa05305ddc4717c1c6d8c872aa2e2c Mon Sep 17 00:00:00 2001
From: Lemuel Marquez <lemuelhelonmarquezrosas@gmail.com>
Date: Mon, 23 Nov 2020 12:56:24 -0600
Subject: [PATCH] activar cuenta

---
 server/controller/Servicio/cancelar.js |  4 ++++
 server/controller/Servicio/registro.js |  2 +-
 server/controller/Usuario/login.js     |  2 +-
 server/routes/CuestionarioAlumno.js    | 22 +++++++++++-----------
 server/routes/CuestionarioPrograma.js  | 22 +++++++++++-----------
 server/routes/index.js                 |  3 ++-
 6 files changed, 30 insertions(+), 25 deletions(-)

diff --git a/server/controller/Servicio/cancelar.js b/server/controller/Servicio/cancelar.js
index 1552bb6..ca9ec74 100644
--- a/server/controller/Servicio/cancelar.js
+++ b/server/controller/Servicio/cancelar.js
@@ -1,5 +1,6 @@
 const validar = require('../../helper/validar');
 const Servicio = require('../../db/tablas/Servicio');
+const Usuario = require('../../db/tablas/Usuario');
 
 const cancelar = async (body) => {
   let idServicio = validar.validarId(body.idServicio);
@@ -9,6 +10,9 @@ const cancelar = async (body) => {
       if (!res) throw new Error('No existe este servicio.');
       if (res.idStatus === 10)
         throw new Error('Este servicio ya fue cancelado');
+      return Usuario.update({ activo: false }, { where: res.idUsuario });
+    })
+    .then((res) => {
       return Servicio.update({ idStatus: 10 }, { where: { idServicio } });
     })
     .then((res) => {
diff --git a/server/controller/Servicio/registro.js b/server/controller/Servicio/registro.js
index 27660db..60d0fda 100644
--- a/server/controller/Servicio/registro.js
+++ b/server/controller/Servicio/registro.js
@@ -43,7 +43,7 @@ const registro = async (body) => {
     })
     .then((res) => {
       return Usuario.update(
-        { password: encriptar.encriptar(password) },
+        { password: encriptar.encriptar(password), activo: true },
         { where: { idUsuario } }
       );
     })
diff --git a/server/controller/Usuario/login.js b/server/controller/Usuario/login.js
index 3b01871..c274024 100644
--- a/server/controller/Usuario/login.js
+++ b/server/controller/Usuario/login.js
@@ -9,7 +9,7 @@ const login = async (body) => {
   let password = validar.validar(body.password, 'El password');
 
   return Usuario.findOne({
-    where: { usuario },
+    where: { usuario, activo: true },
     include: [{ model: TipoUsuario }],
   }).then((res) => {
     if (!res) throw new Error('No existe este usuario.');
diff --git a/server/routes/CuestionarioAlumno.js b/server/routes/CuestionarioAlumno.js
index ce8a93d..351c1f4 100644
--- a/server/routes/CuestionarioAlumno.js
+++ b/server/routes/CuestionarioAlumno.js
@@ -1,16 +1,16 @@
 const express = require('express');
 const app = express();
-const route = '/arrendamiento';
-// const get = require('../controller/TipoCuarto/get');
+const route = '/cuestionario_alumno';
+const nuevo = require('../controller/CuestionarioAlumno');
 
-// app.get(`${route}`, (req, res) => {
-//   return get()
-//     .then((data) => {
-//       res.status(200).json(data);
-//     })
-//     .catch((err) => {
-//       res.status(400).json(err);
-//     });
-// });
+app.post(`${route}`, (req, res) => {
+  return nuevo(req.body)
+    .then((data) => {
+      res.status(200).json(data);
+    })
+    .catch((err) => {
+      res.status(400).json(err);
+    });
+});
 
 module.exports = app;
diff --git a/server/routes/CuestionarioPrograma.js b/server/routes/CuestionarioPrograma.js
index 205ec4e..71035aa 100644
--- a/server/routes/CuestionarioPrograma.js
+++ b/server/routes/CuestionarioPrograma.js
@@ -1,16 +1,16 @@
 const express = require('express');
 const app = express();
-const route = '/inmueble';
-// const get = require('../controller/TipoCuarto/get');
+const route = '/cuestionario_programa';
+const nuevo = require('../controller/CuestionarioPrograma');
 
-// app.get(`${route}`, (req, res) => {
-//   return get()
-//     .then((data) => {
-//       res.status(200).json(data);
-//     })
-//     .catch((err) => {
-//       res.status(400).json(err);
-//     });
-// });
+app.post(`${route}`, (req, res) => {
+  return nuevo(req.body)
+    .then((data) => {
+      res.status(200).json(data);
+    })
+    .catch((err) => {
+      res.status(400).json(err);
+    });
+});
 
 module.exports = app;
diff --git a/server/routes/index.js b/server/routes/index.js
index faca351..193f189 100644
--- a/server/routes/index.js
+++ b/server/routes/index.js
@@ -1,10 +1,11 @@
 const express = require('express');
 const app = express();
 
-// app.use(require('./'))
 app.use(require('./Status'));
 app.use(require('./Usuario'));
 app.use(require('./Servicio'));
 app.use(require('./Programa'));
+// app.use(require('./CuestionarioAlumno'))
+// app.use(require('./CuestionarioPrograma'))
 
 module.exports = app;