From a9c687313703f36b1f4a6f0ae580be3f3165449e Mon Sep 17 00:00:00 2001 From: Timo Volkmann Date: Fri, 19 Jun 2020 15:56:31 +0200 Subject: [PATCH] score and search handler cleanup --- backend/routes/search.js | 44 ++++++++++++++++++----------- backend/util/oldToNewQuerySyntax.js | 6 ++-- backend/util/scoreAndSearch.js | 14 ++------- 3 files changed, 35 insertions(+), 29 deletions(-) diff --git a/backend/routes/search.js b/backend/routes/search.js index e78be37..3933abb 100644 --- a/backend/routes/search.js +++ b/backend/routes/search.js @@ -3,8 +3,7 @@ const _ = require('lodash') const getSearchPresets = require("../models/getSearchPresets.js"); const base64 = require("../util/base64.js") const sas = require("../util/scoreAndSearch.js"); -const { filter } = require("lodash"); - +const oldToNewQuerySyntax = require("../util/oldToNewQuerySyntax.js") module.exports = dbConn => { router.get("/api/v1/search", searchHandler(dbConn)); @@ -38,21 +37,11 @@ function searchHandler(dbConn) { let q = req.query.q ? base64.base64ToObj(req.query.q) : req.query console.log('Q:', q) + // transform syntax and seperate climate queries from price queries + q = oldToNewQuerySyntax(q) // CHOOSE PARAMS WHICH SHALL BE PASSED TO SCORE AND SEARCH - let scoreQueryObj = {} - if (q.temperature) scoreQueryObj['temperature_mean_max'] = q.temperature - if (q.temperature_mean_max) scoreQueryObj['temperature_mean_max'] = q.temperature_mean_max - if (q.precipitation) scoreQueryObj['precipitation'] = q.precipitation - if (q.rain_days) scoreQueryObj['rain_days'] = q.rain_days - if (q.sun_hours) scoreQueryObj['sun_hours'] = q.sun_hours + let scoreQueryObj = prepareQueries(q) - if (q.accommodation_costs) scoreQueryObj['accommodation_costs'] = q.accommodation_costs - if (q.food_costs) scoreQueryObj['food_costs'] = q.food_costs - if (q.alcohol_costs) scoreQueryObj['alcohol_costs'] = q.alcohol_costs - if (q.water_costs) scoreQueryObj['water_costs'] = q.water_costs - if (q.local_transportation_costs) scoreQueryObj['local_transportation_costs'] = q.local_transportation_costs - if (q.entertainment_costs) scoreQueryObj['entertainment_costs'] = q.entertainment_costs - if (q.average_per_day_costs) scoreQueryObj['average_per_day_costs'] = q.average_per_day_costs scoreAndSearch(q.from, q.to, scoreQueryObj).then(searchResults => { @@ -93,4 +82,27 @@ function filterByString(searchResults, filterString, boolFulltext) { } return name.includes(filterString) || country.includes(filterString) }) -} \ No newline at end of file +} + +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 +} diff --git a/backend/util/oldToNewQuerySyntax.js b/backend/util/oldToNewQuerySyntax.js index 17d2168..87a5241 100644 --- a/backend/util/oldToNewQuerySyntax.js +++ b/backend/util/oldToNewQuerySyntax.js @@ -1,5 +1,7 @@ -exports.oldToNewQuerySyntax = function (queries) { - let res = {} +const _ = require('lodash') + +module.exports = function (queries) { + let res = _.clone(queries) try { if (queries.temperature_mean_max) res.temperature_mean_max = [Number(queries.temperature_mean_max.split(',')[0]), Number(queries.temperature_mean_max.split(',')[1])] if (queries.precipitation) res.precipitation = [Number(queries.precipitation.split(',')[0]), Number(queries.precipitation.split(',')[1])] diff --git a/backend/util/scoreAndSearch.js b/backend/util/scoreAndSearch.js index 442d1e1..3f3d2b8 100644 --- a/backend/util/scoreAndSearch.js +++ b/backend/util/scoreAndSearch.js @@ -1,8 +1,6 @@ const _ = require('lodash') const moment = require("moment") const getClimateMinMax = require("./getClimateMinMax.js") -const oldToNewQuerySyntax = require("./oldToNewQuerySyntax.js") -const getAllRegionsWithClimatePerMonth = require('./getAllRegionsWithClimatePerMonth') const score = require('./score') const getRegions = require('../models/getRegions.js') @@ -23,10 +21,10 @@ const MULTIPLIER = { } module.exports = function (dbConn) { - return async function (from, to, queries) { + return async function (from, to, q) { console.log('search') - console.log((_.isEmpty(to) || _.isEmpty(from)) && !_.isEmpty(queries)) - if ((_.isEmpty(to) || _.isEmpty(from)) && !_.isEmpty(queries)) { + console.log((_.isEmpty(to) || _.isEmpty(from)) && !_.isEmpty(q)) + if ( (_.isEmpty(to) || _.isEmpty(from)) && (!_.isEmpty(q.climate) || !_.isEmpty(q.costs)) ) { throw new Error('invalid query') } // PREPARE SEARCH @@ -35,12 +33,6 @@ module.exports = function (dbConn) { // for calculating average if traveldates are in more than one month const travelPeriods = travelPeriodsFromDates(dates) - // transform syntax and seperate climate queries from price queries - queries = oldToNewQuerySyntax.oldToNewQuerySyntax(queries) - console.log(queries) - const q = prepareQueries(queries) - console.log('q', q) - // FETCH DATA FROM DB const boundaryClimate = await getClimateMinMax.getClimateMinMax(dbConn)