finished refactoring

Endpoint for presets works now. For real.

Alternative JSON return for presets tested

.gitignore

@@ -1,3 +1,7 @@
+# credentials
+.env
+config.json
+
 # compiled output
 /dist
 

.vscode/launch.json

@@ -0,0 +1,22 @@
+{
+  // Verwendet IntelliSense zum Ermitteln möglicher Attribute.
+  // Zeigen Sie auf vorhandene Attribute, um die zugehörigen Beschreibungen anzuzeigen.
+  // Weitere Informationen finden Sie unter https://go.microsoft.com/fwlink/?linkid=830387
+  "version": "0.2.0",
+  "configurations": [
+    {
+      "console": "integratedTerminal",
+      "internalConsoleOptions": "neverOpen",
+      "name": "NodeJS: nodemon debug",
+      "program": "${workspaceFolder}/backend/index.js",
+      "request": "launch",
+      "restart": true,
+      "runtimeExecutable": "nodemon",
+      "skipFiles": [
+        "<node_internals>/**"
+      ],
+      "type": "node",
+      "envFile": "${workspaceFolder}/backend/.env",
+    }
+  ]
+}

Scripts/setup.sql

@@ -14,7 +14,7 @@
 
 -- Exportiere Datenbank Struktur für travopti
 DROP DATABASE IF EXISTS `travopti`;
-CREATE DATABASE IF NOT EXISTS `travopti` /*!40100 DEFAULT CHARACTER SET latin1 */;
+CREATE DATABASE IF NOT EXISTS `travopti` /*!40100 DEFAULT CHARACTER SET utf8 */;
 USE `travopti`;
 
 -- Exportiere Struktur von Tabelle travopti.countries
@@ -22,6 +22,8 @@ DROP TABLE IF EXISTS `countries`;
 CREATE TABLE IF NOT EXISTS `countries` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
   `country` varchar(255) NOT NULL,
+    `preview_img` VARCHAR(255) NULL DEFAULT NULL,
+    `description` VARCHAR(4000) NULL DEFAULT NULL,
   `created_at` timestamp NOT NULL DEFAULT current_timestamp(),
   `updated_at` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
   PRIMARY KEY (`id`),
@@ -80,9 +82,11 @@ CREATE TABLE IF NOT EXISTS `regions` (
   `meteostat_id` varchar(11) DEFAULT NULL,
   `lon` double(22,0) DEFAULT NULL,
   `lat` double(22,0) DEFAULT NULL,
+    `preview_img` VARCHAR(255) NULL DEFAULT NULL,
+    `description` VARCHAR(4000) NULL DEFAULT NULL,
   `created_at` timestamp NOT NULL DEFAULT current_timestamp(),
   `updated_at` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
-  PRIMARY KEY (`id`) USING BTREE,
+  PRIMARY KEY (`id`) USING BTREE,git
   KEY `FK_regions_countries` (`country_id`) USING BTREE,
   CONSTRAINT `FK_regions_countries` FOREIGN KEY (`country_id`) REFERENCES `countries` (`id`) ON UPDATE CASCADE
 ) ENGINE=InnoDB AUTO_INCREMENT=127 DEFAULT CHARSET=utf8mb4;
