diff --git a/src/libs/middlewares/aggregateData.js b/src/libs/middlewares/aggregateData.js index a7d24c42524b1e45789c6db633dfe5a9f9407926..58a098c93619a4d0cbc026c5c41025ecf6ea2c2e 100644 --- a/src/libs/middlewares/aggregateData.js +++ b/src/libs/middlewares/aggregateData.js @@ -1,5 +1,9 @@ const id2str = require(`./id2str`); +const convert = { + "adm_dependency_detailed": "admDependencyPriv" +} + function aggregateData(req, res, next) { const newResult = [] const aggregateFields = ['gender'] @@ -14,7 +18,7 @@ function aggregateData(req, res, next) { id = 1; for (const property in r) { if (property.includes("total_")) { - const data = { + let data = { total: r[property], year: r.year, [`${currentAggregateField}_id`]: id, @@ -23,8 +27,7 @@ function aggregateData(req, res, next) { if (currentNonAggregateField) { data[`${currentNonAggregateField}_id`] = r[`${currentNonAggregateField}_id`]; - console.log(currentNonAggregateField) - data[`${currentNonAggregateField}_name`] = id2str[`${currentNonAggregateField}_id`](id); + data[`${currentNonAggregateField}_name`] = id2str[convert[currentNonAggregateField]](r[`${currentNonAggregateField}_id`]); } newResult.push(data)