Merge branch 'feature/trivago' into 'develop'

Feature/trivago

See merge request tjohn/cc-data!14

backend/models/getRegionById.js

@@ -1,16 +1,20 @@
-const climateArrayFormatting = require("./../util/climateArrayFormatting.js")
+const arrayFormatting = require("../util/databaseArrayFormatting.js")
 
 module.exports = async (dbConn, id) => {
-    const region = await dbConn.query(
+    const res = await dbConn.query(
             `SELECT regions.id AS region_id,
                 regions.region AS name,
                 countries.country AS country,
                 regions.description AS description,
+                rcma.temperature_mean AS temperature_mean,
+                rcma.temperature_mean_min AS temperature_mean_min,
                 rcma.temperature_mean_max AS temperature_mean_max,
                 rcma.precipitation AS precipitation,
                 rcma.rain_days AS rain_days,
                 rcma.sun_hours AS sun_hours,
+                rcma.humidity AS humidity,
                 regions_byt.average_per_day_costs AS average_per_day_costs,
+                rtma.avg_price_relative AS avg_price_relative,
                 regions_byt.accommodation_costs AS accommodation_costs,
                 regions_byt.food_costs AS food_costs,
                 regions_byt.water_costs AS water_costs,
@@ -30,25 +34,37 @@ module.exports = async (dbConn, id) => {
               FROM region_climate_monthly_avg AS rcma
               GROUP BY rcma.region_id) rcma ON rcma.region_id = regions.id
         LEFT JOIN regions_byt ON regions.id = regions_byt.region_id
+        LEFT JOIN (SELECT rtma.region_id,
+              GROUP_CONCAT(IFNULL(rtma.avg_price_relative,"") ORDER BY rtma.month SEPARATOR ', ') AS avg_price_relative
+              FROM regions_trivago_monthly_avg AS rtma
+              GROUP BY rtma.region_id) rtma
+        ON regions.id = rtma.region_id
         WHERE regions_byt.travelstyle = 1
         AND regions.id = ?`,
         [id]
     );
+    const region = res[0]
+
+    region.avg_price_relative = arrayFormatting(region.avg_price_relative);
+    region.temperature_mean = arrayFormatting(region.temperature_mean);
+    region.temperature_mean_min = arrayFormatting(region.temperature_mean_min);
+    region.temperature_mean_max = arrayFormatting(region.temperature_mean_max);
+    region.precipitation = arrayFormatting(region.precipitation);
+    region.rain_days = arrayFormatting(region.rain_days);
+    region.sun_hours = arrayFormatting(region.sun_hours);
+    region.humidity = arrayFormatting(region.humidity);
 
-    for (k = 0; k < region.length; k++) {
-        //region[k].temperature_mean = climateArrayFormatting(region[k].temperature_mean);
-        //region[k].temperature_mean_min = climateArrayFormatting(region[k].temperature_mean_min);
-        region[k].temperature_mean_max = climateArrayFormatting(region[k].temperature_mean_max);
-        region[k].precipitation = climateArrayFormatting(region[k].precipitation);
-        region[k].rain_days = climateArrayFormatting(region[k].rain_days);
-        region[k].sun_hours = climateArrayFormatting(region[k].sun_hours);
-        //region[k].humidity = climateArrayFormatting(region[k].humidity);
-    }
     const emptyArr = Array.from({length: 12}, () => null)
+    if (region.avg_price_relative === null) region.avg_price_relative = emptyArr
+    if (region.temperature_mean === null) region.temperature_mean = emptyArr
+    if (region.temperature_mean_min === null) region.temperature_mean_min = emptyArr
+    if (region.temperature_mean_max === null) region.temperature_mean_max = emptyArr
     if (region.temperature_mean_max === null) region.temperature_mean_max = emptyArr
     if (region.precipitation === null) region.precipitation = emptyArr
     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
+
     return region;
 };
 

backend/models/getRegions.js

@@ -1,43 +1,71 @@
-exports.getRegions = async (dbConn) => {
+const arrayFormatting = require("../util/databaseArrayFormatting.js");
-  let sql = `SELECT 
+const { takeRightWhile } = require("lodash");
-  regions.id AS region_id,
-  regions.region AS name,
-  countries.country AS country
-  FROM regions
-  JOIN countries
-  ON regions.country_id = countries.id`
-  let regions = await dbConn.query(sql);
 
-  return regions;
+module.exports = async (dbConn) => {
-};
+    const regions = await dbConn.query(
-
-exports.getRegionsInternal = async (dbConn) => {
-  let regions = await dbConn.query(`SELECT 
-  regions.id AS region_id,
-  regions.region AS name,
-  countries.country AS country,
-  regions.meteostat_id AS meteostat_id
-  FROM regions
-  JOIN countries
-  ON regions.country_id = countries.id`);
-  return regions;
-};
-
-exports.getRegionsById = async (dbConn, id) => {
-  const region = await dbConn.query(
         `SELECT regions.id AS region_id,
                 regions.region AS name,
-                regions.description,
                 countries.country AS country,
-                regions.meteostat_id AS meteostat_id
+                regions.description AS description,
+                rcma.temperature_mean AS temperature_mean,
+                rcma.temperature_mean_min AS temperature_mean_min,
+                rcma.temperature_mean_max AS temperature_mean_max,
+                rcma.precipitation AS precipitation,
+                rcma.rain_days AS rain_days,
+                rcma.sun_hours AS sun_hours,
+                rcma.humidity AS humidity,
+                regions_byt.average_per_day_costs AS average_per_day_costs,
+                rtma.avg_price_relative AS avg_price_relative,
+                regions_byt.accommodation_costs AS accommodation_costs,
+                regions_byt.food_costs AS food_costs,
+                regions_byt.water_costs AS water_costs,
+                regions_byt.local_transportation_costs AS local_transportation_costs,
+                regions_byt.entertainment_costs AS entertainment_costs,
+                regions_byt.alcohol_costs AS alcohol_costs
         FROM regions
-        JOIN countries
+        LEFT JOIN countries ON regions.country_id = countries.id
-        ON regions.country_id = countries.id
+        LEFT JOIN (SELECT rcma.region_id, 
-        WHERE regions.id = ?`,
+                GROUP_CONCAT(IFNULL(rcma.temperature_mean,"") ORDER BY rcma.month SEPARATOR ', ') AS temperature_mean, 
-    [id]
+                GROUP_CONCAT(IFNULL(rcma.temperature_mean_min, "") ORDER BY rcma.month SEPARATOR ', ') AS temperature_mean_min, 
+                GROUP_CONCAT(IFNULL(rcma.temperature_mean_max, "") ORDER BY rcma.month SEPARATOR ', ') AS temperature_mean_max, 
+                GROUP_CONCAT(IFNULL(rcma.precipitation, "") ORDER BY rcma.month SEPARATOR ', ') AS precipitation, 
+                GROUP_CONCAT(IFNULL(rcma.rain_days, "") ORDER BY rcma.month SEPARATOR ', ') AS rain_days, 
+                GROUP_CONCAT(IFNULL(rcma.sun_hours, "") ORDER BY rcma.month SEPARATOR ', ') AS sun_hours, 
+                GROUP_CONCAT(IFNULL(rcma.humidity, "") ORDER BY rcma.month SEPARATOR ', ') AS humidity
+              FROM region_climate_monthly_avg AS rcma
+              GROUP BY rcma.region_id) rcma ON rcma.region_id = regions.id
+        LEFT JOIN regions_byt ON regions.id = regions_byt.region_id
+        LEFT JOIN (SELECT rtma.region_id,
+              GROUP_CONCAT(IFNULL(rtma.avg_price_relative,"") ORDER BY rtma.month SEPARATOR ', ') AS avg_price_relative
+              FROM regions_trivago_monthly_avg AS rtma
+              GROUP BY rtma.region_id) rtma
+        ON regions.id = rtma.region_id
+        WHERE regions_byt.travelstyle = 1`
     );
-  return region;
+
+    for (k = 0; k < regions.length; k++) {
+        regions[k].avg_price_relative = arrayFormatting(regions[k].avg_price_relative);
+        regions[k].temperature_mean = arrayFormatting(regions[k].temperature_mean);
+        regions[k].temperature_mean_min = arrayFormatting(regions[k].temperature_mean_min);
+        regions[k].temperature_mean_max = arrayFormatting(regions[k].temperature_mean_max);
+        regions[k].precipitation = arrayFormatting(regions[k].precipitation);
+        regions[k].rain_days = arrayFormatting(regions[k].rain_days);
+        regions[k].sun_hours = arrayFormatting(regions[k].sun_hours);
+        regions[k].humidity = arrayFormatting(regions[k].humidity);
+
+    }
+    //console.log(regions.filter(region => region.rain_days === null))
+    return regions.map(region => {
+        const emptyArr = Array.from({ length: 12 }, () => null)
+        if (region.avg_price_relative === null) region.avg_price_relative = emptyArr
+        if (region.temperature_mean === null) region.temperature_mean = emptyArr
+        if (region.temperature_mean_min === null) region.temperature_mean_min = emptyArr
+        if (region.temperature_mean_max === null) region.temperature_mean_max = emptyArr
+        if (region.precipitation === null) region.precipitation = emptyArr
+        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
+        return region
+    });
 };
 
-
-

backend/models/getRegions2.js

@@ -1,57 +0,0 @@
-const climateArrayFormatting = require("./../util/climateArrayFormatting.js");
-const { takeRightWhile } = require("lodash");
-
-module.exports = async (dbConn) => {
-    const regions = await dbConn.query(
-        `SELECT regions.id AS region_id,
-                regions.region AS name,
-                countries.country AS country,
-                regions.description AS description,
-                rcma.temperature_mean_max AS temperature_mean_max,
-                rcma.precipitation AS precipitation,
-                rcma.rain_days AS rain_days,
-                rcma.sun_hours AS sun_hours,
-                regions_byt.average_per_day_costs AS average_per_day_costs,
-                regions_byt.accommodation_costs AS accommodation_costs,
-                regions_byt.food_costs AS food_costs,
-                regions_byt.water_costs AS water_costs,
-                regions_byt.local_transportation_costs AS local_transportation_costs,
-                regions_byt.entertainment_costs AS entertainment_costs,
-                regions_byt.alcohol_costs AS alcohol_costs
-        FROM regions
-        LEFT JOIN countries ON regions.country_id = countries.id
-        LEFT JOIN (SELECT rcma.region_id, 
-                GROUP_CONCAT(IFNULL(rcma.temperature_mean,"") ORDER BY rcma.month SEPARATOR ', ') AS temperature_mean, 
-                GROUP_CONCAT(IFNULL(rcma.temperature_mean_min, "") ORDER BY rcma.month SEPARATOR ', ') AS temperature_mean_min, 
-                GROUP_CONCAT(IFNULL(rcma.temperature_mean_max, "") ORDER BY rcma.month SEPARATOR ', ') AS temperature_mean_max, 
-                GROUP_CONCAT(IFNULL(rcma.precipitation, "") ORDER BY rcma.month SEPARATOR ', ') AS precipitation, 
-                GROUP_CONCAT(IFNULL(rcma.rain_days, "") ORDER BY rcma.month SEPARATOR ', ') AS rain_days, 
-                GROUP_CONCAT(IFNULL(rcma.sun_hours, "") ORDER BY rcma.month SEPARATOR ', ') AS sun_hours, 
-                GROUP_CONCAT(IFNULL(rcma.humidity, "") ORDER BY rcma.month SEPARATOR ', ') AS humidity
-              FROM region_climate_monthly_avg AS rcma
-              GROUP BY rcma.region_id) rcma ON rcma.region_id = regions.id
-        LEFT JOIN regions_byt ON regions.id = regions_byt.region_id
-        WHERE regions_byt.travelstyle = 1`
-    );
-
-    for (k = 0; k < regions.length; k++) {
-        //regions[k].temperature_mean = climateArrayFormatting(regions[k].temperature_mean);
-        //regions[k].temperature_mean_min = climateArrayFormatting(regions[k].temperature_mean_min);
-        regions[k].temperature_mean_max = climateArrayFormatting(regions[k].temperature_mean_max);
-        regions[k].precipitation = climateArrayFormatting(regions[k].precipitation);
-        regions[k].rain_days = climateArrayFormatting(regions[k].rain_days);
-        regions[k].sun_hours = climateArrayFormatting(regions[k].sun_hours);
-        //regions[k].humidity = climateArrayFormatting(regions[k].humidity);
-
-    }
-    console.log(regions.filter(region => region.rain_days === null))
-    return regions.map(region => {
-        const emptyArr = Array.from({ length: 12 }, () => null)
-        if (region.temperature_mean_max === null) region.temperature_mean_max = emptyArr
-        if (region.precipitation === null) region.precipitation = emptyArr
-        if (region.rain_days === null) region.rain_days = emptyArr
-        if (region.sun_hours === null) region.sun_hours = emptyArr
-        return region
-    });
-};
-

backend/routes/regions.js

@@ -1,5 +1,5 @@
 const router = require("express").Router();
-const getRegions = require("../models/getRegions2.js");
+const getRegions = require("../models/getRegions.js");
 const getRegionById = require("../models/getRegionById.js");
 const path = require("path");
 const fs = require("fs");

backend/util/scoreAndSearch.js

@@ -4,8 +4,7 @@ const getClimateMinMax = require("./getClimateMinMax.js")
 const oldToNewQuerySyntax = require("./oldToNewQuerySyntax.js")
 const getAllRegionsWithClimatePerMonth = require('./getAllRegionsWithClimatePerMonth')
 const score = require('./score')
-// const getRegions = require('../models/getRegions.js').getRegionsInternal
+const getRegions = require('../models/getRegions.js')
-const getRegions = require('../models/getRegions2.js')
 
 const SHOW_ALL_SCOREOBJECTS = false
 const MULTIPLIER = {
@@ -75,18 +74,13 @@ module.exports = function (dbConn) {
         // CALCULATE SCORES FOR CLIMATE PROPS
         regions.forEach(reg => {
             Object.entries(q.climate).forEach(([key, value]) => {
-        // console.log('key', key)
-        // console.log('val', value[0], value[1])
                 let finalScoreObj = getScoreAndAverageFromClimate(key, travelPeriods, reg, value[0], value[1], boundaryClimate)
                 reg.scores.push(finalScoreObj)
             });
 
             // CALCULATE SCORES FOR PRICE PROPS
             Object.entries(q.costs).forEach(([key, value]) => {
-        console.log('key', key)
-        console.log('val', value[0], value[1])
                 let finalScoreObj = getScoreFromCosts(key, reg, value[0], value[1], boundaryCosts)
-        console.log(finalScoreObj);
 
                 reg.scores.push(finalScoreObj)
             });
@@ -100,9 +94,14 @@ module.exports = function (dbConn) {
 
     function calculateAverage(scores) {
         let sum = 0
-    scores.forEach(el => sum += el.score)
+        let cnt = 0
-    //console.log(sum)
+        scores.forEach(el => {
-    return _.round(sum / scores.length, 2)
+            if (el.score !== null && el.score !== undefined && !_.isNaN(el.score)) {
+                cnt++
+                sum += el.score
+            }
+        })
+        return _.round(sum / cnt, 2)
     }
 
     function prepareQueries(queries) {
@@ -175,7 +174,6 @@ module.exports = function (dbConn) {
             let dateTo = new Date(to)
             fromAndTo.to.day = dateTo.getDate()
             fromAndTo.to.month = dateTo.getMonth() + 1
-      //console.log(dateFrom.toUTCString(), dateTo.toUTCString())
             if (moment(dateFrom).add(23, 'hours').isAfter(moment(dateTo))) throw new Error("ERR: 'to' must be at least one day after 'from'.")
         } else {
             // this block to still support old query syntax, validating from and to parameter
@@ -187,14 +185,12 @@ module.exports = function (dbConn) {
             if (!from.match(re) || !to.match(re)) throw new Error("ERR: invalid parameter:", from, to)
             if (moment(from, 'YYYY-MM-DD').add(23, 'hours').isAfter(moment(to, 'YYYY-MM-DD'))) throw new Error("ERR: 'to' must be at least one day after 'from'.")
         }
-    console.log(fromAndTo)
 
         return fromAndTo
     }
 
     function getScoreAndAverageFromClimate(type, travelPeriods, region, searchLowParam, searchMaxParam, minMax) {
         console.log('getScoreAndAverageFromClimate for', region.name, type)
-    // console.log(type, travelPeriods, searchLowParam, searchMaxParam)
 
         const singleScores = travelPeriods.map(period => {
             const sc = _.round(score.calculateScoreRange(minMax.min[type], minMax.max[type], MULTIPLIER[type], region[type][period.month - 1], searchLowParam, searchMaxParam), 2)
@@ -205,7 +201,6 @@ module.exports = function (dbConn) {
                 score: (region[type][period.month - 1] === null || searchLowParam === null) ? null : sc,
                 days: period.days
             }
-      //console.log(res);
 
             return res
         })
@@ -218,7 +213,6 @@ module.exports = function (dbConn) {
         }
         singleScores.forEach(el => {
             if (el.value !== null) {
-        //console.log(el)
                 averagedScore.value += (el.value * el.days)
                 averagedScore.score += (el.score * el.days)
                 averagedScore.days += (el.days)
@@ -238,7 +232,6 @@ module.exports = function (dbConn) {
 
     function getScoreFromCosts(type, region, searchLowParam, searchMaxParam, minMax) {
         console.log('getScoreFromCosts for', region.name, type)
-    // console.log(type, travelPeriods, searchLowParam, searchMaxParam)
         const sc = _.round(score.calculateScoreRange(minMax.min[type], minMax.max[type], MULTIPLIER[type], region[type], searchLowParam, searchMaxParam), 2)
 
         let finScore = {
@@ -254,7 +247,5 @@ module.exports = function (dbConn) {
     }
 
 
-
-
     //end
 }