@@ -1309,6 +1313,7 @@ CREATE TABLE IF NOT EXISTS `search_presets` (
   `created_at` timestamp NOT NULL DEFAULT current_timestamp(),
   `updated_at` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
   PRIMARY KEY (`id`)
+	UNIQUE INDEX `parameter` (`parameter`, `name`) USING BTREE
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
 
 -- Exportiere Daten aus Tabelle travopti.search_presets: ~0 rows (ungefähr)

backend/.env

@@ -1,5 +0,0 @@
-METEOSTAT_API_KEY=LMlDskju
-DB_HOST=localhost
-DB_USER=root
-DB_PASSWORD=devtest
-DB_PORT=3306

backend/.env.sample

@@ -0,0 +1,6 @@
+PORT=
+METEOSTAT_API_KEY=
+DB_HOST=
+DB_USER=
+DB_PASSWORD=
+DB_PORT=

backend/app.js

@@ -1,17 +1,16 @@
 const express = require('express')
 const moment = require('moment')
 const _ = require('lodash')
-const db = require('./mysql')
-const score = require('./score')
-const transformer = require('./transformer')
-const climate = require('./climate')
-const base = require('./base64')
+const score = require('./util/score')
+const transformer = require('./util/transformer')
+const base = require('./util/base64')
 
 const app = express()
+
 const port = 3000
 //const multiplier_temp = 5
 const multiplier = {
-  temperature_mean: 5,
+  temperature_mean_max: 5,
   percipitation: 3.5,
   raindays: 3,
   sunhours: 2.5,
@@ -30,7 +29,7 @@ app.get('/', (req, res) => res.send('Hello Timo!'))
 app.get('/v1/regions', (req, res) => getAllRegions().then(x => res.json({ data: x })))
 app.get('/v1/presets', (req, res) => res.json({ data: samplePresets}))
 app.get('/v1/search', searchHandler)
-app.get('/v1/update/climate', climateUpdateHandler)
+app.get('/v1/climate/update', climateUpdateHandler)
 
 app.listen(port, () => console.log(`Travopti backend listening at http://localhost:${port}`))
 
@@ -64,7 +63,7 @@ function searchHandler(req, res) {
   console.log('Q:', q)
   
   let queryObj = {}
-  if (q.temperature) queryObj['temperature_mean'] = q.temperature
+  if (q.temperature) queryObj['temperature_mean_max'] = q.temperature
   if (q.percipitation) queryObj['percipitation'] = q.percipitation
   if (q.raindays) queryObj['raindays'] = q.raindays
   if (q.sunhours) queryObj['sunhours'] = q.sunhours
@@ -88,11 +87,11 @@ async function scoreAndSearch(from, to, queries) {
   
   // randomize if empty queries
   if (_.isEmpty(queries)) {
-    let t = _.round(_.random(minMax.min.temperature_mean, minMax.max.temperature_mean-5),0)
+    let t = _.round(_.random(minMax.min.temperature_mean_max, minMax.max.temperature_mean_max-5),0)
     let p = _.round(_.random(minMax.min.percipitation, minMax.max.percipitation - 50), 0)
     let r = _.round(_.random(minMax.min.raindays, minMax.max.raindays - 5), 0)
     let s = _.round(_.random(minMax.min.sunhours, minMax.max.sunhours - 50), 0)
-    queries.temperature_mean = `${t},${t + 5}`
+    queries.temperature_mean_max = `${t},${t + 5}`
     queries.percipitation = `${p},${p + 50}`
     queries.raindays = `${r},${r + 5}`
     queries.sunhours = `${s},${s + 50}`
@@ -263,7 +262,7 @@ function getAllRegionsWithClimatePerMonth(month) {
 function oldToNewQuerySyntax(queries) {
   let res = {}
   try {
-    if (queries.temperature_mean) res.temperature_mean = [queries.temperature_mean.split(',')[0], queries.temperature_mean.split(',')[1]]
+    if (queries.temperature_mean_max) res.temperature_mean_max = [queries.temperature_mean_max.split(',')[0], queries.temperature_mean_max.split(',')[1]]
     if (queries.percipitation) res.percipitation = [queries.percipitation.split(',')[0], queries.percipitation.split(',')[1]]
     if (queries.raindays) res.raindays = [queries.raindays.split(',')[0], queries.raindays.split(',')[1]]
     if (queries.sunhours) res.sunhours = [queries.sunhours.split(',')[0], queries.sunhours.split(',')[1]]

backend/climate.js

@@ -1,124 +0,0 @@
-require('dotenv').config()
-const mysql = require('mysql2/promise');
-const axios = require('axios')
-
-const rangeStartDate = '2010-01'
-const rangeEndDate = '2018-12'
-
-exports.update = async function (startDate = rangeStartDate, endDate = rangeEndDate) {
-  console.log('update climate with:', startDate, endDate);
-  
-  const connection = await mysql.createConnection({
-    host: process.env.DB_HOST,
-    user: process.env.DB_USER,
-    password: process.env.DB_PASSWORD,
-    port: process.env.DB_PORT,
-    database: 'travopti'
-  });
-  const [result, fields] = await connection.execute(`SELECT * FROM regions WHERE meteostat_id IS NOT NULL`)
-
-  // let temp = await Promise.all(result.map(x => createClimateObject(x)))
-  // let final = temp.reduce((total, element) => total.concat(element), [])
-
-  // await writeToDatabase(connection, final)
-  
-  let temp2 = await Promise.all(result.map(x => createClimateObjectFrom(x, startDate, endDate)))
-  let final2 = temp2.reduce((total, element) => total.concat(element), [])
-
-  await writeToDatabase(connection, final2)
-
-  connection.end();
-  let response = 'database update complete. see backend logs for info.'
-  console.log(response)
-  return response
-}
-
-// async function createClimateObject(src) {
-//   let response
-//   try {
-//     response = await axios.get(`https://api.meteostat.net/v1/climate/normals?station=${src.meteostat_id}&key=${process.env.METEOSTAT_API_KEY}`)
-//   } catch (error) {
-//     console.log("skipping: couldn't find results for following region: ")
-//     console.log(src.region + " with meteostat_id " + src.meteostat_id)
-//     return []
-//   }
-//   if (!response.data.data) {
-//     console.log("skipping: no data for station meteostat_id " + src.meteostat_id + " (" + src.region + ")")
-//     return []
-//   }
-//   let results = []
-//   for (let index = 1; index <= 12; index++) {
-//     let result = {
-//       region: src.region,
-//       region_id: src.id,
-//       month: index,
-//       temperature: Object.values(response.data.data.temperature)[index - 1] ? Object.values(response.data.data.temperature)[index - 1] : null,
-//       temperature_min: Object.values(response.data.data.temperature_min)[index - 1] ? Object.values(response.data.data.temperature_min)[index - 1] : null,
-//       temperature_max: Object.values(response.data.data.temperature_max)[index - 1] ? Object.values(response.data.data.temperature_max)[index - 1] : null,
-//       precipitation: Object.values(response.data.data.precipitation)[index - 1] ? Object.values(response.data.data.precipitation)[index - 1] : null,
-//       sunshine: Object.values(response.data.data.sunshine)[index - 1] ? Object.values(response.data.data.sunshine)[index - 1] : null,
-//     }
-//     results.push(result)
-//   }
-//   return results
-// }
-
-async function createClimateObjectFrom(src, startDate, endDate) {
-  let response
-  try {
-    response = await axios.get(`https://api.meteostat.net/v1/history/monthly?station=${src.meteostat_id}&start=${startDate}&end=${endDate}&key=${process.env.METEOSTAT_API_KEY}`)
-  } catch (error) {
-    console.log("skipping createClimateObjectFrom: couldn't find results for following region: ")
-    console.log(src.region + " with meteostat_id " + src.meteostat_id)
-    console.log(error)
-    return []
-  }
-  if (!response.data.data) {
-    console.log("skipping: no data for station meteostat_id " + src.meteostat_id + " (" + src.region + ")")
-    return []
-  }
-  let results = response.data.data.map(element => {
-    let result = {
-      region: src.region,
-      region_id: src.id,
-      year: element.month.split("-")[0],
-      month: element.month.split("-")[1],
-      temperature: element.temperature_mean,
-      temperature_min: element.temperature_mean_min,
-      temperature_max: element.temperature_mean_max,
-      precipitation: element.precipitation,
-      raindays: element.raindays,
-      sunshine: element.sunshine,
-      humidity: element.humidity ? element.humidity : null 
-    }
-    //console.log(result)
-    return result
-  })
-  return results
-}
-
-async function writeToDatabase(dbConnection, climateObjArr) {
-  climateObjArr.forEach(async (element) => {
-    //console.log(element)
-    try {
-      if (!element.year) {
-        await dbConnection.execute(`
-          REPLACE INTO region_climate (region_id, year, month, temperature_mean, temperature_mean_min, temperature_mean_max, percipitation, sunshine)
-          VALUES (${element.region_id}, 0, ${element.month}, ${element.temperature}, ${element.temperature_min}, ${element.temperature_max}, ${element.precipitation}, ${element.sunshine});`)
-      } else {
-        await dbConnection.execute(`
-            REPLACE INTO region_climate (region_id, year, month, temperature_mean, temperature_mean_min, temperature_mean_max, percipitation, sunshine, humidity, raindays)
-            VALUES (${element.region_id}, ${element.year}, ${element.month}, ${element.temperature}, ${element.temperature_min}, ${element.temperature_max}, ${element.precipitation}, ${element.sunshine}, ${element.humidity}, ${element.raindays});`)
-      }
-    } catch (error) {
-      if (error.code !== 'ER_DUP_ENTRY') {
-        console.log("element which causes problems: ")
-        console.log(element)
-        console.log("query which causes problems: ")
-        console.log(error)
-      } else {
-        console.log(element.region + ": " + error.sqlMessage)
-      }
-    }
-  });
-}

backend/index.js

@@ -0,0 +1,53 @@
+const express = require("express");
+const bodyParser = require("body-parser");
+const path = require("path");
+const morgan = require("morgan");
+const dbConnection = require("./util/dbConnection");
+const fs = require("fs");
+require('dotenv').config()
+
+// credentials
+const port = process.env.PORT
+
+// Router
+const search = require("./routes/search");
+const regions = require("./routes/regions");
+const countries = require("./routes/countries");
+const climate = require("./routes/climate");
+
+const app = express();
+
+(async () => {
+    try {
+        const dbConn = await dbConnection();
+
+        // Express middleware
+        app.use(morgan("dev"));
+        app.use(express.static(path.join(__dirname, "../../dist")));
+        app.use(bodyParser.json());
+
+        // Express routes
+        app.use(search(dbConn));
+        app.use(regions(dbConn));
+        app.use(countries(dbConn));
+        app.use(climate(dbConn));
+
+        app.use((err, req, res, next) => {
+            // 500
+            if (true) {
+                next();
+            } else {
+                res.status(500).send();
+            }
+        });
+
+        // Start webserver
+        app.listen(port, () => {
+            console.log(`Travopti backend listening at http://localhost:${port}`)
+        });
+    } catch (error) {
+        // TODO: logging
+        console.error("Failed to start the webserver");
+        console.error(error);
+    }
+})();

backend/mockdata/multiplier.json

@@ -0,0 +1,6 @@
+{
+  "temperature_mean_max": 5,
+  "percipitation": 3.5,
+  "raindays": 3,
+  "sunhours": 2.5
+}

backend/mockdata/sample-presets.json

@@ -0,0 +1,6 @@
+{
+  "id": 29837,
+  "parameter": "temperature",
+  "label": "warm",
+  "values": [22, 25]
+}

backend/models/getCountries.js

@@ -0,0 +1,11 @@
+module.exports = async (dbConn) => {
+    const countries = await dbConn.query(
+        `SELECT countries.id AS country_id,
+                countries.country AS name,
+                countries.description,
+                countries.preview_img
+        FROM countries`
+    );
+    return countries;
+};
+

backend/models/getCountryById.js

@@ -0,0 +1,13 @@
+module.exports = async (dbConn, id) => {
+    const country = await dbConn.query(
+        `SELECT countries.id AS country_id,
+                countries.country AS name,
+                countries.description,
+                countries.preview_img
+        FROM countries
+        WHERE countries.id = ?`,
+        [id]
+    );
+    return country;
+};
+

backend/models/getRegionById.js

@@ -0,0 +1,18 @@
+module.exports = async (dbConn, id) => {
+    const region = await dbConn.query(
+        `SELECT regions.id AS region_id,
+                regions.region AS name,
+                regions.description,
+                regions.preview_img,
+                regions.country_id AS country_id,
+                countries.country AS country,
+                regions.meteostat_id AS meteostat_id
+        FROM regions
+        JOIN countries
+        ON regions.country_id = countries.id
+        WHERE regions.id = ?`,
+        [id]
+    );
+    return region;
+};
+

backend/models/getRegions.js

@@ -0,0 +1,13 @@
+module.exports = async (dbConn) => {
+    const 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;
+};
+

backend/models/getSearchPresets.js

@@ -0,0 +1,28 @@
+module.exports = async (dbConn) => {
+    let presets = await dbConn.query(
+        `SELECT search_presets.id AS country_id,
+                search_presets.parameter AS parameter,
+                search_presets.name AS label,
+                CASE
+                WHEN value_2 is NULL THEN value_1
+                ELSE CONCAT(search_presets.value_1,"|",search_presets.value_2)
+         END AS "values"
+         FROM search_presets`
+    );
+
+    //TODO: Which way is preferred?
+    for (k = 0; k < presets.length; k++) {
+        //if (presets[k].values.toString().includes("|")) {
+            const values = presets[k].values
+            presets[k].values = values.split("|");
+            for (i = 0; i < presets[k].values.length; i++) {
+                console.log(presets[k].values)
+                presets[k].values[i] = parseInt(presets[k].values[i])
+            }
+        //} else {
+        //    presets[k].values = parseInt(presets[k].values)
+        //}
+        console.log(presets[k])
+    }
+    return presets;
+};

backend/models/getSearchResults.js

@@ -0,0 +1,29 @@
+const base64 = require ("../util/base64.js")
+const ss = require ("../util/scoreAndSearch.js")
+
+module.exports = async (dbConn, req, res) => {
+    let response = {}
+
+    response.meta = {
+        params: req.params,
+        query: req.query,
+        headers: req.headers
+    }
+
+    let q = req.query.q ? base64.base64ToObj(req.query.q) : req.query
+    console.log('Q:', q)
+
+    let queryObj = {}
+    if (q.temperature) queryObj['temperature_mean_max'] = q.temperature
+    if (q.percipitation) queryObj['percipitation'] = q.percipitation
+    if (q.raindays) queryObj['raindays'] = q.raindays
+    if (q.sunhours) queryObj['sunhours'] = q.sunhours
+
+    ss.scoreAndSearch(q.from, q.to, queryObj, dbConn).then(searchResults => {
+        response.data = searchResults
+        res.json(response)
+    }).catch(e => {
+        console.log(e)
+        res.json(e.message)
+    })
+};

backend/models/handleClimateUpdate.js

@@ -0,0 +1,84 @@
+const axios = require('axios')
+
+// TODO: Automatically retrieve dates via aviable Data and get rid of random dates
+const rangeStartDate = '2010-01' // If no date is given, this date will be used as startDate
+const rangeEndDate = '2018-12'// If no date is given, this date will be used as endDate
+
+// TODO: call method periodically, not over API
+module.exports = async (dbConn, startDate = rangeStartDate, endDate = rangeEndDate) => {
+    console.log('update climate with:', startDate, endDate);
+
+    const result = await dbConn.query(`SELECT * FROM regions WHERE meteostat_id IS NOT NULL`)
+
+    const climateObject = await Promise.all(result.map(src => createClimateObjectFrom(src, startDate, endDate)))
+    const climateObjectArr = climateObject.reduce((total, element) => total.concat(element), [])
+
+    await writeToDatabase(dbConn, climateObjectArr)
+
+    const res = 'region_climate update complete. see backend logs for info.'
+    console.log(res)
+    return res
+}
+
+async function createClimateObjectFrom(src, startDate, endDate) {
+    let res
+    try {
+        res = await axios.get(`https://api.meteostat.net/v1/history/monthly?station=${src.meteostat_id}&start=${startDate}&end=${endDate}&key=${process.env.METEOSTAT_API_KEY}`)
+    } catch (error) {
+        console.log("skipping createClimateObjectFrom: couldn't find results for following region: ")
+        console.log(src.region + " with meteostat_id " + src.meteostat_id)
+        console.log(error)
+        return []
+    }
+    if (!res.data.data) {
+        console.log("skipping: no data for station meteostat_id " + src.meteostat_id + " (" + src.region + ")")
+        return []
+    }
+    const retVal = res.data.data.map(element => {
+        let result = {
+            region: src.region,
+            region_id: src.id,
+            year: element.month.split("-")[0],
+            month: element.month.split("-")[1],
+            temperature: element.temperature_mean,
+            temperature_min: element.temperature_mean_min,
+            temperature_max: element.temperature_mean_max,
+            precipitation: element.precipitation,
+            raindays: element.raindays,
+            sunshine: element.sunshine,
+            humidity: element.humidity ? element.humidity : null
+        }
+        //console.log(result)
+        return result
+    })
+    return retVal
+}
+
+async function writeToDatabase(dbConn, climateObjArr) {
+    for (const element of climateObjArr) {
+        //console.log(element)
+        try {
+            await dbConn.query(`
+                INSERT INTO region_climate 
+                (region_id, year, month, temperature_mean, temperature_mean_min, temperature_mean_max, percipitation, sunshine, humidity, raindays)
+                VALUES (${element.region_id}, ${element.year}, ${element.month}, ${element.temperature}, ${element.temperature_min}, ${element.temperature_max}, ${element.precipitation}, ${element.sunshine}, ${element.humidity}, ${element.raindays})
+                ON DUPLICATE KEY UPDATE
+                temperature_mean = ${element.temperature}, 
+                temperature_mean_min = ${element.temperature_min}, 
+                temperature_mean_max = ${element.temperature_max}, 
+                percipitation = ${element.precipitation}, 
+                sunshine = ${element.sunshine}, 
+                humidity = ${element.humidity}, 
+                raindays = ${element.raindays};`)
+        } catch (error) {
+            if (error.code !== 'ER_DUP_ENTRY') {
+                console.log("element which causes problems: ")
+                console.log(element)
+                console.log("query which causes problems: ")
+                console.log(error)
+            } else {
+                console.log(element.region + ": " + error.sqlMessage)
+            }
+        }
+    }
+};

backend/mysql.js

@@ -1,92 +0,0 @@
-var mysql = require('mysql2/promise');
-require('dotenv').config()
-
-// var connection = mysql.createConnection({
-//   host: process.env.DB_HOST,
-//   user: process.env.DB_USER,
-//   password: process.env.DB_PASSWORD,
-//   port: process.env.DB_PORT,
-//   database: 'travopti'
-// });
-
-const pool =  mysql.createPool({
-  connectionLimit: 10,
-  host: process.env.DB_HOST,
-  user: process.env.DB_USER,
-  password: process.env.DB_PASSWORD,
-  port: process.env.DB_PORT,
-  database: 'travopti',
-  // typeCast: function (field, next) {
-  //   if (field.type == "INT") {
-  //     var value = field.string();
-  //     return (value === null) ? null : Number(value);
-  //   }
-  //   return next();
-  // }
-  decimalNumbers: true
-});
-
-pool.getConnection()
-  .then(function (connection) {
-    console.log(`Connected to database: ${process.env.DB_HOST}`);
-    //pool.releaseConnection(connection)
-  })
-  .catch(function (error) {
-    console.error(error.message);
-  });
-
-module.exports = pool;
-
-// let travoptidb = {}
-// travoptidb.all = () => {
-//   return new Promise((resolve, reject) => {
-//     pool.query(`SELECT * FROM regions`, (err, results) => {
-//       if (err) {
-//         return reject(err)
-//       }
-//       return resolve(results)
-//     })
-//   })
-// }
-
-// connection.connect((err) => {
-//   if (err) throw err;
-//   console.log('Database connected!')
-// });
-
-
-// exports.getRegions = () => {
-//   let sql = `SELECT * FROM regions`;
-//   console.log(connection.state)
-//   if (connection.state === 'disconnected') {
-//     setTimeout(() => console.log('waiting...'), 1000);
-//   }
-//   console.log('executed')
-//   let res = {}
-//   connection.query(sql, (error, results, fields) => {
-//     if (error) {
-//       return console.error(error.message);
-//     }
-//     console.log('innercallback(1)')
-//     res = results[0]
-//   });
-//   console.log('outsidecallback(2)')
-//   return res;
-// }
-
-// exports.getBYTdata = () => {
-//   connection.query(`SELECT * FROM regions_byt`, (error, results, fields) => {
-//     if (error) {
-//       return console.error(error.message);
-//     }
-//     console.log(results[0])
-//     nres = results.map((obj) => {
-//       return obj.region
-//     })
-//     //console.log(nres);
-//   });
-// }
-
-// exports.end = () => connection.end();
-
-// module.exports = connection;

backend/package-lock.json

@@ -25,6 +25,16 @@
       "integrity": "sha512-rr+OQyAjxze7GgWrSaJwydHStIhHq2lvY3BOC2Mj7KnzI7XK0Uw1TOOdI9lDoajEbSWLiYgoo4f1R51erQfhPQ==",
       "dev": true
     },
+    "@types/geojson": {
+      "version": "7946.0.7",
+      "resolved": "https://registry.npmjs.org/@types/geojson/-/geojson-7946.0.7.tgz",
+      "integrity": "sha512-wE2v81i4C4Ol09RtsWFAqg3BUitWbHSpSlIo+bNdsCJijO9sjme+zm+73ZMCa/qMC8UEERxzGbvmr1cffo2SiQ=="
+    },
+    "@types/node": {
+      "version": "13.13.12",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-13.13.12.tgz",
+      "integrity": "sha512-zWz/8NEPxoXNT9YyF2osqyA9WjssZukYpgI4UYZpOjcyqwIUqWGkcCionaEb9Ki+FULyPyvNFpg/329Kd2/pbw=="
+    },
     "abbrev": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
@@ -112,6 +122,14 @@
       "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
       "dev": true
     },
+    "basic-auth": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/basic-auth/-/basic-auth-2.0.1.tgz",
+      "integrity": "sha512-NF+epuEdnUYVlGuhaxbbq+dvJttwLnGY+YixlXlME5KpQ5W3CnXA5cVTneY3SPbPDRkcjMbifrwmFYcClgOZeg==",
+      "requires": {
+        "safe-buffer": "5.1.2"
+      }
+    },
     "binary-extensions": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.0.0.tgz",
@@ -645,6 +663,11 @@
         "toidentifier": "1.0.0"
       }
     },
+    "httpolyglot": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/httpolyglot/-/httpolyglot-0.1.2.tgz",
+      "integrity": "sha1-5NNH/omEpi9GfUBg31J/GFH2mXs="
+    },
     "iconv-lite": {
       "version": "0.4.24",
       "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
@@ -842,6 +865,30 @@
         }
       }
     },
+    "mariadb": {
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/mariadb/-/mariadb-2.4.0.tgz",
+      "integrity": "sha512-78zrj9SpF6I3eVWMMkdm+SEfcsMb/uWVKPo7pKhhCfuGywEf3I1dK0ewSTjD0SyTEgSEuWn/H/I4TIErGgYTCQ==",
+      "requires": {
+        "@types/geojson": "^7946.0.7",
+        "@types/node": "^13.9.8",
+        "denque": "^1.4.1",
+        "iconv-lite": "^0.5.1",
+        "long": "^4.0.0",
+        "moment-timezone": "^0.5.31",
+        "please-upgrade-node": "^3.2.0"
+      },
+      "dependencies": {
+        "iconv-lite": {
+          "version": "0.5.2",
+          "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.5.2.tgz",
+          "integrity": "sha512-kERHXvpSaB4aU3eANwidg79K8FlrN77m8G9V+0vOR3HYaRifrlwMEpT7ZBJqLSEIHnEgJTHcWK82wwLwwKwtag==",
+          "requires": {
+            "safer-buffer": ">= 2.1.2 < 3"
+          }
+        }
+      }
+    },
     "media-typer": {
       "version": "0.3.0",
       "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
@@ -901,6 +948,33 @@
       "resolved": "https://registry.npmjs.org/moment/-/moment-2.26.0.tgz",
       "integrity": "sha512-oIixUO+OamkUkwjhAVE18rAMfRJNsNe/Stid/gwHSOfHrOtw9EhAY2AHvdKZ/k/MggcYELFCJz/Sn2pL8b8JMw=="
     },
+    "moment-timezone": {
+      "version": "0.5.31",
+      "resolved": "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.31.tgz",
+      "integrity": "sha512-+GgHNg8xRhMXfEbv81iDtrVeTcWt0kWmTEY1XQK14dICTXnWJnT0dxdlPspwqF3keKMVPXwayEsk1DI0AA/jdA==",
+      "requires": {
+        "moment": ">= 2.9.0"
+      }
+    },
+    "morgan": {
+      "version": "1.10.0",
+      "resolved": "https://registry.npmjs.org/morgan/-/morgan-1.10.0.tgz",
+      "integrity": "sha512-AbegBVI4sh6El+1gNwvD5YIck7nSA36weD7xvIxG4in80j/UoK8AEGaWnnz8v1GxonMCltmlNs5ZKbGvl9b1XQ==",
+      "requires": {
+        "basic-auth": "~2.0.1",
+        "debug": "2.6.9",
+        "depd": "~2.0.0",
+        "on-finished": "~2.3.0",
+        "on-headers": "~1.0.2"
+      },
+      "dependencies": {
+        "depd": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
+          "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw=="
+        }
+      }
+    },
     "ms": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
@@ -1025,6 +1099,11 @@
         "ee-first": "1.1.1"
       }
     },
+    "on-headers": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/on-headers/-/on-headers-1.0.2.tgz",
+      "integrity": "sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA=="
+    },
     "once": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
