From 25b33a2b8844332eccd40c237610ea7d0b184c21 Mon Sep 17 00:00:00 2001
From: Vytor Calixto <vytorcalixto@gmail.com>
Date: Fri, 29 Sep 2017 09:53:11 -0300
Subject: [PATCH] Fix years in idh and ibge routes

---
 src/libs/routes/idhm.js         | 8 ++++----
 src/libs/routes/idhme.js        | 8 ++++----
 src/libs/routes/idhml.js        | 8 ++++----
 src/libs/routes/idhmr.js        | 8 ++++----
 src/libs/routes/pibpercapita.js | 4 ++--
 src/libs/routes/population.js   | 4 ++--
 6 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/src/libs/routes/idhm.js b/src/libs/routes/idhm.js
index 838e20bd..d8d013fa 100644
--- a/src/libs/routes/idhm.js
+++ b/src/libs/routes/idhm.js
@@ -28,13 +28,13 @@ idhmApp.get('/year_range', (req, res, next) => {
     req.sql.from('adh_idh')
     .field('MIN(adh_idh.ano_censo)', 'start_year')
     .field('MAX(adh_idh.ano_censo)', 'end_year')
-    .where('adh_idh.ano_censo > 2014');
+    .where('adh_idh.ano_censo <> 2014 AND adh_idh.ano_censo <> 2013');
     next();
 }, query, (req, res, next) => {
     req.sql.from('adh_idh_uf')
     .field('MIN(adh_idh_uf.ano_censo)', 'start_year')
     .field('MAX(adh_idh_uf.ano_censo)', 'end_year')
-    .where('adh_idh_uf.ano_censo > 2014');
+    .where('adh_idh_uf.ano_censo <> 2014 AND adh_idh_uf.ano_censo <> 2013');
     req.old_result = req.result;
     next();
 }, query, (req, res, next) => {
@@ -52,7 +52,7 @@ idhmApp.get('/year_range', (req, res, next) => {
 idhmApp.get('/years', (req, res, next) => {
     req.sql.from('adh_idh')
     .field('DISTINCT adh_idh.ano_censo', 'year')
-    .where('adh_idh.ano_censo > 2014');
+    .where('adh_idh.ano_censo <> 2014 AND adh_idh.ano_censo <> 2013');
     next();
 }, query, (req, res, next) => {
     req.oldResult = req.result;
@@ -61,7 +61,7 @@ idhmApp.get('/years', (req, res, next) => {
 
     req.sql.from('adh_idh_uf')
     .field('DISTINCT adh_idh_uf.ano_censo', 'year')
-    .where('adh_idh_uf.ano_censo > 2014');
+    .where('adh_idh_uf.ano_censo <> 2014 AND adh_idh_uf.ano_censo <> 2013');
     next();
 }, query, (req, res, next) => {
     let result = Object.assign(req.oldResult, req.result);
diff --git a/src/libs/routes/idhme.js b/src/libs/routes/idhme.js
index ec6c2df4..e061a2a1 100644
--- a/src/libs/routes/idhme.js
+++ b/src/libs/routes/idhme.js
@@ -26,13 +26,13 @@ idhmeApp.get('/year_range', (req, res, next) => {
     req.sql.from('adh_idh')
     .field('MIN(adh_idh.ano_censo)', 'start_year')
     .field('MAX(adh_idh.ano_censo)', 'end_year')
-    .where('adh_idh.ano_censo > 2014');
+    .where('adh_idh.ano_censo <> 2014 AND adh_idh.ano_censo <> 2013');
     next();
 }, query, (req, res, next) => {
     req.sql.from('adh_idh_uf')
     .field('MIN(adh_idh_uf.ano_censo)', 'start_year')
     .field('MAX(adh_idh_uf.ano_censo)', 'end_year')
-    .where('adh_idh_uf.ano_censo > 2014');
+    .where('adh_idh_uf.ano_censo <> 2014 AND adh_idh_uf.ano_censo <> 2013');
     req.old_result = req.result;
     next();
 }, query, (req, res, next) => {
@@ -50,7 +50,7 @@ idhmeApp.get('/year_range', (req, res, next) => {
 idhmeApp.get('/years', (req, res, next) => {
     req.sql.from('adh_idh')
     .field('DISTINCT adh_idh.ano_censo', 'year')
-    .where('adh_idh.ano_censo > 2014');
+    .where('adh_idh.ano_censo <> 2014 AND adh_idh.ano_censo <> 2013');
     next();
 }, query, (req, res, next) => {
     req.oldResult = req.result;
@@ -59,7 +59,7 @@ idhmeApp.get('/years', (req, res, next) => {
 
     req.sql.from('adh_idh_uf')
     .field('DISTINCT adh_idh_uf.ano_censo', 'year')
-    .where('adh_idh_uf.ano_censo > 2014');;
+    .where('adh_idh_uf.ano_censo <> 2014 AND adh_idh_uf.ano_censo <> 2013');
     next();
 }, query, (req, res, next) => {
     let result = Object.assign(req.oldResult, req.result);
diff --git a/src/libs/routes/idhml.js b/src/libs/routes/idhml.js
index 093bb750..dba2ccc9 100644
--- a/src/libs/routes/idhml.js
+++ b/src/libs/routes/idhml.js
@@ -26,13 +26,13 @@ idhmlApp.get('/year_range', (req, res, next) => {
     req.sql.from('adh_idh')
     .field('MIN(adh_idh.ano_censo)', 'start_year')
     .field('MAX(adh_idh.ano_censo)', 'end_year')
-    .where('adh_idh.ano_censo > 2014');
+    .where('adh_idh.ano_censo <> 2014 AND adh_idh.ano_censo <> 2013');
     next();
 }, query, (req, res, next) => {
     req.sql.from('adh_idh_uf')
     .field('MIN(adh_idh_uf.ano_censo)', 'start_year')
     .field('MAX(adh_idh_uf.ano_censo)', 'end_year')
-    .where('adh_idh_uf.ano_censo > 2014');
+    .where('adh_idh_uf.ano_censo <> 2014 AND adh_idh_uf.ano_censo <> 2013');
     req.old_result = req.result;
     next();
 }, query, (req, res, next) => {
@@ -50,7 +50,7 @@ idhmlApp.get('/year_range', (req, res, next) => {
 idhmlApp.get('/years', (req, res, next) => {
     req.sql.from('adh_idh')
     .field('DISTINCT adh_idh.ano_censo', 'year')
-    .where('adh_idh.ano_censo > 2014');
+    .where('adh_idh.ano_censo <> 2014 AND adh_idh.ano_censo <> 2013');
     next();
 }, query, (req, res, next) => {
     req.oldResult = req.result;
@@ -59,7 +59,7 @@ idhmlApp.get('/years', (req, res, next) => {
 
     req.sql.from('adh_idh_uf')
     .field('DISTINCT adh_idh_uf.ano_censo', 'year')
-    .where('adh_idh_uf.ano_censo > 2014');
+    .where('adh_idh_uf.ano_censo <> 2014 AND adh_idh_uf.ano_censo <> 2013');
     next();
 }, query, (req, res, next) => {
     let result = Object.assign(req.oldResult, req.result);
diff --git a/src/libs/routes/idhmr.js b/src/libs/routes/idhmr.js
index e565b92c..9a8bcf7b 100644
--- a/src/libs/routes/idhmr.js
+++ b/src/libs/routes/idhmr.js
@@ -28,13 +28,13 @@ idhmrApp.get('/year_range', (req, res, next) => {
     req.sql.from('adh_idh')
     .field('MIN(adh_idh.ano_censo)', 'start_year')
     .field('MAX(adh_idh.ano_censo)', 'end_year')
-    .where('adh_idh.ano_censo > 2014');
+    .where('adh_idh.ano_censo <> 2014 AND adh_idh.ano_censo <> 2013');
     next();
 }, query, (req, res, next) => {
     req.sql.from('adh_idh_uf')
     .field('MIN(adh_idh_uf.ano_censo)', 'start_year')
     .field('MAX(adh_idh_uf.ano_censo)', 'end_year')
-    .where('adh_idh_uf.ano_censo > 2014');
+    .where('adh_idh_uf.ano_censo <> 2014 AND adh_idh_uf.ano_censo <> 2013');
     req.old_result = req.result;
     next();
 }, query, (req, res, next) => {
@@ -52,7 +52,7 @@ idhmrApp.get('/year_range', (req, res, next) => {
 idhmrApp.get('/years', (req, res, next) => {
     req.sql.from('adh_idh')
     .field('DISTINCT adh_idh.ano_censo', 'year')
-    .where('adh_idh.ano_censo > 2014');
+    .where('adh_idh.ano_censo <> 2014 AND adh_idh.ano_censo <> 2013');
     next();
 }, query, (req, res, next) => {
     req.oldResult = req.result;
@@ -61,7 +61,7 @@ idhmrApp.get('/years', (req, res, next) => {
 
     req.sql.from('adh_idh_uf')
     .field('DISTINCT adh_idh_uf.ano_censo', 'year')
-    .where('adh_idh_uf.ano_censo > 2014');
+    .where('adh_idh_uf.ano_censo <> 2014 AND adh_idh_uf.ano_censo <> 2013');
     next();
 }, query, (req, res, next) => {
     let result = Object.assign(req.oldResult, req.result);
diff --git a/src/libs/routes/pibpercapita.js b/src/libs/routes/pibpercapita.js
index a6078c3a..83d914a3 100644
--- a/src/libs/routes/pibpercapita.js
+++ b/src/libs/routes/pibpercapita.js
@@ -28,14 +28,14 @@ pibpercapitaApp.get('/year_range', (req, res, next) => {
     req.sql.from('ibge_pib')
     .field('MIN(ibge_pib.ano_censo)', 'start_year')
     .field('MAX(ibge_pib.ano_censo)', 'end_year')
-    .where('ibge_pib.ano_censo > 2014');
+    .where('ibge_pib.ano_censo <> 2014 AND ibge_pib.ano_censo <> 2013');
     next();
 }, query, response('range'));
 
 pibpercapitaApp.get('/years', (req, res, next) => {
     req.sql.from('ibge_pib').
     field('DISTINCT ibge_pib.ano_censo', 'year')
-    .where('ibge_pib.ano_censo > 2014');
+    .where('ibge_pib.ano_censo <> 2014 AND ibge_pib.ano_censo <> 2013');
     next();
 }, query, response('years'));
 
diff --git a/src/libs/routes/population.js b/src/libs/routes/population.js
index 14b3ba0a..1d582c55 100644
--- a/src/libs/routes/population.js
+++ b/src/libs/routes/population.js
@@ -28,14 +28,14 @@ populationApp.get('/year_range', (req, res, next) => {
     req.sql.from('ibge_populacao')
     .field('MIN(ibge_populacao.ano_censo)', 'start_year')
     .field('MAX(ibge_populacao.ano_censo)', 'end_year')
-    .where('ibge_populacao.ano_censo > 2014');
+    .where('ibge_populacao.ano_censo <> 2014 AND ibge_populacao.ano_censo <> 2013');
     next();
 }, query, response('range'));
 
 populationApp.get('/years', (req, res, next) => {
     req.sql.from('ibge_populacao').
     field('DISTINCT ibge_populacao.ano_censo', 'year')
-    .where('ibge_populacao.ano_censo > 2014');
+    .where('ibge_populacao.ano_censo <> 2014 AND ibge_populacao.ano_censo <> 2013');
     next();
 }, query, response('years'));
 
-- 
GitLab