Merge branch 'feature/tags-search-backend' into 'develop'

Feature/tags search backend

See merge request tjohn/cc-data!28

backend/models/getRegions.js

@@ -1,9 +1,8 @@
 const arrayFormatting = require("../util/databaseArrayFormatting.js");
-const { takeRightWhile } = require("lodash");
+const { allTagsWithValues } = require("./getTags.js");
 
 module.exports = async (dbConn) => {
-    const regions = await dbConn.query(
+    const sqlRegions = `SELECT regions.id AS region_id,
-        `SELECT regions.id AS region_id,
                 regions.region AS name,
                 countries.country AS country,
                 regions.description AS description,
@@ -43,7 +42,7 @@ module.exports = async (dbConn) => {
               GROUP BY rtma.region_id) rtma
         ON regions.id = rtma.region_id
         WHERE regions_byt.travelstyle = 1`
-    );
+    const [regions, tags] = await Promise.all([dbConn.query(sqlRegions), allTagsWithValues(dbConn)])
 
     for (k = 0; k < regions.length; k++) {
         regions[k].avg_price_relative = arrayFormatting(regions[k].avg_price_relative);
@@ -67,6 +66,12 @@ module.exports = async (dbConn) => {
         if (region.rain_days === null) region.rain_days = emptyArr
         if (region.sun_hours === null) region.sun_hours = emptyArr
         if (region.humidity === null) region.humidity = emptyArr
+
+        region.tags = tags.filter(tag => tag.region_id === region.region_id).map(tag => {
+            delete tag.region_id
+            return tag
+        })
+
         return region
     });
 };

backend/routes/search.js

@@ -7,7 +7,7 @@ const getSearchPresets = require("../models/getSearchPresets.js");
 // Utils
 const _ = require('lodash')
 const base64 = require("../util/base64.js")
-const sas = require("../util/scoreAndSearch.js");
+const scoreAndSearch = require("../util/scoreAndSearch.js");
 const oldToNewQuerySyntax = require("../util/oldToNewQuerySyntax.js")
 const { allTagsWithValues, getUniqueTags } = require("../models/getTags.js");
 const { getClimateMinMax } = require("../util/getClimateMinMax.js");
@@ -41,7 +41,6 @@ function presetHandler(dbConn) {
 }
 
 function searchHandler(dbConn) {
-  const scoreAndSearch = sas(dbConn)
   return async function (req, res) {
     let response = {}
 
@@ -62,10 +61,9 @@ function searchHandler(dbConn) {
     // CHOOSE PARAMS WHICH SHALL BE PASSED TO SCORE AND SEARCH
     let scoreQueryObj = prepareQueries(q)
 
-    let [regions, tags, boundaryClimate] = await Promise.all([getRegions(dbConn), allTagsWithValues(dbConn), getClimateMinMax(dbConn)])
+    let [regions, boundaryClimate] = await Promise.all([getRegions(dbConn), getClimateMinMax(dbConn)])
     let data = {
       regions: regions,
-      tags: tags,
       boundaryClimate: boundaryClimate
     }
 
@@ -154,6 +152,7 @@ function prepareQueries(queries) {
 
   // others
   if (queries.avg_price_relative) q.others.avg_price_relative = queries.avg_price_relative
+  if (queries.tags) q.others.tags = queries.tags
 
   return q
 }

backend/util/oldToNewQuerySyntax.js

@@ -17,7 +17,18 @@ module.exports = function (queries) {
     if (queries.local_transportation_costs) res.local_transportation_costs = [Number(queries.local_transportation_costs.split(',')[0]), Number(queries.local_transportation_costs.split(',')[1])]
     if (queries.entertainment_costs) res.entertainment_costs = [Number(queries.entertainment_costs.split(',')[0]), Number(queries.entertainment_costs.split(',')[1])]
     if (queries.average_per_day_costs) res.average_per_day_costs = [Number(queries.average_per_day_costs.split(',')[0]), Number(queries.average_per_day_costs.split(',')[1])]
+    
     if (queries.avg_price_relative) res.avg_price_relative = [Number(queries.avg_price_relative.split(',')[0]), Number(queries.avg_price_relative.split(',')[1])]
+    if (queries.tags) {
+        res.tags = []
+        if (queries.tags.includes(',')) {
+            res.tags.push(...queries.tags.split(',').map(el => el.trim()))
+        } else {
+            res.tags.push(queries.tags)
+        } 
+    }
+    // console.log(res);
+    
     //     console.log('queries successfully transformed');
     // } catch (error) {
     //     console.log('oldToNewQuerySyntax error');

backend/util/scoreAndSearch.js

@@ -22,13 +22,13 @@ const SETTINGS = {
   avg_price_relative: [3, 'easeOut', 2],
 }
 
-module.exports = function (dbConn) {
+module.exports = async function (data, from, to, q) {
-  return async function (data, from, to, q) {
   console.log('search')
+  console.log(q)
   if ((_.isNil(to) || _.isNil(from)) && !(_.isEmpty(q.climate) || _.isEmpty(q.costs) || _.isEmpty(q.others))) {
     throw new Error('invalid query')
   }
-    if (_.isNil(data) || _.isEmpty(data.regions) || _.isEmpty(data.tags) || _.isEmpty(data.boundaryClimate)) {
+  if (_.isNil(data) || _.isEmpty(data.regions) || _.isEmpty(data.boundaryClimate)) {
     throw new Error('database error')
   }
   let regionsArr = data.regions
@@ -64,8 +64,9 @@ module.exports = function (dbConn) {
   
   // CALCULATE PROPERTIES FOR EACH REGION
   regionsArr.forEach(reg => {
-      reg.scores = []
+
     // CALCULATE SCORES FOR CLIMATE PROPS
+    reg.scores = []
     Object.entries(q.climate).forEach(([key, value]) => {
       let finalScoreObj = calculateScoreForPeriod(key, travelPeriods, reg, value[0], value[1], data.boundaryClimate)
       reg.scores.push(finalScoreObj)
@@ -73,7 +74,7 @@ module.exports = function (dbConn) {
     
     // CALCULATE SCORES FOR PRICE PROPS
     Object.entries(q.costs).forEach(([key, value]) => {
-        let finalScoreObj = calculateSimpleScore(key, reg, value[0], value[1], boundaryStatic)
+      let finalScoreObj = scoreFromSimpleRegionProperty(key, reg, value[0], value[1], boundaryStatic)
       
       reg.scores.push(finalScoreObj)
     });
@@ -84,12 +85,17 @@ module.exports = function (dbConn) {
       reg.scores.push(offSeasonScoreObj)
     }
 
+    // CALCULATE SCORE FOR TAGS
+    if (_.has(q, 'others.tags')) {
+      reg.scores.push(...scoresFromTags(reg.tags, q.others.tags))
+    }
+    
     // CALCULATE PRICE TENDENCY FOR TIMEFRAME
     reg.price_tendency_relative = getAverageFromTrivago(travelPeriods, reg)
     
-      // CALCULATE SUM FOR ACCOMODATION FROM AVERAGE PRICES
+    // CALCULATE SUM FOR ACCOMODATION FROM AVERAGE PRICES AND APPROX LIFESTYLE COSTS
     reg.total_accommodation_costs = _.round(sumForRangeAvg(dates.from, dates.to, reg.accommodation_costs), 2)
-      //reg.total_avg_lifestyle = _.round(sumForRangeAvg(dates.from, dates.to, reg.average_per_day_costs - reg.accommodation_costs), 2)
+    reg.total_avg_lifestyle = _.round(sumForRangeAvg(dates.from, dates.to, reg.average_per_day_costs - reg.accommodation_costs), 2)
     //reg.name = `${reg.name} ca. ${_.round(sumForRangeAvg(dates.from, dates.to, reg.accommodation_costs), 2)}€` 
     
     // CALCULATE TOTAL PRICE WITH TRANSPORTATION
@@ -100,11 +106,13 @@ module.exports = function (dbConn) {
     let scoreSubGroups = []
     if (!_.isEmpty(q.climate)) scoreSubGroups.push(calculateAverage(reg.scores.filter(el => _.some(Object.keys(q.climate), entry => entry === el.type ) )) )
     if (!_.isEmpty(q.costs)) scoreSubGroups.push(calculateAverage(reg.scores.filter(el => _.some(Object.keys(q.costs), entry => entry === el.type ))) )
-      if (!_.isEmpty(q.others)) scoreSubGroups.push(calculateAverage(reg.scores.filter(el => _.some(Object.keys(q.others), entry => entry === el.type ) )) )
+    if (!_.isEmpty(q.others.avg_price_relative)) scoreSubGroups.push(calculateAverage(reg.scores.filter(el => 'avg_price_relative' === el.type ) )) 
+    if (!_.isEmpty(q.others.tags)) scoreSubGroups.push(calculateAverage(reg.scores.filter(el => _.some(q.others.tags, entry => entry === el.type ))) )
     
     // CALCULATE AVERAGE SCORE Stage 2
-      reg.score = calculateAverage(reg.scores) 
+    // reg.score = calculateAverage(reg.scores) 
-      // reg.score = _.sum(scoreSubGroups) / scoreSubGroups.length
+    reg.score = _.round(_.sum(scoreSubGroups) / scoreSubGroups.length, 3)
+
   })
   return _.orderBy(regionsArr, ({ score }) => score || 0, 'desc') //.filter(el => !_.isNaN(el.score))
 }
@@ -249,7 +257,24 @@ module.exports = function (dbConn) {
   return averagedScore
 }
 
-  function calculateSimpleScore(type, region, searchLowParam, searchMaxParam, minMax) {
+function scoresFromTags(regionTags, tagStringsFromQueries) {
+  return tagStringsFromQueries.map(tagQuery => {
+    const tag = regionTags.find(tag => tagQuery === tag.name)
+    let retVal = {
+      type: tagQuery,
+      value: null,
+      score: null,
+    }
+    if (_.isNil(tag)) return retVal
+    retVal.value = tag.value
+    retVal.score = /* tag.value <= 0 ? 0 : */ _.round(scorer.calculateScoreRange(40, 100, 1, tag.value, 100, 100), 3)
+    console.log(retVal);
+    
+    return retVal
+  })
+}
+
+function scoreFromSimpleRegionProperty(type, region, searchLowParam, searchMaxParam, minMax) {
   // console.log('getScoreFromCosts for', region.name, type)
   const sc = _.round(scorer.calculateScoreRange(minMax.min[type], minMax.max[type], SETTINGS[type][0], region[type], searchLowParam, searchMaxParam), 3)
   
@@ -295,6 +320,3 @@ module.exports = function (dbConn) {
   
   return averagedScore.value
 }
-  
-  //end
-}