From 961760601d9b87302deaa7bdd76d86111d91a2e9 Mon Sep 17 00:00:00 2001 From: Timo John Date: Thu, 18 Jun 2020 15:55:17 +0200 Subject: [PATCH] Small fix according to database col name change --- backend/models/getRegionById.js | 14 +++++++++++--- backend/models/getRegions.js | 13 ++++++++++--- backend/util/getClimateMinMax.js | 8 ++++---- 3 files changed, 25 insertions(+), 10 deletions(-) diff --git a/backend/models/getRegionById.js b/backend/models/getRegionById.js index 784ba75..d833f79 100644 --- a/backend/models/getRegionById.js +++ b/backend/models/getRegionById.js @@ -6,10 +6,13 @@ module.exports = async (dbConn, 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, @@ -43,19 +46,24 @@ module.exports = async (dbConn, id) => { for (k = 0; k < region.length; k++) { region[k].avg_price_relative = arrayFormatting(region[k].avg_price_relative); - //region[k].temperature_mean = arrayFormatting(region[k].temperature_mean); - //region[k].temperature_mean_min = arrayFormatting(region[k].temperature_mean_min); + region[k].temperature_mean = arrayFormatting(region[k].temperature_mean); + region[k].temperature_mean_min = arrayFormatting(region[k].temperature_mean_min); region[k].temperature_mean_max = arrayFormatting(region[k].temperature_mean_max); region[k].precipitation = arrayFormatting(region[k].precipitation); region[k].rain_days = arrayFormatting(region[k].rain_days); region[k].sun_hours = arrayFormatting(region[k].sun_hours); - //region[k].humidity = arrayFormatting(region[k].humidity); + region[k].humidity = arrayFormatting(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; }; diff --git a/backend/models/getRegions.js b/backend/models/getRegions.js index 7edcf05..1b47e67 100644 --- a/backend/models/getRegions.js +++ b/backend/models/getRegions.js @@ -7,10 +7,13 @@ module.exports = async (dbConn) => { 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, @@ -42,22 +45,26 @@ module.exports = async (dbConn) => { 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 = 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); + 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 }); }; diff --git a/backend/util/getClimateMinMax.js b/backend/util/getClimateMinMax.js index aaefd7d..3e730cd 100644 --- a/backend/util/getClimateMinMax.js +++ b/backend/util/getClimateMinMax.js @@ -5,16 +5,16 @@ exports.getClimateMinMax = async function (dbConn) { MIN(temperature_mean_min) AS temperature_mean_min, MIN(temperature_mean_max) AS temperature_mean_max, MIN(precipitation) AS precipitation, - MIN(raindays) AS rain_days, - MIN(sunshine) AS sun_hours + MIN(rain_days) AS rain_days, + MIN(sun_hours) AS sun_hours FROM region_climate` const sqlMax = `SELECT MAX(temperature_mean) AS temperature_mean, MAX(temperature_mean_min) AS temperature_mean_min, MAX(temperature_mean_max) AS temperature_mean_max, MAX(precipitation) AS precipitation, - MAX(raindays) AS rain_days, - MAX(sunshine) AS sun_hours + MAX(rain_days) AS rain_days, + MAX(sun_hours) AS sun_hours FROM region_climate` const [qResMin, qResMax] = await Promise.all([dbConn.query(sqlMin), dbConn.query(sqlMax)]) // console.log(qResMin)