Merge remote-tracking branch 'origin/v1.11.9'

CHANGELOG.md

@@ -4,6 +4,11 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## 1.11.9 - 2019-07-25
+## Changed
+- Course count order fix
+- Course count missing fix
+
 ## 1.11.8 = 2019-07-19
 ## Changed
 - Remove /user route

src/libs/routes/courseCount.js

@@ -398,17 +398,16 @@ rqf.addField({
     }
 });
 
-courseCountApp.get('/', rqf.parse(), rqf.build(), (req, res, next) => {
+courseCountApp.get('/', rqf.parse(), (req, res, next) => {
     req.sql.from('curso_ens_superior')
         .field('COUNT(curso_ens_superior.cod_curso)', 'total')
         .field("'Brasil'", 'name')
         .field('curso_ens_superior.ano_censo', 'year')
         .group('curso_ens_superior.ano_censo')
         .order('curso_ens_superior.ano_censo')
-        .where('curso_ens_superior.tipo_atributo_ingresso <> 1')
+        .where('curso_ens_superior.tipo_atributo_ingresso <> 1 OR curso_ens_superior.tipo_atributo_ingresso is NULL')
         .where('curso_ens_superior.cod_nivel_academico = 1');
-
     next();
-}, query, addMissing(rqf), id2str.transform(), response('course_count'));
+}, rqf.build(), query, id2str.transform(), addMissing(rqf), response('course_count'));
 
 module.exports = courseCountApp;