-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'maddie-2' of https://github.com/MADGRISMAD/electronica-…
…tutorias into maddie-2
- Loading branch information
Showing
6 changed files
with
175 additions
and
97 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,65 +1,64 @@ | ||
const CitaSchema = require("../models/cita.model"); | ||
const CitaService = require("../services/cita.service"); | ||
|
||
const citaRegistro = async (req, res, next) => { | ||
const { error, cita } = CitaSchema.validate(req.body); | ||
if (error) { | ||
return res.status(400).json({ message: error.details[0].message }); | ||
} | ||
try { | ||
const newCita = await CitaService.createCita(cita, req.session.usuario.email); | ||
return res.status(201).json(newCita); | ||
} catch (error) { | ||
return res.status(500).json({ message: error.message }); | ||
} | ||
}; | ||
|
||
const getCitas = async (req, res, next) => { | ||
try { | ||
const citas = await CitaService.getCitas(); | ||
return res.status(200).json(citas); | ||
} catch (error) { | ||
return res.status(500).json({ message: error.message }); | ||
} | ||
}; | ||
|
||
const getCitasByAlumno = async (req, res, next) => { | ||
const { id } = req.params; | ||
try { | ||
const cita = await CitaService.getCitasByAlumno(id); | ||
return res.status(200).json(cita); | ||
} catch (error) { | ||
return res.status(500).json({ message: error.message }); | ||
} | ||
}; | ||
const updateCita = async (req, res, next) => { | ||
const { id } = req.params; | ||
const { error, value } = CitaSchema.validate(req.body); | ||
if (error) { | ||
return res.status(400).json({ message: error.details[0].message }); | ||
} | ||
|
||
try { | ||
const cita = await CitaService.updateCita(id, value); | ||
return res.status(200).json(cita); | ||
} catch (error) { | ||
return res.status(500).json({ message: error.message }); | ||
} | ||
}; | ||
|
||
const deleteCita = async (req, res, next) => { | ||
const { id } = req.params; | ||
try { | ||
const cita = await CitaService.deleteCita(id); | ||
return res.status(204).json(cita); | ||
} catch (error) { | ||
return res.status(500).json({ message: error.message }); | ||
} | ||
} | ||
module.exports = { | ||
citaRegistro, | ||
getCitas, | ||
getCitasByAlumno, | ||
updateCita, | ||
deleteCita, | ||
}; | ||
const CitaSchema = require("../models/cita.model"); | ||
const CitaService = require("../services/cita.service"); | ||
|
||
const citaRegistro = async (req, res, next) => { | ||
const { error, cita } = CitaSchema.validate(req.body); | ||
if (error) { | ||
return res.status(400).json({ message: error.details[0].message }); | ||
} | ||
try { | ||
const newCita = await CitaService.createCita(cita, req.token.email); | ||
return res.status(201).json(newCita); | ||
} catch (error) { | ||
return res.status(500).json({ message: error.message }); | ||
} | ||
}; | ||
|
||
const getCitas = async (req, res, next) => { | ||
try { | ||
const citas = await CitaService.getCitas(); | ||
return res.status(200).json(citas); | ||
} catch (error) { | ||
return res.status(500).json({ message: error.message }); | ||
} | ||
}; | ||
|
||
const getCitasByAlumno = async (req, res, next) => { | ||
// Use with jwt token or when the user is logged in as a maestro | ||
const numeroDeControl = req.params.numeroDeControl || req.token.numeroDeControl; | ||
try { | ||
const cita = await CitaService.getCitasByAlumno(numeroDeControl); | ||
return res.status(200).json(cita); | ||
} catch (error) { | ||
return res.status(500).json({ message: error.message }); | ||
} | ||
}; | ||
const updateCita = async (req, res, next) => { | ||
// Use with jwt token or when the user is logged in as a maestro | ||
const numeroDeControl = req.params.numeroDeControl || req.token.numeroDeControl; | ||
|
||
try { | ||
const cita = await CitaService.updateCita(numeroDeControl, req.body); | ||
return res.status(200).json(cita); | ||
} catch (error) { | ||
return res.status(500).json({ message: error.message }); | ||
} | ||
}; | ||
|
||
const deleteCita = async (req, res, next) => { | ||
// Use with jwt token or when the user is logged in as a maestro | ||
const numeroDeControl = req.params.numeroDeControl || req.token.numeroDeControl; | ||
try { | ||
const cita = await CitaService.deleteCita(numeroDeControl); | ||
return res.status(204).json(cita); | ||
} catch (error) { | ||
return res.status(500).json({ message: error.message }); | ||
} | ||
} | ||
module.exports = { | ||
citaRegistro, | ||
getCitas, | ||
getCitasByAlumno, | ||
updateCita, | ||
deleteCita, | ||
}; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,18 +1,20 @@ | ||
const Joi = require ("joi"); | ||
|
||
const maestroSchema = Joi.object({ | ||
|
||
numeroDeControl: Joi.string().required(), | ||
nombre: Joi.string().required(), | ||
apellidoPaterno: Joi.string().required(), | ||
apellidoMaterno: Joi.string().required(), | ||
// Only tec domain | ||
correo: Joi.string().email().required().regex(/"@tectijuana.edu.mx$|@tijuana.tecnm.mx$"/), | ||
// International prefix | ||
prefijo: Joi.string().required().regex(/"^\d{3}$"/), | ||
|
||
telefono: Joi.string().required().regex(/"^\d{10}$"/), | ||
extension: Joi.string().required().regex(/"^\d{4}$"/), | ||
}); | ||
|
||
const Joi = require ("joi"); | ||
|
||
const maestroSchema = Joi.object({ | ||
|
||
numeroDeControl: Joi.string().required(), | ||
// Title of the professor | ||
titulo: Joi.string().required(), | ||
nombre: Joi.string().required(), | ||
apellidoPaterno: Joi.string().required(), | ||
apellidoMaterno: Joi.string().required(), | ||
// Only tec domain | ||
correo: Joi.string().email().required().regex(/"@tectijuana.edu.mx$|@tijuana.tecnm.mx$"/), | ||
// International prefix | ||
prefijo: Joi.string().required().regex(/"^\d{3}$"/), | ||
|
||
telefono: Joi.string().required().regex(/"^\d{10}$"/), | ||
extension: Joi.string().required().regex(/"^\d{4}$"/), | ||
}); | ||
|
||
module.exports = maestroSchema; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters