Merge pull request #43 from UnBArqDsw2021-1/feat/42_listar_turmas

Rotas para professor listar todas as suas turmas

Author: eliseukadesh67

src/app/controllers/AdmController.js

@@ -6,6 +6,7 @@ import GuardianChild from '../models/GuardianChild';
 import UserController from './UserController';
 import dbConfig from '../../config/database';
 import Class from '../models/Class';
+import ClassProfessional from '../models/ClassProfessional';
 import Ec from './EcController';
 
 const sequelize = new Sequelize(dbConfig.database, dbConfig.username,
@@ -144,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
@@ -162,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,
       });
@@ -177,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 });
@@ -225,6 +229,29 @@ class AdmController extends UserController {
     }
   }
 
+  async deleteTeacherClass(req, res) {
+    try {
+      const { teacher_id, class_id } = req.query;
+      console.log(req);
+
+      const TeacherClass = await ClassProfessional.findOne({
+        where: {
+          fk_idClass: class_id,
+          fk_idProfessional: teacher_id,
+        },
+      });
+      if (TeacherClass === null) {
+        return res.status(404).json({ message: 'Relação não encontrada.' });
+      }
+
+      await TeacherClass.destroy();
+
+      return res.status(200).json({ msg: 'Professor removido da turma.' });
+    } catch (err) {
+      return res.status(500).json({ error: err.message });
+    }
+  }
+
   async updateClass(req, res) {
     try {
       const { id, updates } = req.body;

src/app/controllers/AuthController.js

@@ -33,19 +33,24 @@ class AuthController {
       }
       const { id, name, usertype } = user;
 
-      const children_list = [];
-
-      const children_rel = await GuardianChild.findAll({
-        where: {
-          fk_idGuardian: id
+      var list = [];
+
+      if (usertype === 0) {
+        const relations = await GuardianChild.findAll({
+          where: {
+            fk_idGuardian: id
+          }
+        });
+  
+        for (const relation of relations){
+          const child = await Child.findByPk(relation.dataValues.fk_idChild);
+          list.push(child.dataValues);
         }
-      });
-
-      for (const child_rel of children_rel){
-        const child = await Child.findByPk(child_rel.dataValues.fk_idChild);
-        children_list.push(child.dataValues);
+      } else {
+        list = undefined;
       }
 
+
       return res.json({
         user: {
           id,
@@ -58,7 +63,7 @@ class AuthController {
           expiresIn: authConfig.expiresIn,
         }),
 
-        children_list
+        extra_info: list
 
       });
     } catch (err) {

src/app/controllers/TeacherController.js

@@ -5,15 +5,16 @@ import User from '../models/User';
 import dbConfig from '../../config/database';
 import Project from '../models/Project';
 import Class from '../models/Class';
+import ClassProfessional from '../models/ClassProfessional';
 
 const sequelize = new Sequelize(dbConfig.database, dbConfig.username,
   dbConfig.password, { host: dbConfig.host, dialect: dbConfig.dialect });
 
 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 });
@@ -44,6 +45,29 @@ class TeacherController extends UserController {
       return res.status(500).json({ error: err.stack });
     }
   }
+
+  async listMyClasses(req, res) {
+    try {
+      const list = [];
+
+      const relations = await ClassProfessional.findAll({
+        where: {
+          fk_idProfessional: req.userId,
+        },
+      });
+
+      console.log(relations);
+
+      for (const relation of relations) {
+        const class_obj = await Class.findByPk(relation.dataValues.fk_idClass);
+        list.push(class_obj.dataValues);
+      }
+
+      return res.json({ list });
+    } catch (err) {
+      return res.status(500).json({ error: err.stack });
+    }
+  }
 }
 
 export default new TeacherController();

src/app/models/Class.js

@@ -15,6 +15,7 @@ class Class extends Model {
     // this.hasMany(models.Activity, { through: 'class_project' });
     // this.hasMany(models.Event, { through: 'class_project' });
     // this.hasMany(models.Teacher, { through: 'class_professional' });
+    this.belongsToMany(models.Professionals, { as: 'Teacher', through: 'ClassProfessional', foreignKey: 'fk_idClass' });
     this.hasMany(models.Child, { foreignKey: 'fk_idClass', as: 'Children' });
     this.belongsToMany(models.Project, { as: 'Project', through: 'ClassProject', foreignKey: 'fk_idClass' });
   }

