From faa7a7e5b1f09659a5f2b7226be1bbe970da1054 Mon Sep 17 00:00:00 2001 From: Timo Volkmann Date: Tue, 23 Jun 2020 15:04:50 +0200 Subject: [PATCH] removed incorrectly committed files --- backend/util/prices.js | 0 backend/util/scoreAndSearch.js | 28 +++++++++++++++++++++++++++- 2 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 backend/util/prices.js diff --git a/backend/util/prices.js b/backend/util/prices.js new file mode 100644 index 0000000..e69de29 diff --git a/backend/util/scoreAndSearch.js b/backend/util/scoreAndSearch.js index 2f4f76d..6657941 100644 --- a/backend/util/scoreAndSearch.js +++ b/backend/util/scoreAndSearch.js @@ -71,8 +71,11 @@ module.exports = function (dbConn) { if (!q.climate.sun_hours) q.climate.sun_hours = [null, null] if (!q.climate.accommodation_costs) q.climate.accommodation_costs = [null, null] } - // CALCULATE SCORES FOR CLIMATE PROPS + + // CALCULATE PROPERTIES FOR EACH REGION regions.forEach(reg => { + + // CALCULATE SCORES FOR CLIMATE PROPS Object.entries(q.climate).forEach(([key, value]) => { let finalScoreObj = calculateScoreForPeriod(key, travelPeriods, reg, value[0], value[1], boundaryClimate) reg.scores.push(finalScoreObj) @@ -91,7 +94,17 @@ module.exports = function (dbConn) { reg.scores.push(offSeasonScoreObj) } + // CALCULATE PRICE TENDENCY FOR TIMEFRAME reg.price_tendency_relative = getAverageFromTrivago(travelPeriods, reg) + + // CALCULATE SUM FOR ACCOMODATION FROM AVERAGE PRICES + 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.name = `${reg.name} ca. ${_.round(sumForRangeAvg(dates.from, dates.to, reg.accommodation_costs), 2)}€` + + // CALCULATE TOTAL PRICE WITH TRANSPORTATION + + // CALCULATE TOTAL PRICE WITH TRANSPORTATION AND ESTEEMED LIFE COSTS // CALCULATE AVERAGE SCORE Stage 1 let scoreSubGroups = [] @@ -105,6 +118,19 @@ module.exports = function (dbConn) { }) return _.orderBy(regions, ({ score }) => score || 0, 'desc') //.filter(el => !_.isNaN(el.score)) } + + function sumForRangeAvg(from, to, avg) { + let duration = moment(to).diff(moment(from), 'days') + return duration * avg + } + + function sumForRangeFromDailyValues(from, to, dailyValues) { + // NOT NEEDED YET + // for (var m = moment(from).subtract(1, 'months'); m.isSameOrBefore(moment(to).subtract(1, 'months')); m.add(1, 'day')) { + // console.log(m); + // } + } + function calculateAverage(scores) { let sum = 0