Merge branch 'develop' into feat/31_details_activities_children

Author: omateusp

src/app/controllers/AdmController.js

@@ -145,7 +145,7 @@ class AdmController extends UserController {
 
   async registerClass(req, res) {
     try {
-      const { code, capacity } = req.body;
+      const { code, capacity, id_teacher } = req.body;
 
       // const {fk_idEc} = await Professionals.findByPk(req.userId);
       // TODO: adicionar id EC na hora de criar a classe
@@ -163,6 +163,8 @@ class AdmController extends UserController {
         capacity,
       });
 
+      await ClassProfessional.create({ fk_idClass: class_obj.id, fk_idProfessional: id_teacher });
+
       const children = await Child.findAll({
         limit: capacity,
       });
@@ -178,6 +180,7 @@ class AdmController extends UserController {
       await class_obj.update({ capacity: capacity - children.length });
       const clss = await Class.findByPk(class_obj.id, {
         include: { association: 'Children' },
+        include: { association: 'Teacher' },
       });
 
       return res.status(201).json({ message: 'Turma Cadastrada!', clss });
@@ -226,6 +229,7 @@ class AdmController extends UserController {
     }
   }
 
+
   async registerTeacherClass(req, res) {
     try {
       const { teacher_id, class_id } = req.body;

src/app/controllers/AuthController.js

@@ -33,7 +33,7 @@ class AuthController {
       }
       const { id, name, usertype } = user;
 
-      let list = [];
+      var list = [];
 
       if (usertype === 0) {
         const relations = await GuardianChild.findAll({
@@ -50,6 +50,7 @@ class AuthController {
         list = undefined;
       }
 
+
       return res.json({
         user: {
           id,

src/app/controllers/TeacherController.js

@@ -15,8 +15,8 @@ const sequelize = new Sequelize(dbConfig.database, dbConfig.username,
 class TeacherController extends UserController {
   async list(req, res) {
     try {
-      const users = await User.findAll();
-      const plist = await Professionals.findAll();
+      const users = await User.findAll({ where: { usertype: 1 }, attributes: ['id', 'name'] });
+      const plist = await Professionals.findAll({ where: { professional_type: 'teacher' } });
       return res.json({ users, professionals: plist });
     } catch (err) {
       return res.status(500).json({ error: err.stack });

src/database/migrations/20210907075434-create-class_professional.js

@@ -28,5 +28,5 @@ module.exports = {
     },
   }),
 
-  down: async (queryInterface, Sequelize) => queryInterface.dropTable('class_professional'),
+  down: async (queryInterface, Sequelize) => queryInterface.dropTable('class_professionals'),
 };