diff --git a/backend/models/getRegionById.js b/backend/models/getRegionById.js index d833f79..07cb2a1 100644 --- a/backend/models/getRegionById.js +++ b/backend/models/getRegionById.js @@ -1,8 +1,8 @@ const arrayFormatting = require("../util/databaseArrayFormatting.js") module.exports = async (dbConn, id) => { - const region = await dbConn.query( - `SELECT regions.id AS region_id, + const res = await dbConn.query( + `SELECT regions.id AS region_id, regions.region AS name, countries.country AS country, regions.description AS description, @@ -43,18 +43,18 @@ module.exports = async (dbConn, id) => { AND regions.id = ?`, [id] ); + const region = res[0] - 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_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); - } - const emptyArr = Array.from({ length: 12 }, () => null) + 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); + + 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 @@ -64,6 +64,7 @@ module.exports = async (dbConn, id) => { 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; };