Fix years and year_range subroutes

src/libs/routes/glossEnrollmentRatio.js

@@ -36,24 +36,31 @@ glossEnrollmentRatioApp.use(cache('15 day'));
 // Returns a tuple of start and ending years of the complete enrollments dataset.
 glossEnrollmentRatioApp.get('/year_range', (req, res, next) => {
     req.sql.from('pnad')
-    .field('MIN(pnad.ano_censo)', 'start_year')
-    .field('MAX(pnad.ano_censo)', 'end_year');
+    .field('DISTINCT pnad.ano_censo', 'year');
     next();
 }, query, (req, res, next) => {
+    req.oldResult = req.result;
+
+    req.sql = squel.select();
+
     req.sql.from('matricula')
-    .field('MIN(matricula.ano_censo)', 'start_year')
-    .field('MAX(matricula.ano_censo)', 'end_year');
-    req.old_result = req.result;
+    .field('DISTINCT matricula.ano_censo', 'year');
     next();
 }, query, (req, res, next) => {
-    if (req.old_result[0].start_year < req.result[0].start_year) {
-        req.result[0].start_year = req.old_result[0].start_year;
-    }
-    if (req.old_result[0].end_year > req.result[0].end_year) {
-        req.result[0].end_year = req.old_result[0].old_result;
+    let distinct_years = [];
+    let new_result = [];
+    for (let i = 0; i < req.oldResult.length; i++) {
+        log.debug(req.oldResult[i].year);
+        for (let j = 0; j < req.result.length; j++) {
+            if(req.oldResult[i].year == req.result[j].year) {
+                distinct_years.push(req.oldResult[i]);
+            }
+        }
     }
+    new_result.push({start_year: distinct_years[distinct_years.length -1].year, end_year: distinct_years[0].year});
+    req.result = new_result;
     next();
-}, query, response('range'));
+}, response('range'));
 
 glossEnrollmentRatioApp.get('/years', (req, res, next) => {
     req.sql.from('pnad')
@@ -68,8 +75,16 @@ glossEnrollmentRatioApp.get('/years', (req, res, next) => {
     .field('DISTINCT matricula.ano_censo', 'year');
     next();
 }, query, (req, res, next) => {
-    let result = Object.assign(req.oldResult, req.result);
-    req.result = result;
+    let new_result = []
+    for (let i = 0; i < req.oldResult.length; i++) {
+        log.debug(req.oldResult[i].year);
+        for (let j = 0; j < req.result.length; j++) {
+            if(req.oldResult[i].year == req.result[j].year) {
+                new_result.push(req.oldResult[i]);
+            }
+        }
+    }
+    req.result = new_result;
     next();
 }, response('years'));
 
@@ -328,7 +343,7 @@ glossEnrollmentRatioApp.get('/', rqf.parse(),(req, res, next) => {
 }, rqf.parse(), rqf.build(), query, (req, res, next) => {
     req.numerator = req.result;
     log.debug(req.denominator);
-    log.debug(req.numerator.length);
+    log.debug(req.numerator);
 
     next();
 }, response('glossEnrollmentRatio'));