Fix #1677: When ecowatt request fail, it should stop scene (#1681)

GladysAssistant · Jan 2, 2023 · 3d2ffc8 · 3d2ffc8
1 parent ecccc20
commit 3d2ffc8
Show file tree

Hide file tree

Showing 2 changed files with 53 additions and 28 deletions.
diff --git a/server/lib/scene/scene.actions.js b/server/lib/scene/scene.actions.js
@@ -8,7 +8,7 @@ const utc = require('dayjs/plugin/utc');
 const timezone = require('dayjs/plugin/timezone');
 const { ACTIONS, DEVICE_FEATURE_CATEGORIES, DEVICE_FEATURE_TYPES } = require('../../utils/constants');
 const { getDeviceFeature } = require('../../utils/device');
-const { AbortScene, NotFoundError } = require('../../utils/coreErrors');
+const { AbortScene } = require('../../utils/coreErrors');
 const { compare } = require('../../utils/compare');
 const { parseJsonIfJson } = require('../../utils/json');
 const logger = require('../../utils/logger');
@@ -334,27 +334,31 @@ const actionsFunc = {
     }
   },
   [ACTIONS.ECOWATT.CONDITION]: async (self, action) => {
-    const data = await self.gateway.getEcowattSignals();
-    const todayDate = dayjs.tz(dayjs(), self.timezone).format('YYYY-MM-DD');
-    const todayHour = dayjs.tz(dayjs(), self.timezone).hour();
-    const todayLiveData = data.signals.find((day) => {
-      const signalDate = dayjs(day.jour).format('YYYY-MM-DD');
-      return todayDate === signalDate;
-    });
-    if (!todayLiveData) {
-      throw new NotFoundError('Ecowatt: day not found');
-    }
-    const currentHourNetworkStatus = todayLiveData.values.find((hour) => hour.pas === todayHour);
-    if (!currentHourNetworkStatus) {
-      throw new NotFoundError('Ecowatt: hour not found');
-    }
-    const ECOWATT_STATUSES = {
-      1: 'ok',
-      2: 'warning',
-      3: 'critical',
-    };
-    if (ECOWATT_STATUSES[currentHourNetworkStatus.hvalue] !== action.ecowatt_network_status) {
-      throw new AbortScene('ECOWATT_DIFFERENT_STATUS');
+    try {
+      const data = await self.gateway.getEcowattSignals();
+      const todayDate = dayjs.tz(dayjs(), self.timezone).format('YYYY-MM-DD');
+      const todayHour = dayjs.tz(dayjs(), self.timezone).hour();
+      const todayLiveData = data.signals.find((day) => {
+        const signalDate = dayjs(day.jour).format('YYYY-MM-DD');
+        return todayDate === signalDate;
+      });
+      if (!todayLiveData) {
+        throw new AbortScene('Ecowatt: day not found');
+      }
+      const currentHourNetworkStatus = todayLiveData.values.find((hour) => hour.pas === todayHour);
+      if (!currentHourNetworkStatus) {
+        throw new AbortScene('Ecowatt: hour not found');
+      }
+      const ECOWATT_STATUSES = {
+        1: 'ok',
+        2: 'warning',
+        3: 'critical',
+      };
+      if (ECOWATT_STATUSES[currentHourNetworkStatus.hvalue] !== action.ecowatt_network_status) {
+        throw new AbortScene('ECOWATT_DIFFERENT_STATUS');
+      }
+    } catch (e) {
+      throw new AbortScene(e.message);
     }
   },
 };

diff --git a/server/test/lib/scene/actions/scene.action.ecowattCondition.test.js b/server/test/lib/scene/actions/scene.action.ecowattCondition.test.js
@@ -13,7 +13,7 @@ describe('scene.ecowattCondition', () => {
   let clock;
   const timezone = 'Europe/Paris';
   beforeEach(async () => {
-    clock = useFakeTimers(new Date('2022-12-09T05:23:57.931Z'));
+    clock = useFakeTimers(new Date('2022-12-09T11:00:57'));
   });
   afterEach(() => {
     clock.restore();
@@ -55,12 +55,12 @@ describe('scene.ecowattCondition', () => {
     );
     return assert.isRejected(promise, AbortScene);
   });
-  it('should reject, day not found, but continue scene', async () => {
+  it('should reject, day not found', async () => {
     const gateway = {
       getEcowattSignals: fake.resolves({ signals: [] }),
     };
     const scope = {};
-    await executeActions(
+    const promise = executeActions(
       { event, gateway, timezone },
       [
         [
@@ -72,14 +72,15 @@ describe('scene.ecowattCondition', () => {
       ],
       scope,
     );
+    await assert.isRejected(promise, AbortScene, 'Ecowatt: day not found');
   });
-  it('should reject, hour not found, but continue scene', async () => {
+  it('should reject, hour not found', async () => {
     const gateway = {
       getEcowattSignals: fake.resolves({
         signals: [
           {
             GenerationFichier: '2022-12-08T23:00:00+01:00',
-            jour: '2022-12-09T00:00:00+01:00',
+            jour: '2022-12-09T12:00:00',
             dvalue: 1,
             message: 'Pas d’alerte.',
             values: [],
@@ -88,7 +89,26 @@ describe('scene.ecowattCondition', () => {
       }),
     };
     const scope = {};
-    await executeActions(
+    const promise = executeActions(
+      { event, gateway, timezone },
+      [
+        [
+          {
+            type: ACTIONS.ECOWATT.CONDITION,
+            ecowatt_network_status: 'warning',
+          },
+        ],
+      ],
+      scope,
+    );
+    await assert.isRejected(promise, AbortScene, 'Ecowatt: hour not found');
+  });
+  it('should not continue scene, ecowatt signals return error', async () => {
+    const gateway = {
+      getEcowattSignals: fake.rejects(new Error('500 - error')),
+    };
+    const scope = {};
+    const promise = executeActions(
       { event, gateway, timezone },
       [
         [
@@ -100,5 +120,6 @@ describe('scene.ecowattCondition', () => {
       ],
       scope,
     );
+    await assert.isRejected(promise, AbortScene, '500 - error');
   });
 });