From 767d7ffa7173ac8332addb4af2750d8be4b43d93 Mon Sep 17 00:00:00 2001
From: Fernando Gbur <fgs21@inf.ufpr.br>
Date: Mon, 15 Jul 2024 17:32:31 -0400
Subject: [PATCH] [ADD] Trying to use multiple queries in the new route
---
src/libs/routes_v1/rateSchoolNew.js | 25 ++++++++++++++++++++++---
1 file changed, 22 insertions(+), 3 deletions(-)
diff --git a/src/libs/routes_v1/rateSchoolNew.js b/src/libs/routes_v1/rateSchoolNew.js
index 6980fd80..45c00e65 100644
--- a/src/libs/routes_v1/rateSchoolNew.js
+++ b/src/libs/routes_v1/rateSchoolNew.js
@@ -32,6 +32,8 @@ const response = require(`${libs}/middlewares/response`);
const ReqQueryFields = require(`${libs}/middlewares/reqQueryFields`);
+const multiQuery = require(`${libs}/middlewares/multiQuery`);
+
const id2str = require(`${libs}/middlewares/id2str`);
const config = require(`${libs}/config`);
@@ -311,7 +313,10 @@ rqf.addField({
});
rateSchoolNewApp.get('/', rqf.parse(), rqf.build(), (req, res, next) => {
- req.sql.from('pnad_novo')
+ req.querySet = []
+
+ let attends_school = req.sql.clone()
+ attends_school.from('pnad_novo')
.field('round(sum(pnad_novo.peso_domicilio_pessoas_com_cal), 0)', 'total')
.field('pnad_novo.faixa_etaria')
.field('pnad_novo.ano_ref', 'year')
@@ -320,8 +325,22 @@ rateSchoolNewApp.get('/', rqf.parse(), rqf.build(), (req, res, next) => {
.group('pnad_novo.faixa_etaria')
.order('pnad_novo.ano_ref')
.order('pnad_novo.faixa_etaria')
- console.log(req.sql.toString())
+ req.querySet.push(attends_school)
+
+ let full_population = req.sql.clone()
+ full_population.from('pnad_novo')
+ .field('round(sum(pnad_novo.peso_domicilio_pessoas_com_cal), 0)', 'total')
+ .field('pnad_novo.faixa_etaria')
+ .field('pnad_novo.ano_ref', 'year')
+ .where('pnad_novo.ano_ref >= 2019')
+ .group('pnad_novo.ano_ref')
+ .group('pnad_novo.faixa_etaria')
+ .order('pnad_novo.ano_ref')
+ .order('pnad_novo.faixa_etaria')
+
next();
-}, query, id2str.transform(false), response('rate_school_new'));
+}, multiQuery, (req, res, next) => {
+ console.log(req.result)
+}, id2str.transform(false), response('rateSchoolNew'));
module.exports = rateSchoolNewApp;
--
GitLab