Merge pull request #44 from UnBArqDsw2021-1/feat/31_details_activitie…

…s_children

Feat/31 details activities children

src/app/controllers/AdmController.js

@@ -229,10 +229,36 @@ class AdmController extends UserController {
     }
   }
 
+  async registerTeacherClass(req, res) {
+    try {
+      const { teacher_id, class_id } = req.body;
+
+      const { usertype } = await User.findByPk(teacher_id);
+      if (usertype !== 1) {
+        return res.status(403).json({ message: 'O usuário não é um professor.' });
+      }
+
+      const TeacherClass = await ClassProfessional.findOne({
+        where: {
+          fk_idClass: class_id,
+          fk_idProfessional: teacher_id,
+        },
+      });
+      if (TeacherClass !== null) {
+        return res.status(201).json({ message: 'Professional já está cadastrado na turma.' });
+      }
+
+      await ClassProfessional.create({ fk_idClass: class_id, fk_idProfessional: teacher_id });
+
+      return res.status(200).json({ msg: 'Professor adicionado à turma.' });
+    } catch (err) {
+      return res.status(500).json({ error: err.message });
+    }
+  }
+
   async deleteTeacherClass(req, res) {
     try {
       const { teacher_id, class_id } = req.query;
-      console.log(req);
 
       const TeacherClass = await ClassProfessional.findOne({
         where: {

src/app/controllers/AuthController.js

@@ -38,11 +38,11 @@ class AuthController {
       if (usertype === 0) {
         const relations = await GuardianChild.findAll({
           where: {
-            fk_idGuardian: id
-          }
+            fk_idGuardian: id,
+          },
         });
-  
-        for (const relation of relations){
+
+        for (const relation of relations) {
           const child = await Child.findByPk(relation.dataValues.fk_idChild);
           list.push(child.dataValues);
         }
@@ -63,7 +63,7 @@ class AuthController {
           expiresIn: authConfig.expiresIn,
         }),
 
-        extra_info: list
+        extra_info: list,
 
       });
     } catch (err) {

src/app/controllers/ChildController.js

@@ -15,8 +15,8 @@ class ChildController {
   async listChildrenRelations(req, res) {
     try {
       const children = await Child.findAll();
-      const guardian_children  = await GuardianChild.findAll();
-      return res.json({ children, relations: guardian_children  });
+      const guardian_children = await GuardianChild.findAll();
+      return res.json({ children, relations: guardian_children });
     } catch (err) {
       return res.status(500).json({ error: err.stack });
     }

src/app/controllers/GuardianController.js

@@ -38,15 +38,15 @@ class GuardianController extends UserController {
 
       await Guardian.create({ id, adress }, { transaction: t });
 
-      const guardian_children  = await GuardianChild.findAll({
+      const guardian_children = await GuardianChild.findAll({
         where: {
           guardian_cpf: cpf,
         },
       });
 
       await t.commit();
 
-      for (const element of guardian_children ) {
+      for (const element of guardian_children) {
         await element.update({
           fk_idGuardian: id,
         });

src/app/controllers/TeacherController.js

@@ -6,6 +6,8 @@ import dbConfig from '../../config/database';
 import Project from '../models/Project';
 import Class from '../models/Class';
 import ClassProfessional from '../models/ClassProfessional';
+import ClassProject from '../models/ClassProject';
+import Child from '../models/Child';
 
 const sequelize = new Sequelize(dbConfig.database, dbConfig.username,
   dbConfig.password, { host: dbConfig.host, dialect: dbConfig.dialect });
@@ -56,8 +58,6 @@ class TeacherController extends UserController {
         },
       });
 
-      console.log(relations);
-
       for (const relation of relations) {
         const class_obj = await Class.findByPk(relation.dataValues.fk_idClass);
         list.push(class_obj.dataValues);
@@ -68,6 +68,49 @@ class TeacherController extends UserController {
       return res.status(500).json({ error: err.stack });
     }
   }
+
+  async getClassInfo(req, res) {
+    try {
+      const { class_id } = req.params;
+
+      const relation = await ClassProfessional.findOne({
+        where: {
+          fk_idClass: class_id,
+          fk_idProfessional: req.userId,
+        },
+      });
+      if (relation === null) {
+        return res.status(403).json({ message: 'Esta turma não é sua ou não existe.' });
+      }
+
+      const details = await Class.findByPk(class_id);
+
+      const activities = [];
+      const activities_rels = await ClassProject.findAll({
+        where: {
+          fk_idClass: class_id,
+        },
+      });
+      for (const relation of activities_rels) {
+        const project = await Project.findByPk(relation.dataValues.fk_idProject);
+        activities.push(project.dataValues);
+      }
+
+      const children = await Child.findAll({
+        where: {
+          fk_idClass: class_id,
+        },
+      });
+
+      return res.json({
+        details,
+        activities,
+        children,
+      });
+    } catch (err) {
+      return res.status(500).json({ error: err.stack });
+    }
+  }
 }
 
 export default new TeacherController();

src/app/middlewares/middleware.js

@@ -59,7 +59,6 @@ class Middleware {
       const decoded = await promisify(jwt.verify)(token, authConfig.secret);
 
       if (decoded.usertype !== 0) {
-        console.log(decoded.usertype);
         return res.status(401).json({ error: 'Acesso negado.' });
       }
       req.userId = decoded.id;

src/app/models/Anotation.js

@@ -1,14 +1,16 @@
-import { DataTypes, Model } from "sequelize";
-class Anotation extends Model { 
-  static init(sequelize){
+import { DataTypes, Model } from 'sequelize';
+
+class Anotation extends Model {
+  static init(sequelize) {
     super.init({
       fk_idChild: DataTypes.INTEGER,
       title: DataTypes.STRING,
       description: DataTypes.STRING,
-    },{
+    }, {
       sequelize,
-    })
+    });
   }
+
   static associate(models) {
     this.belongsTo(models.Child, { foreignKey: 'fk_idChild' });
     this.belongsTo(models.Professionals, { foreignKey: 'fk_idProfessional' });

src/app/models/Professionals.js

@@ -17,7 +17,7 @@ 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/config/database.js

@@ -1,7 +1,7 @@
 require('dotenv').config();
 
 module.exports = {
-  dialect:'postgres',
+  dialect: 'postgres',
   host: process.env.POSTGRES_HOST,
   username: process.env.POSTGRES_USER,
   password: process.env.POSTGRES_PASSWORD,
@@ -12,8 +12,6 @@ module.exports = {
   define: {
     timestamp: true,
     underscored: true,
-    underscoredAll: true
-  }
+    underscoredAll: true,
+  },
 };
-
-

src/database/index.js

@@ -1,5 +1,5 @@
-import dbConfig from '../config/database';
 import Sequelize from 'sequelize';
+import dbConfig from '../config/database';
 import User from '../app/models/User';
 import Professionals from '../app/models/Professionals';
 import Guardian from '../app/models/Guardian';

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.post('/adm/register-class-teacher', AdmController.registerTeacherClass);
 routes.delete('/adm/delete-class-teacher', AdmController.deleteTeacherClass);
 // routes.get('/adm/list-activities', ActivityController.list);
 
@@ -47,6 +48,7 @@ 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);
+routes.get('/teacher/get-class-info/:class_id', TeacherController.getClassInfo);
 
 // Guardian routes
 routes.use('/guardian', Middleware.verifyGuardian);

src/server.js

@@ -2,5 +2,3 @@
 import app from './app';
 
 app.listen(process.env.PORT || 3333);
-
-