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

CHANGELOG.md

@@ -4,6 +4,10 @@ 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.6 - 2019-07-11
+## Changed
+- Return haveSportsCourtCoverage and haveCourtyardCoverage = [] in route school_infrastructure 
+
 ## 1.11.5 - 2019-07-09
 ## Changed
  - Fix integral time

src/libs/routes/schoolInfrastructure.js

@@ -471,7 +471,7 @@ infrastructureApp.get('/', rqf.parse(), rqf.build(), (req, res, next) => {
     allSportsCourtCoverage.where('escola.quadra_esportes_descoberta = 1');
     req.queryIndex.allSportsCourtCoverage = req.querySet.push(allSportsCourtCoverage) -1;
 
-    req.queryIndex.haveSportsCourtCoverage = req.queryIndex.allSportsCourtCoverage;
+    req.queryIndex.haveSportsCourtCoverage = req.queryIndex.allSportsCourtCoverage; // It must be []
 
     req.queryIndex.needSportsCourtCoverage = req.queryIndex.allSportsCourtCoverage;
 
@@ -491,7 +491,7 @@ infrastructureApp.get('/', rqf.parse(), rqf.build(), (req, res, next) => {
     allCourtyardCoverage.where('escola.patio = 1');
     req.queryIndex.allCourtyardCoverage = req.querySet.push(allCourtyardCoverage) - 1;
 
-    req.queryIndex.haveCourtyardCoverage = req.queryIndex.allCourtyardCoverage;
+    req.queryIndex.haveCourtyardCoverage = req.queryIndex.allCourtyardCoverage; // It must be []
 
     req.queryIndex.needCourtyardCoverage = req.queryIndex.allCourtyardCoverage;
 
@@ -685,6 +685,7 @@ infrastructureApp.get('/', rqf.parse(), rqf.build(), (req, res, next) => {
     let urban_schools_in_school_buildings = req.result[req.queryIndex.allUrbanSchools];
     let country_schools_in_school_buildings = req.result[req.queryIndex.allCountrySchools];
     let schools_not_in_school_buildings = req.result[req.queryIndex.allSchoolsNotSchoolBuilding];
+
     // Faz o matching entre os resultados
     let libraries = matchQueries(req.result[req.queryIndex.allLibraries], req.result[req.queryIndex.haveLibraries], req.result[req.queryIndex.needLibraries]);
     let libraries_reading_room = matchQueries(req.result[req.queryIndex.allLibrariesReadingRoom], req.result[req.queryIndex.haveLibrariesReadingRoom], req.result[req.queryIndex.needLibrariesReadingRoom]);
@@ -693,9 +694,9 @@ infrastructureApp.get('/', rqf.parse(), rqf.build(), (req, res, next) => {
     let kids_park = matchQueries(req.result[req.queryIndex.allKidsPark], req.result[req.queryIndex.haveKidsPark], req.result[req.queryIndex.needKidsPark]);
     let nursery = matchQueries(req.result[req.queryIndex.allCribs], req.result[req.queryIndex.haveCribs], req.result[req.queryIndex.needCribs]);
     let sports_court = matchQueries(req.result[req.queryIndex.allSportsCourt], req.result[req.queryIndex.haveSportsCourt], req.result[req.queryIndex.needSportsCourt]);
-    let sports_court_coverage = matchQueries(req.result[req.queryIndex.allSportsCourtCoverage], req.result[req.queryIndex.haveSportsCourtCoverage], req.result[req.queryIndex.needSportsCourtCoverage], true);
+    let sports_court_coverage = matchQueries(req.result[req.queryIndex.allSportsCourtCoverage], [], req.result[req.queryIndex.needSportsCourtCoverage], true); // have = []
     let courtyard = matchQueries(req.result[req.queryIndex.allCourtyard], req.result[req.queryIndex.haveCourtyard], req.result[req.queryIndex.needCourtyard]);
-    let courtyard_coverage = matchQueries(req.result[req.queryIndex.allCourtyardCoverage], req.result[req.queryIndex.haveCourtyardCoverage], req.result[req.queryIndex.needCourtyardCoverage], true);
+    let courtyard_coverage = matchQueries(req.result[req.queryIndex.allCourtyardCoverage], [], req.result[req.queryIndex.needCourtyardCoverage], true); // have = []
     let director_room = matchQueries(req.result[req.queryIndex.allDirectorRoom], req.result[req.queryIndex.haveDirectorRoom], req.result[req.queryIndex.needDirectorRoom]);
     let secretary = matchQueries(req.result[req.queryIndex.allSecretary], req.result[req.queryIndex.haveSecretary], req.result[req.queryIndex.needSecretary]);
     let teacher_room = matchQueries(req.result[req.queryIndex.allTeacherRoom], req.result[req.queryIndex.haveTeacherRoom], req.result[req.queryIndex.needTeacherRoom]);