Merge pull request VitorCarvalho67#43 from Daniel-Alvarenga/main

Create extracurriculares routes

Author: Daniel-Alvarenga

ToDo.md

@@ -1,5 +1,23 @@
-## Client
-- [ ] aaaaaaa
+# Server
 
+## Aluno
+- [x] add extracurricular
+- [x] edit extracurricular
+- [x] exclude extracurricular
+- [ ] conversa professor
+- [ ] conversa empresa
+- [ ] exportar currículo
+- [ ] colocar o boletim
 
-## Server
+## Funcionário
+- [ ] classificar empresa como parceira
+- [ ] Ver empresas
+
+## Professor
+- [ ] Mandar mensagem aluno
+
+## Empresa
+
+## Coordenador
+
+## Admin

client/src/services/api/aluno.js

@@ -374,4 +374,23 @@ function enterSockets(token){
             authorization: `${token}`
         }
     );
+}
+
+export const sendBoletim = async (file, token) => {
+    try {
+        const formData = new FormData();
+        formData.append('file', file);
+
+        
+        const response = await api.post('aluno/upload/boletim', formData, {
+            headers: {
+                authorization: `${token}`,
+                'Content-Type': 'multipart/form-data'
+            }
+        });
+        return response;
+    } catch (error) {
+        console.log("ARQUIVO: " + file);
+        // return error.response.data;
+    }
 }

client/src/views/aluno/Config.vue

@@ -38,6 +38,13 @@
                     </div>
                 </router-link>
             </div>
+            <div class="inputUpload">
+                <p>Anexo suas notas aqui enviando um boletim</p>
+                <input type="file" ref="boletimInput">
+                <button @click="sendBoletim" type="button">
+                    <img :src="imgVerificar">Salvar
+                </button>
+            </div>
         </div>
     </main>
     <Footer />
@@ -49,14 +56,16 @@ import Header from '../../components/Header.vue';
 import AsideDashboard from '../../components/aluno/AsideDashboard.vue'
 import Footer from '../../components/Footer.vue';
 
-import router from '../../router/index.js'
-import Cookies from 'js-cookie';
 import {
     getCurriculo,
+    sendBoletim
 } from '../../services/api/aluno';
 import {
     getImage,
 } from '../../services/api/shared';
+
+import imgVerificar from '../../assets/icons/verificar.png';
+
 import { mixinAluno } from '../../util/authMixins.js';
 
 
@@ -134,6 +143,21 @@ export default {
                 console.log("Ops.. Algo deu errado ao recuperar a imagem de perfil. 😕\n" + error);
             }
         },