src/app/models/ClassProfessional.js

@@ -0,0 +1,14 @@
+import { Model, Sequelize } from 'sequelize';
+
+class ClassProfessional extends Model {
+  static init(sequelize) {
+    super.init({
+      fk_idClass: Sequelize.INTEGER,
+      fk_idProfessional: Sequelize.INTEGER,
+    }, {
+      sequelize,
+    });
+  }
+}
+
+export default ClassProfessional;

src/app/models/Professionals.js

@@ -17,7 +17,8 @@ class Professionals extends Model {
 
   static associate(models) {
     this.hasMany(models.Project, { foreignKey: 'fk_idProfessional', as: 'Projects' });
-    this.hasMany(models.Anotation, { foreignKey: 'fk_idProfessional' });
+    this.hasMany(models.Anotation, { foreignKey: 'fk_idProfessional'});
+    this.belongsToMany(models.Class, { as: 'Class', through: 'ClassProfessional', foreignKey: 'fk_idProfessional' });
     this.belongsTo(models.Ec, { foreignKey: 'fk_idEc', as: 'ec' });
   }
 }

src/database/index.js

@@ -10,8 +10,9 @@ import Project from '../app/models/Project';
 import GuardianChild from '../app/models/GuardianChild';
 import ClassProject from '../app/models/ClassProject';
 import Anotation from '../app/models/Anotation';
+import ClassProfessional from '../app/models/ClassProfessional';
 
-const models = [User, Ec, Class, Child, Professionals, Guardian, Project, GuardianChild, ClassProject, Anotation];
+const models = [User, Ec, Class, Child, Professionals, Guardian, Project, GuardianChild, ClassProject, Anotation, ClassProfessional];
 const assoc = [Class, Professionals, Project, Child, Guardian, Anotation];
 
 class Database {

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

@@ -1,18 +1,18 @@
 module.exports = {
-  up: (queryInterface, Sequelize) => queryInterface.createTable('class_professional', {
+  up: (queryInterface, Sequelize) => queryInterface.createTable('class_professionals', {
     id: {
       allowNull: false,
       primaryKey: true,
       type: Sequelize.INTEGER,
       autoIncrement: true,
     },
-    fk_idClass: {
+    fk_id_class: {
       type: Sequelize.INTEGER,
       references: { model: 'classes', key: 'id' },
       onUpdate: 'CASCADE',
       onDelete: 'CASCADE',
     },
-    fk_idProfessional: {
+    fk_id_professional: {
       type: Sequelize.INTEGER,
       references: { model: 'professionals', key: 'id' },
       onUpdate: 'CASCADE',
@@ -28,5 +28,5 @@ module.exports = {
     },
   }),
 
-  down: async (queryInterface, Sequelize) => queryInterface.dropTable('class_professional'),
+  down: async (queryInterface, Sequelize) => queryInterface.dropTable('class_professionals'),
 };

src/routes.js

@@ -33,6 +33,7 @@ routes.get('/adm/list-professionals', TeacherController.list);
 routes.get('/adm/list-guardians', GuardianController.list);
 routes.get('/adm/list-classes', AdmController.listClasses);
 routes.get('/adm/list-anotations', AnotationController.listAll);
+routes.delete('/adm/delete-class-teacher', AdmController.deleteTeacherClass);
 // routes.get('/adm/list-activities', ActivityController.list);
 
 // Teacher routes
@@ -45,6 +46,7 @@ routes.post('/teacher/create-anotation', AnotationController.create);
 routes.put('/teacher/update-anotation', AnotationController.update);
 routes.delete('/teacher/delete-anotation/:id', AnotationController.delete);
 routes.get('/teacher/list-anotations', AnotationController.listMine);
+routes.get('/teacher/list-my-classes', TeacherController.listMyClasses);
 
 // Guardian routes
 routes.use('/guardian', Middleware.verifyGuardian);