@@ -1065,6 +1144,15 @@
       "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz",
       "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ=="
     },
+    "path": {
+      "version": "0.12.7",
+      "resolved": "https://registry.npmjs.org/path/-/path-0.12.7.tgz",
+      "integrity": "sha1-1NwqUGxM4hl+tIHr/NWzbAFAsQ8=",
+      "requires": {
+        "process": "^0.11.1",
+        "util": "^0.10.3"
+      }
+    },
     "path-to-regexp": {
       "version": "0.1.7",
       "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz",
@@ -1076,12 +1164,25 @@
       "integrity": "sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg==",
       "dev": true
     },
+    "please-upgrade-node": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/please-upgrade-node/-/please-upgrade-node-3.2.0.tgz",
+      "integrity": "sha512-gQR3WpIgNIKwBMVLkpMUeR3e1/E1y42bqDQZfql+kDeXd8COYfM8PQA4X6y7a8u9Ua9FHmsrrmirW2vHs45hWg==",
+      "requires": {
+        "semver-compare": "^1.0.0"
+      }
+    },
     "prepend-http": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-2.0.0.tgz",
       "integrity": "sha1-6SQ0v6XqjBn0HN/UAddBo8gZ2Jc=",
       "dev": true
     },
+    "process": {
+      "version": "0.11.10",
+      "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz",
+      "integrity": "sha1-czIwDoQBYb2j5podHZGn1LwW8YI="
+    },
     "proxy-addr": {
       "version": "2.0.6",
       "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.6.tgz",
@@ -1214,6 +1315,11 @@
       "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
       "dev": true
     },
