From 81e2d2b16c72f5b60f8b7e7ca81e8b1efffcfc3f Mon Sep 17 00:00:00 2001
From: MateusHerbele <mateusherbelemc@gmail.com>
Date: Thu, 10 Apr 2025 11:36:39 -0300
Subject: [PATCH 1/2] [fix] convert/expenses.js

---
 src/libs/convert/expenses.js | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/src/libs/convert/expenses.js b/src/libs/convert/expenses.js
index 2d8ff384..874cd0f4 100644
--- a/src/libs/convert/expenses.js
+++ b/src/libs/convert/expenses.js
@@ -21,13 +21,22 @@ along with simcaq-node.  If not, see <https://www.gnu.org/licenses/>.
 module.exports = function regionCode(id) {
     switch (id) {
         case 1:
-        return 'Rede pública (anual)'
+            return "Ano";
         case 2:
-        return 'Rede pública (mensal)';
+            return "Entidade";
         case 3:
-        return 'Rede pública e conveniada (anual)';
+            return 'Despesas';
         case 4:
-        return 'Rede pública e conveniada (mensal)';
+            return 'Matrículas Públicas';
+        case 5:
+            return 'Matrículas Públicas Mais Conveniada';
+        case 6:
+            return 'Despesas Aluno Ano Pública'
+        case 7:
+            return 'Despesas Aluno Mês Pública';
+        case 8:
+            return 'Despesas Aluno Ano Pública Mais Conveniada';
+        case 9:
+            return 'Despesas Aluno Mês Pública Mais Conveniada';
     }
 };
-
-- 
GitLab


From 1f42013b66eeea7220e13d53add1cd750494d415 Mon Sep 17 00:00:00 2001
From: Lewis <lgtg20@inf.ufpr.br>
Date: Mon, 14 Apr 2025 10:45:26 -0300
Subject: [PATCH 2/2] [feature] add region and state filters to
 adjustedLiquidFrequency query

---
 src/libs/routes_v1/adjustedLiquidFrequency.js | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/libs/routes_v1/adjustedLiquidFrequency.js b/src/libs/routes_v1/adjustedLiquidFrequency.js
index 0be735c8..09ce8efb 100644
--- a/src/libs/routes_v1/adjustedLiquidFrequency.js
+++ b/src/libs/routes_v1/adjustedLiquidFrequency.js
@@ -344,6 +344,9 @@ adjustedLiquidFrequency.get('/', rqf.parse(), (req, res, next) => {
         ${dimensions.income_range ? "AND total_pop.income_range_id = pnad_novo.faixa_rendimento_aux" : ""}
         ${dimensions.cap_code ? "AND total_pop.cap_code_id = pnad_novo.cod_cap" : ""}
         ${dimensions.metro_code ? "AND pnad_novo.cod_rm_ride <> 99 AND total_pop.metro_code_id = pnad_novo.cod_rm_ride" : ""}
+        ${dimensions.region ? "AND total_pop.region_id = pnad_novo.cod_regiao" : ""}
+        ${dimensions.state ? "AND total_pop.state_id = pnad_novo.cod_uf" : ""}
+
     `
 
     // Subquery: total_apoio_freq
@@ -393,6 +396,12 @@ adjustedLiquidFrequency.get('/', rqf.parse(), (req, res, next) => {
     if (dimensions.metro_code)
         mainQuery.field("total_apoio_freq.metro_code_id")
 
+    if (dimensions.region)
+        mainQuery.field("total_apoio_freq.region_id")
+
+    if (dimensions.state)
+        mainQuery.field("total_apoio_freq.state_id")
+
     req.sql = mainQuery;    
 
     next();
-- 
GitLab