From c602e75f33da7969140ce8e9f03e08234a06c628 Mon Sep 17 00:00:00 2001 From: Timo Volkmann Date: Fri, 19 Jun 2020 16:43:36 +0200 Subject: [PATCH] quickfix for inverted logic --- backend/routes/search.js | 2 +- backend/util/scoreAndSearch.js | 23 ----------------------- 2 files changed, 1 insertion(+), 24 deletions(-) diff --git a/backend/routes/search.js b/backend/routes/search.js index 3933abb..0f1427f 100644 --- a/backend/routes/search.js +++ b/backend/routes/search.js @@ -54,7 +54,7 @@ function searchHandler(dbConn) { } // FILTER NULLSCORES - if (_.get(q, 'showRegionsWithNullScore', false)) { + if (!_.get(q, 'showRegionsWithNullScore', false)) { console.log('without null scores'); response = response.filter(el => !_.some(el.scores, score => _.isNaN(score.score) || _.isNull(score.score) || _.isUndefined(score.score)))//.filter(el => !_.isNaN(el.score)) } diff --git a/backend/util/scoreAndSearch.js b/backend/util/scoreAndSearch.js index 3f3d2b8..e7d5f41 100644 --- a/backend/util/scoreAndSearch.js +++ b/backend/util/scoreAndSearch.js @@ -102,29 +102,6 @@ module.exports = function (dbConn) { return _.round(sum / cnt, 2) } - function prepareQueries(queries) { - let q = { - climate: {}, - costs: {} - } - // climate - if (queries.temperature_mean_max) q.climate.temperature_mean_max = queries.temperature_mean_max - if (queries.precipitation) q.climate.precipitation = queries.precipitation - if (queries.rain_days) q.climate.rain_days = queries.rain_days - if (queries.sun_hours) q.climate.sun_hours = queries.sun_hours - - // costs - if (queries.accommodation_costs) q.costs.accommodation_costs = queries.accommodation_costs - if (queries.food_costs) q.costs.food_costs = queries.food_costs - if (queries.alcohol_costs) q.costs.alcohol_costs = queries.alcohol_costs - if (queries.water_costs) q.costs.water_costs = queries.water_costs - if (queries.local_transportation_costs) q.costs.local_transportation_costs = queries.local_transportation_costs - if (queries.entertainment_costs) q.costs.entertainment_costs = queries.entertainment_costs - if (queries.average_per_day_costs) q.costs.average_per_day_costs = queries.average_per_day_costs - - return q - } - function travelPeriodsFromDates(dates) { //console.log(dates);