+    "semver-compare": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/semver-compare/-/semver-compare-1.0.0.tgz",
+      "integrity": "sha1-De4hahyUGrN+nvsXiPavxf9VN/w="
+    },
     "semver-diff": {
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/semver-diff/-/semver-diff-3.1.1.tgz",
@@ -1471,6 +1577,14 @@
         "prepend-http": "^2.0.0"
       }
     },
+    "util": {
+      "version": "0.10.4",
+      "resolved": "https://registry.npmjs.org/util/-/util-0.10.4.tgz",
+      "integrity": "sha512-0Pm9hTQ3se5ll1XihRic3FDIku70C+iHUdT/W926rSgHV5QgXsYbKZN8MSC3tJtSkhuROzvsQjAaFENRXr+19A==",
+      "requires": {
+        "inherits": "2.0.3"
+      }
+    },
     "utils-merge": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz",

backend/package.json

@@ -4,17 +4,22 @@
   "description": "",
   "main": "app.js",
   "scripts": {
-    "start": "nodemon ./app.js"
+    "start": "nodemon ./index.js"
   },
   "author": "",
   "license": "ISC",
   "dependencies": {
     "axios": "^0.19.2",
+    "body-parser": "^1.19.0",
     "dotenv": "^8.2.0",
     "express": "^4.17.1",
+    "httpolyglot": "^0.1.2",
     "lodash": "^4.17.15",
+    "mariadb": "^2.4.0",
     "moment": "^2.26.0",
-    "mysql2": "^2.1.0"
+    "morgan": "^1.10.0",
+    "mysql2": "^2.1.0",
+    "path": "^0.12.7"
   },
   "devDependencies": {
     "nodemon": "^2.0.4"

backend/routes/climate.js

@@ -0,0 +1,11 @@
+const router = require("express").Router()
+const handleClimateUpdate = require("../models/handleClimateUpdate.js")
+
+module.exports = dbConn => {
+    router.put("/api/v1/climate/update", async (req, res) => {
+        const update = await handleClimateUpdate(dbConn)
+        res.json(update)
+    });
+
+    return router;
+};

backend/routes/countries.js

@@ -0,0 +1,15 @@
+const router = require("express").Router();
+const getCountries = require("../models/getCountries.js");
+const getCountryById = require("../models/getCountryById.js");
+
+module.exports = dbConn => {
+    router.get("/api/v1/countries", async (req, res) => {
+        res.json(await getCountries(dbConn));
+    });
+
+    router.get("/api/v1/countries/:id", async (req, res) => {
+        const id = req.params.id;
+        res.json(await getCountryById(dbConn, id))
+    });
+    return router;
+};

backend/routes/regions.js

@@ -0,0 +1,19 @@
+const router = require("express").Router();
+const getRegions = require("../models/getRegions.js");
+const getRegionById = require("../models/getRegionById.js");
+const path = require("path");
+
+module.exports = dbConn => {
+    router.get("/api/v1/regions", async (req, res) => {
+        res.json(await getRegions(dbConn));
+    });
+    router.get('/api/v1/regions/:id/image', (req, res) => {
+        res.sendFile(path.join(__dirname, `../data/regions/images/${req.params.id}.jpg`))
+    })
+
+    router.get("/api/v1/regions/:id", async (req, res) => {
+        const id = req.params.id;
+       res.json(await getRegionById(dbConn, id))
+    });
+    return router;
+};

backend/routes/search.js

@@ -0,0 +1,60 @@
+const router = require("express").Router();
+const _ = require('lodash')
+const getSearchPresets = require("../models/getSearchPresets.js");
+const base64 = require("../util/base64.js")
+const sas = require("../util/scoreAndSearch.js")
+
+
+module.exports = dbConn => {
+  router.get("/api/v1/search", searchHandler(dbConn));
+  router.get("/api/v1/search/presets", presetHandler(dbConn));
+
+  return router;
+};
+
+function presetHandler(dbConn) {
+  return function (req, res) {
+    getSearchPresets(dbConn).then(presets => {
+      res.json(presets)
+    }).catch(error => {
+      // TODO error handling
+    })
+  }
+}
+
+function searchHandler(dbConn) {
+  const scoreAndSearch = sas(dbConn)
+  return function (req, res) {
+    let response = {}
+
+    response.meta = {
+      params: req.params,
+      query: req.query,
+      headers: req.headers
+    }
+
+    let q = req.query.q ? base64.base64ToObj(req.query.q) : req.query
+    console.log('Q:', q)
+
+    let scoreQueryObj = {}
+    if (q.temperature) scoreQueryObj['temperature_mean_max'] = q.temperature
+    if (q.percipitation) scoreQueryObj['percipitation'] = q.percipitation
+    if (q.raindays) scoreQueryObj['raindays'] = q.raindays
+    if (q.sunhours) scoreQueryObj['sunhours'] = q.sunhours
+    // @TimoJ   1. hier die Parameter die gescored werden sollen hinufügen
+
+    if (_.isEmpty(scoreQueryObj)) {
+      res.status(400).send('provide at least one search parameter.');
+    }
+    scoreAndSearch(q.from, q.to, scoreQueryObj).then(searchResults => {
+
+      // TODO hier könnten Suchergebnisse gefiltert werden: für Textsuche oder Exludes....
+      response.data = searchResults
+      res.json(response)
+    }).catch(e => {
+      // TODO error handling
+      console.log(e)
+      res.json(e.message)
+    })
+  }
+}

backend/util/dbConnection.js

@@ -0,0 +1,47 @@
+const mariadb = require("mariadb");
+let dbConn;
+let conPool;
+// mariadb doc: https://github.com/MariaDB/mariadb-connector-nodejs/blob/master/documentation/promise-api.md
+
+async function reconnect() {
+    try {
+        dbConn = await conPool.getConnection();
+    } catch (e) {
+        if (e.code === "ECONNREFUSED") {
+            let err = new Error("Lost connection to the database");
+            err.code = "ERR_DB_CONN_LOST";
+            throw err;
+        } else {
+            throw e;
+        }
+    }
+}
+
+module.exports = async config => {
+    conPool = mariadb.createPool({
+        host: process.env.DB_HOST,
+        user: process.env.DB_USER,
+        password: process.env.DB_PASSWORD,
+        port: process.env.DB_PORT,
+        database: 'travopti',
+        connectionLimit: 10
+    });
+
+    dbConn = await conPool.getConnection();
+    return {
+        async query(q, p) {
+            let res;
+            try {
+                res = await dbConn.query(q, p);
+            } catch (e) {
+                if (e.code === "ER_CMD_CONNECTION_CLOSED") {
+                    await reconnect();
+                    await this.query(q, p);
+                } else {
+                    throw e;
+                }
+            }
+            return res;
+        }
+    };
+};

backend/util/getAllRegionsWithClimatePerMonth.js

@@ -0,0 +1,25 @@
+
+
+module.exports = function (dbConn) {
+	return async function getAllRegionsWithClimatePerMonth(month) {
+		console.log('getAllRegionsWithClimatePerMonth')
+		const sql = `SELECT 
+	region_climate.region_id AS region_id,
+	countries.country AS country,
+	regions.region AS name,
+	ROUND(AVG(region_climate.temperature_mean), 1) AS temperature_mean, 
+	ROUND(AVG(region_climate.temperature_mean_min), 1) AS temperature_mean_min, 
+	ROUND(AVG(region_climate.temperature_mean_max), 1) AS temperature_mean_max, 
+	ROUND(AVG(region_climate.percipitation), 1) AS percipitation, 
+	ROUND(AVG(region_climate.raindays), 1) AS raindays, 
+	ROUND(AVG(region_climate.sunshine), 1) AS sunhours
+	FROM region_climate 
+	JOIN regions ON region_climate.region_id = regions.id 
+	JOIN countries ON regions.country_id = countries.id 
+	WHERE region_climate.month = ${month} GROUP BY region_id`
+		let response = await dbConn.query(sql)
+		console.log(response[0]);
+
+		return response
+	}
+}

backend/util/getClimateMinMax.js

@@ -0,0 +1,22 @@
+exports.getClimateMinMax = async function (dbConn) {
+    console.log('getClimateMinMax')
+    const sqlMin = `SELECT 
+      MIN(temperature_mean) AS temperature_mean,
+      MIN(temperature_mean_min) AS temperature_mean_min, 
+      MIN(temperature_mean_max) AS temperature_mean_max, 
+      MIN(percipitation) AS percipitation, 
+      MIN(raindays) AS raindays, 
+      MIN(sunshine) AS sunhours
+      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(percipitation) AS percipitation, 
+      MAX(raindays) AS raindays, 
+      MAX(sunshine) AS sunhours
+      FROM region_climate`
+    const [qResMin, qResMax] = await Promise.all([dbConn.query(sqlMin), dbConn.query(sqlMax)])
+    // console.log(qResMin)
+    return { min: qResMin[0], max: qResMax[0] }
+}

backend/util/getClimatePerRegionAndMonth.js

@@ -0,0 +1,5 @@
+function getClimatePerRegionAndMonth(regionId, month) {
+  console.log('getClimatePerRegionAndMonth')
+  const sql = `SELECT region_id, AVG(temperature_mean), AVG(temperature_mean_min), AVG(temperature_mean_max), AVG(percipitation), AVG(sunshine) FROM region_climate WHERE month = ${month} AND region_id = ${regionId}`
+  return getQueryRows(sql)
+}

backend/util/oldToNewQuerySyntax.js

@@ -0,0 +1,14 @@
+exports.oldToNewQuerySyntax = function (queries) {
+    let res = {}
+    try {
+        if (queries.temperature_mean_max) res.temperature_mean_max = [queries.temperature_mean_max.split(',')[0], queries.temperature_mean_max.split(',')[1]]
+        if (queries.percipitation) res.percipitation = [queries.percipitation.split(',')[0], queries.percipitation.split(',')[1]]
+        if (queries.raindays) res.raindays = [queries.raindays.split(',')[0], queries.raindays.split(',')[1]]
+        if (queries.sunhours) res.sunhours = [queries.sunhours.split(',')[0], queries.sunhours.split(',')[1]]
+        console.log('queries successfully transformed');
+    } catch (error) {
+        console.log('queries are ok');
+        return queries
+    }
+    return res
+}

backend/util/score.js

@@ -1,13 +1,3 @@
-/**
- * 
- */
-const multiplier_temperature = 5;
-
-
-/**
- * 
- * @param  {...any} scores expects objects which contains score and their weight
- */
 exports.calculateAvgScore = (...scores) => {
   return avgScore = scores.reduce((total, score) => total += score) / scores.length;
 }
@@ -18,14 +8,10 @@ exports.calculateScoreRange = (min, max, multiplier, regionVal, sLowVal, sHighVa
   if (regionVal >= sLowVal && regionVal <= sHighVal) return 10;
   // choose value with smallest distance
   let sVal = Math.abs(regionVal - sLowVal) < Math.abs(regionVal - sHighVal) ? sLowVal : sHighVal;
-  //console.log('nearest value',sVal, regionVal)
   return this.calculateScore(min, max, multiplier, regionVal, sVal);
 }
 
 exports.calculateScore = (min, max, multiplier, regionVal, searchVal) => {
-
   let score = 1 - (Math.abs(searchVal - regionVal) / (max - min) * multiplier);
   return score <= 0 ? 0 : score * 10;
 }
-
-console.log('test score calculation. result: ' + this.calculateScoreRange(-15, 45, 5, 24, 15, 22))

backend/util/scoreAndSearch.js

@@ -0,0 +1,133 @@
+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 transformer = require('./transformer')
+
+const MULTIPLIER = {
+  temperature_mean_max: 5,
+  percipitation: 3.5,
+  raindays: 3,
+  sunhours: 2.5,
+}
+
+module.exports = function (dbConn) {
+  return async function (from, to, queries) {
+    console.log('search')
+
+    // get Min and Max values for each Parameter
+    const minMax = await getClimateMinMax.getClimateMinMax(dbConn)
+
+    // randomize if query contains randomize=true
+    if (queries.randomize) {
+      let t = _.round(_.random(minMax.min.temperature_mean_max, minMax.max.temperature_mean_max - 5), 0)
+      let p = _.round(_.random(minMax.min.percipitation, minMax.max.percipitation - 50), 0)
+      let r = _.round(_.random(minMax.min.raindays, minMax.max.raindays - 5), 0)
+      let s = _.round(_.random(minMax.min.sunhours, minMax.max.sunhours - 50), 0)
+      queries.temperature_mean_max = `${t},${t + 5}`
+      queries.percipitation = `${p},${p + 50}`
+      queries.raindays = `${r},${r + 5}`
+      queries.sunhours = `${s},${s + 50}`
+      delete queries.randomize
+    }
+    queries = oldToNewQuerySyntax.oldToNewQuerySyntax(queries)
+    console.log(queries)
+
+    // TODO simplify and remove support for old query syntaax
+    let monthFrom = 0
+    let monthTo = 0
+    let dayFrom = 0
+    let dayTo = 0
+
+    if (_.isNumber(from) && _.isNumber(to)) {
+      let dateFrom = moment(from).toDate()
+      let dateTo = moment(to).toDate()
+      monthFrom = dateFrom.getMonth()
+      monthTo = dateTo.getMonth()
+      dayFrom = dateFrom.getDay()
+      dayTo = dateTo.getDay()
+      if (moment(dateFrom).add(23, 'hours').isAfter(moment(dateTo))) throw new Error("ERR: 'to' must be at least one day after 'from'.")
+    } else {
+      //  to still support old query syntax
+      let re = /([12]\d{3}-(0[1-9]|1[0-2])-(0[1-9]|[12]\d|3[01]))/i;
+      monthFrom = Number(from.split("-")[1])
+      monthTo = Number(to.split("-")[1])
+      dayFrom = Number(from.split("-")[2])
+      dayTo = Number(to.split("-")[2])
+      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'.")
+    }
+
+    // -- Prepare search --
+    // to calculate average if traveldates are in more than one month
+    let travelPeriods = []
+    if (monthFrom === monthTo) {
+      let element = {
+        month: monthFrom,
+        days: dayTo - dayFrom
+      }
+      travelPeriods.push(element)
+    } else {
+      for (let index = monthFrom; index <= monthTo; index++) {
+        let element = {}
+        if (index === monthFrom) {
+          element = {
+            month: index,
+            days: 32 - dayFrom
+          }
+        } else if (index === monthTo) {
+          element = {
+            month: index,
+            days: dayTo
+          }
+        } else {
+          element = {
+            month: index,
+            days: 30
+          }
+        }
+        travelPeriods.push(element)
+      }
+    }
+
+    // calculate detail scores
+    let detailScores = await Promise.all(travelPeriods.map(async period => {
+      period.climate = await getAllRegionsWithClimatePerMonth(dbConn)(period.month)
+      period.scores = {}
+      Object.entries(queries).forEach(([key, value]) => {
+        // console.log('key',key)
+        // console.log('val', value)
+        period.scores[key] = calculateScoresWrapper(key, period.climate, value[0], value[1], minMax)
+      });
+      return period
+    }));
+
+
+    // calculate ratio and transform into target object
+    return {
+      results: transformer.transform(detailScores),
+      debug: {
+        detailScores: detailScores,
+        minMax: minMax
+      }
+    }
+  }
+
+  function calculateScoresWrapper(type, regionDataRows, searchLowParam, searchMaxParam, minMax) {
+    console.log('calculateScores for', type)
+    let result = regionDataRows.map(x => {
+      const sc = Math.round(score.calculateScoreRange(minMax.min[type], minMax.max[type], MULTIPLIER[type], x[type], searchLowParam, searchMaxParam) * 100) / 100
+
+      return {
+        region_id: x.region_id,
+        type: type,
+        value: x[type],
+        score: x[type] === null ? null : sc
+      }
+
+    })
+    return result
+  }
+}

backend/util/transformer.js

@@ -9,10 +9,11 @@ exports.transform = (data) => {
 
   // STEP 1  Create Response Array with region names from first climate object
   let byRegion = data[0].climate.map(el => {
+    // return el
     return {
       region_id: el.region_id,
-      country_id: el.country_id,
       name: el.name,
+      country: el.country,
     }
   })
 

package-lock.json

@@ -0,0 +1,11 @@
+{
+  "requires": true,
+  "lockfileVersion": 1,
+  "dependencies": {
+    "httpolyglot": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/httpolyglot/-/httpolyglot-0.1.2.tgz",
+      "integrity": "sha1-5NNH/omEpi9GfUBg31J/GFH2mXs="
+    }
+  }
+}