+        async sendBoletim(){
+            const file = this.$refs.boletimInput.files[0];
+            if (!file) return;
+
+            const response = await sendBoletim(file, this.aluno.token);
+
+            if (response.status >= 200 && response.status < 300) {
+                alert("Notas carregadas com sucesso! 😉");
+                await this.getCurriculoAluno();
+            } else {
+                alert("Ops.. Algo deu errado ao enviar notas. 😕\n" + response.message);
+            }
+
+            this.$refs.boletimInput.value = '';
+        }
     },
     mixins: [mixinAluno],
     async created() {

server/.env.example

@@ -10,4 +10,6 @@ URL="http://localhost:5173"
 
 MINIO_END_POINT="localhost"
 MINIO_ACCESS_KEY="xxxxxxxxxxxxxxxxxxxx"
-MINIO_SECRET_KEY="xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
+MINIO_SECRET_KEY="xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
+
+CAPTCHA2_ID="your_captcha2_token"

server/src/modules/controllers/alunoControllers.ts

@@ -1,4 +1,4 @@
- import { Request, Response } from 'express';
+import { Request, Response } from 'express';
 import { ValidateAlunoUseCase } from '../services/aluno/ValidateAlunoUseCase';
 import { CreateAlunoUseCase } from '../services/aluno/CreateAlunoUseCase';
 import { LoginAlunoUseCase } from "../services/aluno/LoginAlunoUseCase";
@@ -18,15 +18,19 @@ import { GetLastMessagesUseCase } from '../services/shared/GetMessagesUseCase';
 import { EntidadeEnum, IdentificadorEnum } from '../interfaces/sharedDTOs';
 import { GetMessagesBetweenUseCase } from '../services/shared/GetChatUseCase';
 import { CreateMessageUseCase } from '../services/shared/CreateMessageUseCase';
+import { RegisterExtracurricularUseCase } from '../services/aluno/CreateExtraUseCase';
+import { EditExtracurricularUseCase } from '../services/aluno/EditExtraUsecase';
+import { ExcludeExtracurricularUseCase } from '../services/aluno/ExcludeExtraUseCase';
+import { SendBoletimUseCase } from '../services/aluno/SendBoletimUseCase';
 
 export class CreateAlunoController {
     async handle(req: Request, res: Response) {
         const { name, email, password } = req.body;
-        
+
         const createAlunoUseCase = new CreateAlunoUseCase();
-        
+
         const result = await createAlunoUseCase.execute({ name, email, password });
-        
+
         return res.status(201).json(result);
     }
 }
@@ -158,23 +162,23 @@ export class UploadImgProfileController {
     async handle(req: Request, res: Response) {
         const email = req.body.entidade.email;
         const file = req.file as Express.Multer.File;
-        
+
         const uploadProfileUseCase = new UploadProfileUseCase();
 
-        const result = await uploadProfileUseCase.execute({email, file});
+        const result = await uploadProfileUseCase.execute({ email, file });
 
         return res.status(201).json(result);
     }
 }
 
 export class UploadCapaController {
     async handle(req: Request, res: Response) {
-        const email   = req.body.entidade.email;
+        const email = req.body.entidade.email;
         const file = req.file as Express.Multer.File;
 
         const uploadCapaUseCase = new UploadCapaUseCase();
 
-        const result = await uploadCapaUseCase.execute({email, file});
+        const result = await uploadCapaUseCase.execute({ email, file });
 
         return res.status(201).json(result);
     }
@@ -194,7 +198,7 @@ export class ChangePassController {
 
 export class GetLastMessagesController {
     async handle(req: Request, res: Response) {
-        const email   = req.body.entidade.email;
+        const email = req.body.entidade.email;
         const identifier = "ALUNO" as IdentificadorEnum;
 
         const getLastMessagesUseCase = new GetLastMessagesUseCase();
@@ -209,7 +213,7 @@ export class GetMessagesBetweenController {
     async handle(req: Request, res: Response) {
         const email1 = req.body.entidade.email as string;
         const identifier1 = "ALUNO" as EntidadeEnum;
-        
+
         const email2 = req.query.email2 as string;
         const identifier2 = req.query.identifier2 as EntidadeEnum;
 
@@ -230,12 +234,79 @@ export class CreateMessageController {
         const sender = req.body.entidade.email;
         const { message, recipient, senderIdentifier, recipientIdentifier } = req.body;
 
-        console.log
-
         const createMessageUseCase = new CreateMessageUseCase();
 
         const result = await createMessageUseCase.execute({ message, sender, recipient, senderIdentifier, recipientIdentifier });
 
         return res.status(201).json(result);
     }
-}
+}
+
+export class RegisterExtracurricularController {
+    async handle(req: Request, res: Response) {
+        const alunoId = req.body.entidade.id;
+        const { instituicao, descricao, inicio, fim } = req.body;
+
+        const registerExtracurricularUseCase = new RegisterExtracurricularUseCase();
+
+        const result = await registerExtracurricularUseCase.execute({
+            alunoId,
+            instituicao,
+            descricao,
+            inicio,
+            fim,
+        });
+
+        return res.status(201).json(result);
+    }
+}
+
+export class EditExtracurricularController {
+    async handle(req: Request, res: Response) {
+        const { instituicao, descricao, inicio, fim } = req.body;
+        const extracurricularId = req.body.extracurricularId;
+        const alunoId = req.body.entidade.id;
+
+        const editExtracurricularUseCase = new EditExtracurricularUseCase();
+
+        const result = await editExtracurricularUseCase.execute({
+            extracurricularId,
+            alunoId,
+            instituicao,
+            descricao,
+            inicio,
+            fim,
+        });
+
+        return res.status(200).json(result);
+    }
+}
+
+export class ExcludeExtracurricularController {
+  async handle(req: Request, res: Response) {
+    const extracurricularId = req.body.extracurricularId;
+    const alunoId = req.body.entidade.id;
+
+    const excludeExtracurricularUseCase = new ExcludeExtracurricularUseCase();
+
+    const result = await excludeExtracurricularUseCase.execute({
+      extracurricularId,
+      alunoId,
+    });
+
+    return res.status(200).json(result);
+  }
+}
+
+export class SendBoletimController {
+    async handle(req: Request, res: Response) {
+        const alunoId = req.body.entidade.id;
+        const boletim = req.file as Express.Multer.File;
+
+        const sendBoletimUseCase = new SendBoletimUseCase();
+
+        const result = await sendBoletimUseCase.execute({ alunoId, boletim });
+
+        return res.status(201).json(result);
+    }
+}

server/src/modules/interfaces/alunoDTOs.ts

@@ -1,3 +1,5 @@
+import { Multer } from "multer"
+
 export interface ValidateAlunoDTO {
     email: string,
     token: string
@@ -44,17 +46,44 @@ export interface GetTurmasByCursoDTO {
     turno: Turno
 }
 
-export interface UploadImageDTO{
+export interface UploadImageDTO {
     email: string,
     file: Express.Multer.File
 }
 
-export interface UpdatePassDTO{
+export interface UpdatePassDTO {
     email: string,
     oldPass: string
     newPass: string
 }
 
+export interface RegisterExtracurricularDTO {
+    alunoId: string;
+    instituicao: string;
+    descricao: string;
+    inicio: Date;
+    fim: Date;
+}
+
+export interface EditExtracurricularDTO {
+    alunoId: string;
+    extracurricularId: string;
+    instituicao?: string;
+    descricao?: string;
+    inicio?: Date;
+    fim?: Date;
+}
+
+export interface ExcludeExtracurricularDTO {
+    extracurricularId: string;
+    alunoId: string;
+}
+
+export interface SendNotasDTO {
+    alunoId: string;
+    boletim: Express.Multer.File
+}
+
 export enum Turno {
     MANHA = "MANHA",
     TARDE = "TARDE",

server/src/modules/services/aluno/CreateExtraUseCase.ts

@@ -0,0 +1,48 @@
+import { RegisterExtracurricularDTO } from '../../interfaces/alunoDTOs';
+import { prisma } from "../../../prisma/client";
+import { AppError } from "../../../errors/error";
+
+export class RegisterExtracurricularUseCase {
+  async execute(data: RegisterExtracurricularDTO) {
+    const { alunoId, instituicao, descricao, inicio, fim } = data;
+
+    if (!alunoId || !instituicao || !descricao || !inicio || !fim) {
+      throw new AppError('Todos os campos são obrigatórios.');
+    }
+
+    if (new Date(inicio) >= new Date(fim)) {
+      throw new AppError('A data de início deve ser anterior à data de fim.');
+    }
+
+    const aluno = await prisma.aluno.findUnique({
+      where: { id: alunoId },
+    });
+
+    if (!aluno) {
+      throw new AppError('Aluno não encontrado.');
+    }
+
+    const existingExtracurricular = await prisma.extracurricular.findFirst({
+      where: {
+        alunoId,
+        descricao,
+      },
+    });
+
+    if (existingExtracurricular) {
+      throw new AppError('Já existe uma atividade extracurricular com esta descrição para este aluno.');
+    }
+
+    const extracurricular = await prisma.extracurricular.create({
+      data: {
+        alunoId,
+        instituicao,
+        descricao,
+        inicio,
+        fim,
+      },
+    });
+
+    return extracurricular;
+  }
+}