From 852d37cd1f811f44fd3e6d419c62aef4dac8235c Mon Sep 17 00:00:00 2001
From: git-directory-deploy <>
Date: Tue, 8 Mar 2022 17:03:01 +0100
Subject: [PATCH] publish: Merge branch 'dev' of
https://forge.grandlyon.com/web-et-numerique/llle_project/ecolyo into
feat/new-prices-managment
generated from commit 9c4a7aa94dbd8a5d317768c619f3f96da3acb38a
---
services/fluidsPrices/ecolyo.js | 21 +++++++++++----------
1 file changed, 11 insertions(+), 10 deletions(-)
diff --git a/services/fluidsPrices/ecolyo.js b/services/fluidsPrices/ecolyo.js
index da36290a8..f272577f5 100644
--- a/services/fluidsPrices/ecolyo.js
+++ b/services/fluidsPrices/ecolyo.js
@@ -76017,8 +76017,8 @@ const aggregatePrices = async (qr, cdm, firstDate, today, fluidType) => {
Object.assign(date, firstDate);
- try {
- do {
+ do {
+ try {
log('info', `Step: ${ts} | Fluid: ${fluidType} | Date: ${date.day}/${date.month}/${date.year}`);
const tp = await getTimePeriod(ts, date); // Get doc for aggregation
@@ -76033,8 +76033,11 @@ const aggregatePrices = async (qr, cdm, firstDate, today, fluidType) => {
} // Save updated docs
- await cdm.saveDocs(docToUpdate.data); // Update date according to timestep
-
+ await cdm.saveDocs(docToUpdate.data);
+ } catch (err) {
+ log('error', `Error : ${err}`);
+ } finally {
+ // Update date according to timestep
if (ts === _timeStep.TimeStep.YEAR) {
log('info', `YEEEEEEEEEEEEAAAAARR`);
date = date.plus({
@@ -76045,12 +76048,10 @@ const aggregatePrices = async (qr, cdm, firstDate, today, fluidType) => {
month: 1
}).startOf('month');
}
- } while (date < today);
- } catch (err) {
- log('error', `Error : ${err}`);
- } finally {
- resolve();
- }
+ }
+ } while (date < today);
+
+ resolve();
});
}));
log('debug', `Aggregation done`);
--
GitLab