From 97d86a6f062b06b101dfa1e191910420e8ab325c Mon Sep 17 00:00:00 2001 From: build-pipeline <build-token> Date: Mon, 1 Jul 2024 09:08:30 +0000 Subject: [PATCH] publish: Merge branch 'test/fetchAvgTemperature' into 'dev' generated from commit d250ccdfebf79cbb78dce279d8dda95be300f851 --- ...37df92cf0e.js => ecolyo.0143ee677f73d5f68247.js} | 13 +++++-------- index.html | 2 +- services/aggregatorUsageEvents/ecolyo.js | 3 +-- services/consumptionAlert/ecolyo.js | 3 +-- services/enedisHalfHourMonthlyAnalysis/ecolyo.js | 3 +-- services/fluidsPrices/ecolyo.js | 3 +-- services/monthlyReportNotification/ecolyo.js | 3 +-- 7 files changed, 11 insertions(+), 19 deletions(-) rename app/{ecolyo.286d0e133d37df92cf0e.js => ecolyo.0143ee677f73d5f68247.js} (99%) diff --git a/app/ecolyo.286d0e133d37df92cf0e.js b/app/ecolyo.0143ee677f73d5f68247.js similarity index 99% rename from app/ecolyo.286d0e133d37df92cf0e.js rename to app/ecolyo.0143ee677f73d5f68247.js index 2f0cac0ed..375f36829 100644 --- a/app/ecolyo.286d0e133d37df92cf0e.js +++ b/app/ecolyo.0143ee677f73d5f68247.js @@ -33508,29 +33508,26 @@ var ConsumptionDataManager = /*#__PURE__*/function () { case 5: result = _context.sent; if (!(result && result.nb_results !== 0)) { - _context.next = 10; + _context.next = 8; break; } return _context.abrupt("return", result.values[0].average_measurement); - case 10: + case 8: throw new Error("No average temperature found for ".concat(avgTemperatureDate)); case 11: - _context.next = 20; - break; - case 13: - _context.prev = 13; + _context.prev = 11; _context.t0 = _context["catch"](2); errorMessage = "fetchAvgTemperature error : ".concat(_context.t0); logStack('error', errorMessage); _logger.default.error(errorMessage); Sentry.captureException(_context.t0); return _context.abrupt("return", null); - case 20: + case 18: case "end": return _context.stop(); } } - }, _callee, null, [[2, 13]]); + }, _callee, null, [[2, 11]]); })); return function (_x, _x2) { return _ref.apply(this, arguments); diff --git a/index.html b/index.html index 338a3c8ed..e341ecb05 100644 --- a/index.html +++ b/index.html @@ -1 +1 @@ -<!DOCTYPE html><html lang="{{.Locale}}"><head><meta charset="utf-8"><title>Ecolyo</title><link rel="icon" type="image/png" href="/favicon-32x32.png" sizes="32x32"><link rel="icon" type="image/png" href="/favicon-16x16.png" sizes="16x16"><!-- PWA Manifest --><link rel="manifest" href="/manifest.json" crossorigin="use-credentials"><link rel="mask-icon" href="/safari-pinned-tab.svg" color="#297EF2"><meta name="viewport" content="width=device-width,height=device-height,initial-scale=1,viewport-fit=cover"><!-- PWA Chrome --><link rel="icon" sizes="192x192" href="/android-chrome-192x192.png"><link rel="icon" sizes="512x512" href="/android-chrome-512x512.png"><!-- PWA iOS --><link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png"><link rel="apple-touch-startup-image" href="/apple-touch-icon.png"><meta name="apple-mobile-web-app-title" content="Ecolyo"><meta name="apple-mobile-web-app-capable" content="yes"><meta name="apple-mobile-web-app-status-bar-style" content="black"><!-- PWA Colors --><meta name="theme-color" content="#343641"><meta name="background-color" content="#121212">{{.ThemeCSS}} {{.CozyBar}}<script src="//{{.Domain}}/assets/js/piwik.js"></script></head><body><div role="application" class="application" data-cozy="{{.CozyData}}"><script src="vendors/ecolyo.e8036ce80af3e4d9351b.js"></script><script src="app/ecolyo.286d0e133d37df92cf0e.js"></script></div></body></html> \ No newline at end of file +<!DOCTYPE html><html lang="{{.Locale}}"><head><meta charset="utf-8"><title>Ecolyo</title><link rel="icon" type="image/png" href="/favicon-32x32.png" sizes="32x32"><link rel="icon" type="image/png" href="/favicon-16x16.png" sizes="16x16"><!-- PWA Manifest --><link rel="manifest" href="/manifest.json" crossorigin="use-credentials"><link rel="mask-icon" href="/safari-pinned-tab.svg" color="#297EF2"><meta name="viewport" content="width=device-width,height=device-height,initial-scale=1,viewport-fit=cover"><!-- PWA Chrome --><link rel="icon" sizes="192x192" href="/android-chrome-192x192.png"><link rel="icon" sizes="512x512" href="/android-chrome-512x512.png"><!-- PWA iOS --><link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png"><link rel="apple-touch-startup-image" href="/apple-touch-icon.png"><meta name="apple-mobile-web-app-title" content="Ecolyo"><meta name="apple-mobile-web-app-capable" content="yes"><meta name="apple-mobile-web-app-status-bar-style" content="black"><!-- PWA Colors --><meta name="theme-color" content="#343641"><meta name="background-color" content="#121212">{{.ThemeCSS}} {{.CozyBar}}<script src="//{{.Domain}}/assets/js/piwik.js"></script></head><body><div role="application" class="application" data-cozy="{{.CozyData}}"><script src="vendors/ecolyo.e8036ce80af3e4d9351b.js"></script><script src="app/ecolyo.0143ee677f73d5f68247.js"></script></div></body></html> \ No newline at end of file diff --git a/services/aggregatorUsageEvents/ecolyo.js b/services/aggregatorUsageEvents/ecolyo.js index 28c6f3272..54ec41108 100644 --- a/services/aggregatorUsageEvents/ecolyo.js +++ b/services/aggregatorUsageEvents/ecolyo.js @@ -44260,9 +44260,8 @@ class ConsumptionDataManager { const result = await this._client.getStackClient().fetchJSON('GET', `${_orgEcolyo.REMOTE_ORG_ECOLYO_AVG_TEMPERATURE}?identifiant=${bronStationId}&month=${avgTemperatureDate}`); if (result && result.nb_results !== 0) { return result.values[0].average_measurement; - } else { - throw new Error(`No average temperature found for ${avgTemperatureDate}`); } + throw new Error(`No average temperature found for ${avgTemperatureDate}`); } catch (error) { const errorMessage = `fetchAvgTemperature error : ${error}`; logStack('error', errorMessage); diff --git a/services/consumptionAlert/ecolyo.js b/services/consumptionAlert/ecolyo.js index 948c6e20c..74ae0c325 100644 --- a/services/consumptionAlert/ecolyo.js +++ b/services/consumptionAlert/ecolyo.js @@ -43857,9 +43857,8 @@ class ConsumptionDataManager { const result = await this._client.getStackClient().fetchJSON('GET', `${_orgEcolyo.REMOTE_ORG_ECOLYO_AVG_TEMPERATURE}?identifiant=${bronStationId}&month=${avgTemperatureDate}`); if (result && result.nb_results !== 0) { return result.values[0].average_measurement; - } else { - throw new Error(`No average temperature found for ${avgTemperatureDate}`); } + throw new Error(`No average temperature found for ${avgTemperatureDate}`); } catch (error) { const errorMessage = `fetchAvgTemperature error : ${error}`; logStack('error', errorMessage); diff --git a/services/enedisHalfHourMonthlyAnalysis/ecolyo.js b/services/enedisHalfHourMonthlyAnalysis/ecolyo.js index 9d00bc443..4ef9d68fc 100644 --- a/services/enedisHalfHourMonthlyAnalysis/ecolyo.js +++ b/services/enedisHalfHourMonthlyAnalysis/ecolyo.js @@ -43857,9 +43857,8 @@ class ConsumptionDataManager { const result = await this._client.getStackClient().fetchJSON('GET', `${_orgEcolyo.REMOTE_ORG_ECOLYO_AVG_TEMPERATURE}?identifiant=${bronStationId}&month=${avgTemperatureDate}`); if (result && result.nb_results !== 0) { return result.values[0].average_measurement; - } else { - throw new Error(`No average temperature found for ${avgTemperatureDate}`); } + throw new Error(`No average temperature found for ${avgTemperatureDate}`); } catch (error) { const errorMessage = `fetchAvgTemperature error : ${error}`; logStack('error', errorMessage); diff --git a/services/fluidsPrices/ecolyo.js b/services/fluidsPrices/ecolyo.js index 192d76501..39b1ad33f 100644 --- a/services/fluidsPrices/ecolyo.js +++ b/services/fluidsPrices/ecolyo.js @@ -43857,9 +43857,8 @@ class ConsumptionDataManager { const result = await this._client.getStackClient().fetchJSON('GET', `${_orgEcolyo.REMOTE_ORG_ECOLYO_AVG_TEMPERATURE}?identifiant=${bronStationId}&month=${avgTemperatureDate}`); if (result && result.nb_results !== 0) { return result.values[0].average_measurement; - } else { - throw new Error(`No average temperature found for ${avgTemperatureDate}`); } + throw new Error(`No average temperature found for ${avgTemperatureDate}`); } catch (error) { const errorMessage = `fetchAvgTemperature error : ${error}`; logStack('error', errorMessage); diff --git a/services/monthlyReportNotification/ecolyo.js b/services/monthlyReportNotification/ecolyo.js index 1748767ba..b0d0526e0 100644 --- a/services/monthlyReportNotification/ecolyo.js +++ b/services/monthlyReportNotification/ecolyo.js @@ -43857,9 +43857,8 @@ class ConsumptionDataManager { const result = await this._client.getStackClient().fetchJSON('GET', `${_orgEcolyo.REMOTE_ORG_ECOLYO_AVG_TEMPERATURE}?identifiant=${bronStationId}&month=${avgTemperatureDate}`); if (result && result.nb_results !== 0) { return result.values[0].average_measurement; - } else { - throw new Error(`No average temperature found for ${avgTemperatureDate}`); } + throw new Error(`No average temperature found for ${avgTemperatureDate}`); } catch (error) { const errorMessage = `fetchAvgTemperature error : ${error}`; logStack('error', errorMessage); -- GitLab