Merge pull request #55 from unb-mds/develop

randomic static returns
unb-mds · Aug 24, 2024 · 169a197 · 169a197
2 parents 3f790ce + 0fe2271
commit 169a197
Show file tree

Hide file tree

Showing 5 changed files with 50 additions and 22 deletions.
diff --git a/api/src/controllers/enrollmentController.ts b/api/src/controllers/enrollmentController.ts
@@ -7,10 +7,10 @@ export const EnrollmentController = async (req: Request, res: Response) => {
     const { municipio, etapa } = req.query;
 
     if (typeof municipio !== 'string' || typeof etapa !== 'string') {
-      return res.status(400).json({ message: 'Parâmetros inválidos.' });
+      return res.status(400).json({ message: 'Município ou Etapa inválidos.' });
     }
     if (!municipio || !etapa) {
-      return res.status(400).json({ error: 'Municipio e etapa são obrigatórios' });
+      return res.status(400).json({ message: 'Municipio e Etapa são obrigatórios.' });
     }
 
     const service = new MatriculasService(new MatriculasRepositoryPSQL());

diff --git a/api/src/controllers/indicatorController.ts b/api/src/controllers/indicatorController.ts
@@ -11,11 +11,23 @@ export const IndicatorController = async (req: Request, res: Response) => {
     series: [
       {
         name: 'Brancos',
-        data: [12, 34, 14, 29, 45],
+        data: [
+          Math.floor(Math.random() * 10001),
+          Math.floor(Math.random() * 10001),
+          Math.floor(Math.random() * 10001),
+          Math.floor(Math.random() * 10001),
+          Math.floor(Math.random() * 10001),
+        ],
       },
       {
-        name: 'Pretos',
-        data: [20, 22, 23, 19, 30],
+        name: 'Pretos/Pardos',
+        data: [
+          Math.floor(Math.random() * 10001),
+          Math.floor(Math.random() * 10001),
+          Math.floor(Math.random() * 10001),
+          Math.floor(Math.random() * 10001),
+          Math.floor(Math.random() * 10001),
+        ],
       },
     ],
   };

diff --git a/api/src/controllers/rankingController.ts b/api/src/controllers/rankingController.ts
@@ -1,18 +1,40 @@
 import { Request, Response } from 'express';
 
 export const RankingController = async (req: Request, res: Response) => {
-  const { ano, etapa, ordem } = req.query;
-  console.log(`Ranking Ano: ${ano} - Etapa: ${etapa} - Ordem: ${ordem}`);
+  const { ano, etapa } = req.query;
+  console.log(`Ranking Ano: ${ano} - Etapa: ${etapa}`);
 
   const response = [
-    { name: 'Belo Horizonte', value: 10 },
-    { name: 'Patos de Minas', value: 9 },
-    { name: 'Uberlândia', value: 8 },
-    { name: 'Santana de Cataguases', value: 7 },
-    { name: 'Tiros', value: 6.4 },
-    { name: 'Uberaba', value: 6 },
-    { name: 'Vargem Bonita', value: 5 },
-    { name: 'Governador Valadares', value: 4.2 },
+    { name: 'Belo Horizonte', value: Math.floor(Math.random() * 101) },
+    { name: 'Patos de Minas', value: Math.floor(Math.random() * 101) },
+    { name: 'Uberlândia', value: Math.floor(Math.random() * 101) },
+    { name: 'Santana de Cataguases', value: Math.floor(Math.random() * 101) },
+    { name: 'Tiros', value: Math.floor(Math.random() * 101) },
+    { name: 'Uberaba', value: Math.floor(Math.random() * 101) },
+    { name: 'Vargem Bonita', value: Math.floor(Math.random() * 101) },
+    { name: 'Governador Valadares', value: Math.floor(Math.random() * 101) },
+    { name: 'São João del Rei', value: Math.floor(Math.random() * 101) },
+    { name: 'Borda da Mata', value: Math.floor(Math.random() * 101) },
+    { name: 'Brumadinho', value: Math.floor(Math.random() * 101) },
+    { name: 'Extrema', value: Math.floor(Math.random() * 101) },
+    { name: 'Barra Longa', value: Math.floor(Math.random() * 101) },
+    { name: 'Barroso', value: Math.floor(Math.random() * 101) },
+    { name: 'Cambuí', value: Math.floor(Math.random() * 101) },
+    { name: 'Cambuquira', value: Math.floor(Math.random() * 101) },
+    { name: 'Campanha', value: Math.floor(Math.random() * 101) },
+    { name: 'Caraí', value: Math.floor(Math.random() * 101) },
+    { name: 'Engenheiro Caldas', value: Math.floor(Math.random() * 101) },
+    { name: 'Entre Folhas', value: Math.floor(Math.random() * 101) },
+    { name: 'Felixlândia', value: Math.floor(Math.random() * 101) },
+    { name: 'Fernandes Tourinho', value: Math.floor(Math.random() * 101) },
+    { name: 'Guarani', value: Math.floor(Math.random() * 101) },
+    { name: 'Igarapé', value: Math.floor(Math.random() * 101) },
+    { name: 'Ipiaçu', value: Math.floor(Math.random() * 101) },
+    { name: 'Jacutinga', value: Math.floor(Math.random() * 101) },
+    { name: 'Luisburgo', value: Math.floor(Math.random() * 101) },
+    { name: 'Medina', value: Math.floor(Math.random() * 101) },
+    { name: 'Lassance', value: Math.floor(Math.random() * 101) },
+    { name: 'Passabém', value: Math.floor(Math.random() * 101) },
   ];
 
   res.json(response);

diff --git a/api/src/routes/rankingRoute.ts b/api/src/routes/rankingRoute.ts
@@ -21,12 +21,6 @@ const router = Router();
  *           type: string
  *         required: true
  *         description: Etapa de ensino
- *       - in: query
- *         name: ordem
- *         schema:
- *           type: string
- *         required: true
- *         description: Ordem do ranking
  *     responses:
  *       200:
  *         description: Ranking de municípios

diff --git a/api/src/services/matriculasServices.ts b/api/src/services/matriculasServices.ts
@@ -43,7 +43,7 @@ export class MatriculasService {
 
     data.forEach((entry) => {
       if (entry.etapa !== input.etapa || entry.municipio.toString() !== input.municipio) {
-        throw new Error('entry.etapa');
+        throw new Error('Erro ao processar solicitação.');
       }
 
       if (