From 1998c40928f1aa3ce1486bfc43b4887f7ec2bf50 Mon Sep 17 00:00:00 2001
From: Lewis <lgtg20@inf.ufpr.br>
Date: Thu, 27 Feb 2025 10:12:16 -0300
Subject: [PATCH] feat: add studentRevenueParser middleware to handle city and
 region filter logic

---
 src/libs/middlewares/studentRevenueParser.js | 23 ++++++++++++++++++++
 src/libs/routes_v1/api.js                    |  3 ++-
 src/libs/routes_v1/studentRevenue.js         | 18 +++++++++++++--
 3 files changed, 41 insertions(+), 3 deletions(-)
 create mode 100644 src/libs/middlewares/studentRevenueParser.js

diff --git a/src/libs/middlewares/studentRevenueParser.js b/src/libs/middlewares/studentRevenueParser.js
new file mode 100644
index 00000000..954c9c82
--- /dev/null
+++ b/src/libs/middlewares/studentRevenueParser.js
@@ -0,0 +1,23 @@
+/*
+Middleware que remove o campo "region" quando o campo "city" está ativo nos filtros.
+Devido à limitações na tabela de dados, quando ambos campos estão ativos o filtro por
+"região" funciona incorretamente. 
+*/
+module.exports = function studentRevenueParser(req, res, next) {
+    console.log(req.query);
+
+    if (req.query && req.query.filter) {
+        const jsonString = `{${req.query.filter.replace(/(\w+):/g, '"$1":')}}`;
+        const obj = JSON.parse(jsonString);
+
+        if ("city" in obj && "region" in obj) {
+            delete obj.region;
+            const customString = Object.entries(obj)
+                .map(([key, value]) => `${key}:"${value}"`)
+                .join(',');
+            req.query.filter = customString;
+        }
+    }
+
+    next();
+};
diff --git a/src/libs/routes_v1/api.js b/src/libs/routes_v1/api.js
index b9af6769..84306018 100644
--- a/src/libs/routes_v1/api.js
+++ b/src/libs/routes_v1/api.js
@@ -174,6 +174,7 @@ const adjustedLiquidFrequency = require(`${libs}/routes_v1/adjustedLiquidFrequen
 const iliteracyRate = require(`${libs}/routes_v1/iliteracyRate`);
 
 const studentRevenue = require(`${libs}/routes_v1/studentRevenue`);
+const studentRevenueParser = require(`${libs}/middlewares/studentRevenueParser`);
 
 api.get('/', (req, res) => {
     res.json({ msg: 'SimCAQ API v1 is running' });
@@ -249,7 +250,7 @@ api.use('/superior_education_conclusion_tax', superiorEducationConclusionTax)
 api.use('/basic_education_conclusion', basicEducationConclusion);
 api.use('/adjusted_liquid_frequency', adjustedLiquidFrequency);
 api.use('/iliteracy_rate', iliteracyRate);
-api.use('/student_revenue', studentRevenue);
+api.use('/student_revenue', studentRevenueParser, studentRevenue);
 
 //Publication 
 api.use('/publication', publication);
diff --git a/src/libs/routes_v1/studentRevenue.js b/src/libs/routes_v1/studentRevenue.js
index efce47c5..4b8c334e 100644
--- a/src/libs/routes_v1/studentRevenue.js
+++ b/src/libs/routes_v1/studentRevenue.js
@@ -79,12 +79,26 @@ rqf.addField({
         type: 'integer',
         field: 'ano'
     }
+}).addValue({
+    name: 'region',
+    table: 'estado',
+    tableField: ['nome_ente', 'cod_ibge', 'id', 'regiao_id'],
+    resultField: ['state_name', 'state_cod_ibge', 'state_id', 'region_id'],
+    where: {
+        relation: '=',
+        type: 'integer',
+        field: 'regiao_id',
+    },
+    join: {
+        primary: 'id',
+        foreign: 'cod_ibge',
+        foreignTable: 'receitas'
+    }
 })
 
 studentRevenueApp.get('/', rqf.parse(), rqf.build(),  (req, res, next) => {
-
     if (req.query.dims && req.query.dims.includes('receitas')) {
-        let whereCondition = "";
+        let whereCondition = req.query.filter.includes("region") ? "" : "receitas.cod_ibge = 0";
         let filterId;
         const filters = req.query.filter.split(",");
         filters.forEach((filter) => {
-- 
GitLab