From adacdf6a5c4cfb0700c19c7fedc765a37d7ac45f Mon Sep 17 00:00:00 2001 From: Yoan VALLET <ext.sopra.yvallet@grandlyon.com> Date: Tue, 24 Nov 2020 17:37:01 +0100 Subject: [PATCH] feat: remove old files --- .../consumptionDailyDataFormatterMock.json | 134 ------------ ...onsumptionHalfHourlyDataFormatterMock.json | 194 ------------------ .../consumptionMonthlyDataFormatterMock.json | 35 ---- test/__mocks__/enedis-dayMock.json | 170 --------------- test/__mocks__/triggerDataMock.json | 72 ------- .../ConsumptionDataFormatter.spec.ts.old | 87 -------- .../ConsumptionDataManager.spec.ts.old | 26 --- .../ConsumptionDataValidator.spec.ts.old | 99 --------- test/services/FluidService.spec.js.old | 28 --- test/services/QueryRunner.spec.ts.old | 26 --- test/services/TriggerService.spec.js.old | 22 -- .../_/consumptionDailyDataFormatterMock.json | 134 ------------ ...onsumptionHalfHourlyDataFormatterMock.json | 194 ------------------ test/services/_/triggerDataMock.json | 72 ------- 14 files changed, 1293 deletions(-) delete mode 100644 test/__mocks__/consumptionDailyDataFormatterMock.json delete mode 100644 test/__mocks__/consumptionHalfHourlyDataFormatterMock.json delete mode 100644 test/__mocks__/consumptionMonthlyDataFormatterMock.json delete mode 100644 test/__mocks__/enedis-dayMock.json delete mode 100644 test/__mocks__/triggerDataMock.json delete mode 100644 test/services/ConsumptionDataFormatter.spec.ts.old delete mode 100644 test/services/ConsumptionDataManager.spec.ts.old delete mode 100644 test/services/ConsumptionDataValidator.spec.ts.old delete mode 100644 test/services/FluidService.spec.js.old delete mode 100644 test/services/QueryRunner.spec.ts.old delete mode 100644 test/services/TriggerService.spec.js.old delete mode 100644 test/services/_/consumptionDailyDataFormatterMock.json delete mode 100644 test/services/_/consumptionHalfHourlyDataFormatterMock.json delete mode 100644 test/services/_/triggerDataMock.json diff --git a/test/__mocks__/consumptionDailyDataFormatterMock.json b/test/__mocks__/consumptionDailyDataFormatterMock.json deleted file mode 100644 index f1755a693..000000000 --- a/test/__mocks__/consumptionDailyDataFormatterMock.json +++ /dev/null @@ -1,134 +0,0 @@ -[ - { - "date": "2018-07-01T00:00:00.000+02:00", - "value": 242.23 - }, - { - "date": "2018-07-02T00:00:00.000+02:00", - "value": 230.2 - }, - { - "date": "2018-07-03T00:00:00.000+02:00", - "value": 225.13 - }, - { - "date": "2018-07-04T00:00:00.000+02:00", - "value": 220.63 - }, - { - "date": "2018-07-05T00:00:00.000+02:00", - "value": 204.53 - }, - { - "date": "2018-07-06T00:00:00.000+02:00", - "value": 211.86 - }, - { - "date": "2018-07-07T00:00:00.000+02:00", - "value": 276.19 - }, - { - "date": "2018-07-08T00:00:00.000+02:00", - "value": 243.36 - }, - { - "date": "2018-07-09T00:00:00.000+02:00", - "value": 228.01 - }, - { - "date": "2018-07-10T00:00:00.000+02:00", - "value": 230.6 - }, - { - "date": "2018-07-11T00:00:00.000+02:00", - "value": 289.81 - }, - { - "date": "2018-07-12T00:00:00.000+02:00", - "value": 213.03 - }, - { - "date": "2018-07-13T00:00:00.000+02:00", - "value": 207.2 - }, - { - "date": "2018-07-14T00:00:00.000+02:00", - "value": 222.39 - }, - { - "date": "2018-07-15T00:00:00.000+02:00", - "value": 245.71 - }, - { - "date": "2018-07-16T00:00:00.000+02:00", - "value": 284.31 - }, - { - "date": "2018-07-17T00:00:00.000+02:00", - "value": 234.3 - }, - { - "date": "2018-07-18T00:00:00.000+02:00", - "value": 247.73 - }, - { - "date": "2018-07-19T00:00:00.000+02:00", - "value": 224.49 - }, - { - "date": "2018-07-20T00:00:00.000+02:00", - "value": 230.49 - }, - { - "date": "2018-07-21T00:00:00.000+02:00", - "value": 220.45 - }, - { - "date": "2018-07-22T00:00:00.000+02:00", - "value": 228.83 - }, - { - "date": "2018-07-23T00:00:00.000+02:00", - "value": 194.61 - }, - { - "date": "2018-07-24T00:00:00.000+02:00", - "value": 234 - }, - { - "date": "2018-07-25T00:00:00.000+02:00", - "value": 237.11 - }, - { - "date": "2018-07-26T00:00:00.000+02:00", - "value": 230.89 - }, - { - "date": "2018-07-27T00:00:00.000+02:00", - "value": 207.7 - }, - { - "date": "2018-07-28T00:00:00.000+02:00", - "value": 200.38 - }, - { - "date": "2018-07-29T00:00:00.000+02:00", - "value": 224.47 - }, - { - "date": "2018-07-30T00:00:00.000+02:00", - "value": 230.87 - }, - { - "date": "2018-07-31T00:00:00.000+02:00", - "value": 213.52 - }, - { - "date": "2018-08-01T00:00:00.000+02:00", - "value": 188.64 - }, - { - "date": "2018-08-02T00:00:00.000+02:00", - "value": 221.18 - } -] \ No newline at end of file diff --git a/test/__mocks__/consumptionHalfHourlyDataFormatterMock.json b/test/__mocks__/consumptionHalfHourlyDataFormatterMock.json deleted file mode 100644 index 55ae0be02..000000000 --- a/test/__mocks__/consumptionHalfHourlyDataFormatterMock.json +++ /dev/null @@ -1,194 +0,0 @@ -[ - { - "date": "2018-06-20T00:00:00.000+02:00", - "value": 1.3 - }, - { - "date": "2018-06-20T00:30:00.000+02:00", - "value": 3.58 - }, - { - "date": "2018-06-20T01:00:00.000+02:00", - "value": 5.71 - }, - { - "date": "2018-06-20T01:30:00.000+02:00", - "value": 2.56 - }, - { - "date": "2018-06-20T02:00:00.000+02:00", - "value": 1.52 - }, - { - "date": "2018-06-20T02:30:00.000+02:00", - "value": 2.16 - }, - { - "date": "2018-06-20T03:00:00.000+02:00", - "value": 2.19 - }, - { - "date": "2018-06-20T03:30:00.000+02:00", - "value": 4.21 - }, - { - "date": "2018-06-20T04:00:00.000+02:00", - "value": 3.7 - }, - { - "date": "2018-06-20T04:30:00.000+02:00", - "value": 5.93 - }, - { - "date": "2018-06-20T05:00:00.000+02:00", - "value": 6.24 - }, - { - "date": "2018-06-20T05:30:00.000+02:00", - "value": 6.45 - }, - { - "date": "2018-06-20T06:00:00.000+02:00", - "value": 6.87 - }, - { - "date": "2018-06-20T06:30:00.000+02:00", - "value": 5.83 - }, - { - "date": "2018-06-20T07:00:00.000+02:00", - "value": 6.45 - }, - { - "date": "2018-06-20T07:30:00.000+02:00", - "value": 8.67 - }, - { - "date": "2018-06-20T08:00:00.000+02:00", - "value": 7.79 - }, - { - "date": "2018-06-20T08:30:00.000+02:00", - "value": 5.34 - }, - { - "date": "2018-06-20T09:00:00.000+02:00", - "value": 8.78 - }, - { - "date": "2018-06-20T09:30:00.000+02:00", - "value": 2.75 - }, - { - "date": "2018-06-20T10:00:00.000+02:00", - "value": 3.32 - }, - { - "date": "2018-06-20T10:30:00.000+02:00", - "value": 3.56 - }, - { - "date": "2018-06-20T11:00:00.000+02:00", - "value": 5.25 - }, - { - "date": "2018-06-20T11:30:00.000+02:00", - "value": 9.85 - }, - { - "date": "2018-06-20T12:00:00.000+02:00", - "value": 5.74 - }, - { - "date": "2018-06-20T12:30:00.000+02:00", - "value": 6.45 - }, - { - "date": "2018-06-20T13:00:00.000+02:00", - "value": 2.71 - }, - { - "date": "2018-06-20T13:30:00.000+02:00", - "value": 0.65 - }, - { - "date": "2018-06-20T14:00:00.000+02:00", - "value": 5.09 - }, - { - "date": "2018-06-20T14:30:00.000+02:00", - "value": 4.2 - }, - { - "date": "2018-06-20T15:00:00.000+02:00", - "value": 3.59 - }, - { - "date": "2018-06-20T15:30:00.000+02:00", - "value": 3.62 - }, - { - "date": "2018-06-20T16:00:00.000+02:00", - "value": 2.09 - }, - { - "date": "2018-06-20T16:30:00.000+02:00", - "value": 8.92 - }, - { - "date": "2018-06-20T17:00:00.000+02:00", - "value": 6.61 - }, - { - "date": "2018-06-20T17:30:00.000+02:00", - "value": 7.75 - }, - { - "date": "2018-06-20T18:00:00.000+02:00", - "value": 0.3 - }, - { - "date": "2018-06-20T18:30:00.000+02:00", - "value": 2.56 - }, - { - "date": "2018-06-20T19:00:00.000+02:00", - "value": 5.72 - }, - { - "date": "2018-06-20T19:30:00.000+02:00", - "value": 5.11 - }, - { - "date": "2018-06-20T20:00:00.000+02:00", - "value": 4.42 - }, - { - "date": "2018-06-20T20:30:00.000+02:00", - "value": 0.4 - }, - { - "date": "2018-06-20T21:00:00.000+02:00", - "value": 1.58 - }, - { - "date": "2018-06-20T21:30:00.000+02:00", - "value": 7.03 - }, - { - "date": "2018-06-20T22:00:00.000+02:00", - "value": 4.31 - }, - { - "date": "2018-06-20T22:30:00.000+02:00", - "value": 1.09 - }, - { - "date": "2018-06-20T23:00:00.000+02:00", - "value": 1.48 - }, - { - "date": "2018-06-20T23:30:00.000+02:00", - "value": 1.9 - } -] \ No newline at end of file diff --git a/test/__mocks__/consumptionMonthlyDataFormatterMock.json b/test/__mocks__/consumptionMonthlyDataFormatterMock.json deleted file mode 100644 index 7946a6797..000000000 --- a/test/__mocks__/consumptionMonthlyDataFormatterMock.json +++ /dev/null @@ -1,35 +0,0 @@ -[ - { - "date": "2018-07-01T00:00:00.000+02:00", - "value": 7135.03 - }, - { - "date": "2018-08-01T00:00:00.000+02:00", - "value": 7303.99 - }, - { - "date": "2018-09-01T00:00:00.000+02:00", - "value": 7093.63 - }, - { - "date": "2018-10-01T00:00:00.000+02:00", - "value": 7530.36 - }, - { - "date": "2018-11-01T00:00:00.000+01:00", - "value": 7148.76 - }, - { - "dump": "2018-12-1", - "date": "2018-12-01T00:00:00.000+01:00", - "value": -1 - }, - { - "date": "2019-01-01T00:00:00.000+01:00", - "value": 7761.84 - }, - { - "date": "2019-02-01T00:00:00.000+01:00", - "value": 6616.19 - } -] \ No newline at end of file diff --git a/test/__mocks__/enedis-dayMock.json b/test/__mocks__/enedis-dayMock.json deleted file mode 100644 index cc3b4ec8c..000000000 --- a/test/__mocks__/enedis-dayMock.json +++ /dev/null @@ -1,170 +0,0 @@ - [ - { - "id": "70fddfc40223272bd74c286d7c053aa6", - "_id": "70fddfc40223272bd74c286d7c053aa6", - "_type": "com.grandlyon.enedis.day", - "_rev": "1-8e5976963701b9d98fb1ddbf6648469b", - "day": 11, - "hour": 0, - "load": 7.341, - "minute": 0, - "month": 2, - "year": 2019 - }, - { - "id": "70fddfc40223272bd74c286d7c0520f7", - "_id": "70fddfc40223272bd74c286d7c0520f7", - "_type": "com.grandlyon.enedis.day", - "_rev": "1-33fc0ac1cd570c92288dfb655011e744", - "day": 12, - "hour": 0, - "load": 12.633, - "minute": 0, - "month": 2, - "year": 2019 - }, - { - "id": "70fddfc40223272bd74c286d7c052bb4", - "_id": "70fddfc40223272bd74c286d7c052bb4", - "_type": "com.grandlyon.enedis.day", - "_rev": "1-a131eaf0a1793ccb1f909bf1e051f5e4", - "day": 13, - "hour": 0, - "load": 12.566, - "minute": 0, - "month": 2, - "year": 2019 - }, - { - "id": "70fddfc40223272bd74c286d7c056647", - "_id": "70fddfc40223272bd74c286d7c056647", - "_type": "com.grandlyon.enedis.day", - "_rev": "1-a4573af893bc614648d4ea6cf85a2a4b", - "day": 14, - "hour": 0, - "load": 8.972, - "minute": 0, - "month": 2, - "year": 2019 - }, - { - "id": "70fddfc40223272bd74c286d7c05a874", - "_id": "70fddfc40223272bd74c286d7c05a874", - "_type": "com.grandlyon.enedis.day", - "_rev": "1-05c1451ba54d5a44b6af86470d04e319", - "day": 15, - "hour": 0, - "load": 13.703, - "minute": 0, - "month": 2, - "year": 2019 - }, - { - "id": "70fddfc40223272bd74c286d7c059c94", - "_id": "70fddfc40223272bd74c286d7c059c94", - "_type": "com.grandlyon.enedis.day", - "_rev": "1-fd13c972c85329e61bb86a22f29e0260", - "day": 16, - "hour": 0, - "load": 11.801, - "minute": 0, - "month": 2, - "year": 2019 - }, - { - "id": "70fddfc40223272bd74c286d7c05bd72", - "_id": "70fddfc40223272bd74c286d7c05bd72", - "_type": "com.grandlyon.enedis.day", - "_rev": "1-f041e50562e991828edd23cf40321709", - "day": 17, - "hour": 0, - "load": 14.282, - "minute": 0, - "month": 2, - "year": 2019 - }, - { - "id": "70fddfc40223272bd74c286d7c05af31", - "_id": "70fddfc40223272bd74c286d7c05af31", - "_type": "com.grandlyon.enedis.day", - "_rev": "1-47d9d3d3b8abcc835eb7636af317fb22", - "day": 18, - "hour": 0, - "load": 16.594, - "minute": 0, - "month": 2, - "year": 2019 - }, - { - "id": "70fddfc40223272bd74c286d7c05bd76", - "_id": "70fddfc40223272bd74c286d7c05bd76", - "_type": "com.grandlyon.enedis.day", - "_rev": "1-7b6aa26a76d7ea9a78968e50dc160cd6", - "day": 19, - "hour": 0, - "load": 9.59, - "minute": 0, - "month": 2, - "year": 2019 - }, - { - "id": "70fddfc40223272bd74c286d7c05c353", - "_id": "70fddfc40223272bd74c286d7c05c353", - "_type": "com.grandlyon.enedis.day", - "_rev": "1-9c3dbf64d5f54972711bcd3b10256e36", - "day": 20, - "hour": 0, - "load": 11.709, - "minute": 0, - "month": 2, - "year": 2019 - }, - { - "id": "70fddfc40223272bd74c286d7c05c9a1", - "_id": "70fddfc40223272bd74c286d7c05c9a1", - "_type": "com.grandlyon.enedis.day", - "_rev": "1-264ca0611717e7feb8e49dd0625c38a2", - "day": 21, - "hour": 0, - "load": 10.951, - "minute": 0, - "month": 2, - "year": 2019 - }, - { - "id": "70fddfc40223272bd74c286d7c05d922", - "_id": "70fddfc40223272bd74c286d7c05d922", - "_type": "com.grandlyon.enedis.day", - "_rev": "1-0d14a1a058b9ca9780db9bd2ab3b3c2d", - "day": 22, - "hour": 0, - "load": 22.652, - "minute": 0, - "month": 2, - "year": 2019 - }, - { - "id": "70fddfc40223272bd74c286d7c05fa63", - "_id": "70fddfc40223272bd74c286d7c05fa63", - "_type": "com.grandlyon.enedis.day", - "_rev": "1-d1367b96c9a986ed4dadecbb36719f61", - "day": 23, - "hour": 0, - "load": 13.099, - "minute": 0, - "month": 2, - "year": 2019 - }, - { - "id": "70fddfc40223272bd74c286d7c05e659", - "_id": "70fddfc40223272bd74c286d7c05e659", - "_type": "com.grandlyon.enedis.day", - "_rev": "1-a50e07164ec413a26e0f3d82eadf2abf", - "day": 24, - "hour": 0, - "load": 19.892, - "minute": 0, - "month": 2, - "year": 2019 - } - ] diff --git a/test/__mocks__/triggerDataMock.json b/test/__mocks__/triggerDataMock.json deleted file mode 100644 index 0c699826f..000000000 --- a/test/__mocks__/triggerDataMock.json +++ /dev/null @@ -1,72 +0,0 @@ -{ - "type": "@cron", - "id": "70b2fcc31ae9adb95c3ce0a344001941", - "attributes": { - "_id": "70b2fcc31ae9adb95c3ce0a344001941", - "_rev": "1-d84be387304c880015172c1e541c6f2b", - "domain": "cozy.tools:8080", - "prefix": "cozy35ba44d2d1749e6f21646edce51e7190", - "type": "@cron", - "worker": "konnector", - "arguments": "0 47 0 * * *", - "debounce": "", - "options": null, - "message": { - "account": "70b2fcc31ae9adb95c3ce0a34400185c", - "konnector": "enedis-scraping-connector" - }, - "current_state": { - "trigger_id": "70b2fcc31ae9adb95c3ce0a344001941", - "status": "errored", - "last_execution": "2020-01-16T15:53:50.2310024Z", - "last_executed_job_id": "70b2fcc31ae9adb95c3ce0a34400204a", - "last_failure": "2020-01-16T15:53:50.2310024Z", - "last_failed_job_id": "70b2fcc31ae9adb95c3ce0a34400204a", - "last_error": "fork/exec : no such file or directory", - "last_manual_execution": "2020-01-16T15:53:50.2310024Z", - "last_manual_job_id": "70b2fcc31ae9adb95c3ce0a34400204a" - }, - "cozyMetadata": { - "doctypeVersion": "1", - "metadataVersion": 1, - "createdAt": "2020-01-16T15:53:50.0323739Z", - "createdByApp": "ecolyo", - "updatedAt": "2020-01-16T15:53:50.0323739Z" - } - }, - "meta": {}, - "links": { - "self": "/jobs/triggers/70b2fcc31ae9adb95c3ce0a344001941" - }, - "_id": "70b2fcc31ae9adb95c3ce0a344001941", - "_type": "io.cozy.triggers", - "_rev": "1-d84be387304c880015172c1e541c6f2b", - "domain": "cozy.tools:8080", - "prefix": "cozy35ba44d2d1749e6f21646edce51e7190", - "worker": "konnector", - "arguments": "0 47 0 * * *", - "debounce": "", - "options": null, - "message": { - "account": "70b2fcc31ae9adb95c3ce0a34400185c", - "konnector": "enedis-scraping-connector" - }, - "current_state": { - "trigger_id": "70b2fcc31ae9adb95c3ce0a344001941", - "status": "errored", - "last_execution": "2020-01-16T15:53:50.2310024Z", - "last_executed_job_id": "70b2fcc31ae9adb95c3ce0a34400204a", - "last_failure": "2020-01-16T15:53:50.2310024Z", - "last_failed_job_id": "70b2fcc31ae9adb95c3ce0a34400204a", - "last_error": "fork/exec : no such file or directory", - "last_manual_execution": "2020-01-16T15:53:50.2310024Z", - "last_manual_job_id": "70b2fcc31ae9adb95c3ce0a34400204a" - }, - "cozyMetadata": { - "doctypeVersion": "1", - "metadataVersion": 1, - "createdAt": "2020-01-16T15:53:50.0323739Z", - "createdByApp": "ecolyo", - "updatedAt": "2020-01-16T15:53:50.0323739Z" - } -} diff --git a/test/services/ConsumptionDataFormatter.spec.ts.old b/test/services/ConsumptionDataFormatter.spec.ts.old deleted file mode 100644 index 6d8cbaf78..000000000 --- a/test/services/ConsumptionDataFormatter.spec.ts.old +++ /dev/null @@ -1,87 +0,0 @@ -'use strict' -import ConsumptionFormatterService from '../../src/services/consumptionFormatter.service' -import consumptionHalfHourlyData from '../__mocks__/consumptionHalfHourlyDataFormatterMock' -import consumptionDailyData from '../__mocks__/consumptionDailyDataFormatterMock' -import consumptionMonthlyData from '../__mocks__/consumptionMonthlyDataFormatterMock' -import { DateTime } from 'luxon' - -import { TimeStep } from '../../src/enum/timeStep.enum' - -describe('Consumption Data Formatter service tests', () => { - beforeEach(() => { - jest.resetAllMocks() - }) - - const consumptionFormatterService = new ConsumptionFormatterService() - - const halfHourlyData = JSON.parse(JSON.stringify(consumptionHalfHourlyData)) - - const mappedHalfHourlyData = halfHourlyData.map(item => ({ - date: DateTime.fromISO(item.date), - value: item.value, - })) - - const dailyData = JSON.parse(JSON.stringify(consumptionDailyData)) - - const mappeddailyDataData = dailyData.map(item => ({ - date: DateTime.fromISO(item.date), - value: item.value, - })) - - const monthlyData = JSON.parse(JSON.stringify(consumptionMonthlyData)) - - const mappedMonthlyData = monthlyData.map(item => ({ - date: DateTime.fromISO(item.date), - value: item.value, - })) - - const dayTimePeriod = { - startDate: DateTime.local(2018, 6, 20), - endDate: DateTime.local(2018, 6, 20, 23, 30), - } - - const daytimeStep = TimeStep.HALF_AN_HOUR - - const monthTimePeriod = { - startDate: DateTime.local(2018, 7, 1), - endDate: DateTime.local(2018, 8, 2), - } - - const monthTimeStep = TimeStep.DAY - - const yearTimePeriod = { - startDate: DateTime.local(2018, 7, 1), - endDate: DateTime.local(2019, 2, 6), - } - - const yearTimeStep = TimeStep.MONTH - - const sumReducer = (acc, dataLoad) => acc + dataLoad.value - - it('formatGraphData', () => { - const halfHourResult = consumptionFormatterService.formatGraphData( - mappedHalfHourlyData, - dayTimePeriod, - daytimeStep - ) - const dayResult = consumptionFormatterService.formatGraphData( - mappeddailyDataData, - monthTimePeriod, - monthTimeStep - ) - const monthResult = consumptionFormatterService.formatGraphData( - mappedMonthlyData, - yearTimePeriod, - yearTimeStep - ) - - expect(halfHourResult.length).toBe(48) - expect(halfHourResult.reduce(sumReducer, 0)).toBe(213.33000000000004) - - expect(dayResult.length).toBe(33) - expect(dayResult.reduce(sumReducer, 0)).toBe(7544.85) - - expect(monthResult.length).toBe(8) - expect(monthResult.reduce(sumReducer, 0)).toBe(50588.8) - }) -}) diff --git a/test/services/ConsumptionDataManager.spec.ts.old b/test/services/ConsumptionDataManager.spec.ts.old deleted file mode 100644 index 6e244d9f2..000000000 --- a/test/services/ConsumptionDataManager.spec.ts.old +++ /dev/null @@ -1,26 +0,0 @@ -'use strict' -//import ConsumptionDataManager from '../../src/services/consumptionDataManagerService' -/*import { DateTime } from 'luxon' -import { TimeStep } from '../../src/services/dataConsumptionContracts' - -// client needs to be mocked correctely to test the CDM -const mockClient = { - query: jest.fn(), - get: jest.fn(), -}*/ - -describe('Consumption Data Manager', () => { - beforeEach(() => { - jest.resetAllMocks() - }) - - //const cdm = new ConsumptionDataManager(mockClient); - - it('GetGraphData', () => { - expect(true).toBe(true) - }) - - it('FetchLastDateData', () => { - expect(true).toBe(true) - }) -}) diff --git a/test/services/ConsumptionDataValidator.spec.ts.old b/test/services/ConsumptionDataValidator.spec.ts.old deleted file mode 100644 index ec8d8104f..000000000 --- a/test/services/ConsumptionDataValidator.spec.ts.old +++ /dev/null @@ -1,99 +0,0 @@ -'use strict' -import ConsumptionValidatorService from '../../src/services/consumptionValidator.service' -import { DateTime } from 'luxon' -import { FluidType } from '../../src/enum/fluid.enum' -import { TimeStep } from '../../src/enum/timeStep.enum' - -describe('Consumption Data Validator service tests', () => { - beforeEach(() => { - jest.resetAllMocks() - }) - - const consumptionValidatorService = new ConsumptionValidatorService() - - /* -consumptionValidatorService.ValidateGetGraphData( - timePeriod, - timeStep, - fluidTypes, - compareTimePeriod -) - - const yearTimeStep = TimeStep.MONTH - - const sumReducer = (acc, dataLoad) => acc + dataLoad.value*/ - - it('matching fluidTypes and TimeStep', () => { - const timePeriod = { - startDate: DateTime.local(2018, 1, 1), - endDate: DateTime.local(2018, 1, 2), - } - /*const compareTimePeriod = { - startDate: DateTime.local(2018, 1, 2), - endDate: DateTime.local(2018, 1, 3), - }*/ - - expect( - consumptionValidatorService.ValidateGetGraphData( - timePeriod, - TimeStep.HALF_AN_HOUR, - [FluidType.WATER] - ) - ).toBe(false) - - expect( - consumptionValidatorService.ValidateGetGraphData( - timePeriod, - TimeStep.HALF_AN_HOUR, - [FluidType.ELECTRICITY] - ) - ).toBe(true) - - expect( - consumptionValidatorService.ValidateGetGraphData( - timePeriod, - TimeStep.HALF_AN_HOUR, - [FluidType.WATER] - ) - ).toBe(false) - - expect( - consumptionValidatorService.ValidateGetGraphData( - timePeriod, - TimeStep.HOUR, - [FluidType.ELECTRICITY] - ) - ).toBe(false) - - expect( - consumptionValidatorService.ValidateGetGraphData( - timePeriod, - TimeStep.HOUR, - [FluidType.GAS] - ) - ).toBe(true) - - expect( - consumptionValidatorService.ValidateGetGraphData( - timePeriod, - TimeStep.HOUR, - [FluidType.WATER] - ) - ).toBe(false) - }) - - it('comparing timePeriod starting and ending dates', () => { - const timePeriod = { - startDate: DateTime.local(2018, 1, 2), - endDate: DateTime.local(2018, 1, 1), - } - - expect( - consumptionValidatorService.ValidateGetGraphData( - timePeriod, - TimeStep.HALF_AN_HOUR, - [FluidType.ELECTRICITY] - ) - ).toBe(false) - }) -}) diff --git a/test/services/FluidService.spec.js.old b/test/services/FluidService.spec.js.old deleted file mode 100644 index b019855e2..000000000 --- a/test/services/FluidService.spec.js.old +++ /dev/null @@ -1,28 +0,0 @@ -'use strict' -import FluidService from '../../src/services/fluid.service' -import data from '../__mocks__/enedis-dayMock.json' -/* eslint-env jest */ - -const mockClient = { - find: jest.fn(), - create: jest.fn(), - destory: jest.fn(), -} - -describe('Fluid service tests', () => { - beforeEach(() => { - // reset all jest mock calls data before each test - jest.resetAllMocks() - }) - - it('should return last two week electricity', () => { - const fluidService = new FluidService(mockClient) - //console.log(data) - const indicators = fluidService.processElectricityData(data) - expect(indicators.consumptionValue).toBe(104) - /*expect(indicators.eucilidanComparator).toBe( - "Vous avez consommé un max d'ampoules !" - )*/ - expect(indicators.weeklyCompareValue).toBe(-29) - }) -}) diff --git a/test/services/QueryRunner.spec.ts.old b/test/services/QueryRunner.spec.ts.old deleted file mode 100644 index 132c2849a..000000000 --- a/test/services/QueryRunner.spec.ts.old +++ /dev/null @@ -1,26 +0,0 @@ -'use strict' -//import QuerryRunner from '../../src/services/queryRunnerService' -/*import { DateTime } from 'luxon' -import { TimeStep } from '../../src/services/dataConsumptionContracts' - -// client needs to be mocked correctely to test the CDM -const mockClient = { - query: jest.fn(), - get: jest.fn(), -}*/ - -describe('Querry Runner', () => { - beforeEach(() => { - jest.resetAllMocks() - }) - - //const qr = new QuerryRunner(mockClient); - - it('fetchFluidData', () => { - expect(true).toBe(true) - }) - - it('getLastDateData', () => { - expect(true).toBe(true) - }) -}) diff --git a/test/services/TriggerService.spec.js.old b/test/services/TriggerService.spec.js.old deleted file mode 100644 index 1882b5d5d..000000000 --- a/test/services/TriggerService.spec.js.old +++ /dev/null @@ -1,22 +0,0 @@ -'use strict' -import { TriggerService } from '../../src/services/triggersService' -import triggerData from '../__mocks__/triggerDataMock.json' - -const trigger = JSON.parse(JSON.stringify(triggerData)) - -describe('Trigger service tests', () => { - beforeEach(() => { - // reset all jest mock calls data before each test - jest.resetAllMocks() - }) - - it('fetch State', () => { - const state = TriggerService.fetchStateFromTrigger(trigger) - expect(state.status).toBe('errored') - }) - - it('fetch Date', () => { - const date = TriggerService.fetchDateFromTrigger(trigger) - expect(date).toBe('2020 M01 16 16:53') - }) -}) diff --git a/test/services/_/consumptionDailyDataFormatterMock.json b/test/services/_/consumptionDailyDataFormatterMock.json deleted file mode 100644 index f1755a693..000000000 --- a/test/services/_/consumptionDailyDataFormatterMock.json +++ /dev/null @@ -1,134 +0,0 @@ -[ - { - "date": "2018-07-01T00:00:00.000+02:00", - "value": 242.23 - }, - { - "date": "2018-07-02T00:00:00.000+02:00", - "value": 230.2 - }, - { - "date": "2018-07-03T00:00:00.000+02:00", - "value": 225.13 - }, - { - "date": "2018-07-04T00:00:00.000+02:00", - "value": 220.63 - }, - { - "date": "2018-07-05T00:00:00.000+02:00", - "value": 204.53 - }, - { - "date": "2018-07-06T00:00:00.000+02:00", - "value": 211.86 - }, - { - "date": "2018-07-07T00:00:00.000+02:00", - "value": 276.19 - }, - { - "date": "2018-07-08T00:00:00.000+02:00", - "value": 243.36 - }, - { - "date": "2018-07-09T00:00:00.000+02:00", - "value": 228.01 - }, - { - "date": "2018-07-10T00:00:00.000+02:00", - "value": 230.6 - }, - { - "date": "2018-07-11T00:00:00.000+02:00", - "value": 289.81 - }, - { - "date": "2018-07-12T00:00:00.000+02:00", - "value": 213.03 - }, - { - "date": "2018-07-13T00:00:00.000+02:00", - "value": 207.2 - }, - { - "date": "2018-07-14T00:00:00.000+02:00", - "value": 222.39 - }, - { - "date": "2018-07-15T00:00:00.000+02:00", - "value": 245.71 - }, - { - "date": "2018-07-16T00:00:00.000+02:00", - "value": 284.31 - }, - { - "date": "2018-07-17T00:00:00.000+02:00", - "value": 234.3 - }, - { - "date": "2018-07-18T00:00:00.000+02:00", - "value": 247.73 - }, - { - "date": "2018-07-19T00:00:00.000+02:00", - "value": 224.49 - }, - { - "date": "2018-07-20T00:00:00.000+02:00", - "value": 230.49 - }, - { - "date": "2018-07-21T00:00:00.000+02:00", - "value": 220.45 - }, - { - "date": "2018-07-22T00:00:00.000+02:00", - "value": 228.83 - }, - { - "date": "2018-07-23T00:00:00.000+02:00", - "value": 194.61 - }, - { - "date": "2018-07-24T00:00:00.000+02:00", - "value": 234 - }, - { - "date": "2018-07-25T00:00:00.000+02:00", - "value": 237.11 - }, - { - "date": "2018-07-26T00:00:00.000+02:00", - "value": 230.89 - }, - { - "date": "2018-07-27T00:00:00.000+02:00", - "value": 207.7 - }, - { - "date": "2018-07-28T00:00:00.000+02:00", - "value": 200.38 - }, - { - "date": "2018-07-29T00:00:00.000+02:00", - "value": 224.47 - }, - { - "date": "2018-07-30T00:00:00.000+02:00", - "value": 230.87 - }, - { - "date": "2018-07-31T00:00:00.000+02:00", - "value": 213.52 - }, - { - "date": "2018-08-01T00:00:00.000+02:00", - "value": 188.64 - }, - { - "date": "2018-08-02T00:00:00.000+02:00", - "value": 221.18 - } -] \ No newline at end of file diff --git a/test/services/_/consumptionHalfHourlyDataFormatterMock.json b/test/services/_/consumptionHalfHourlyDataFormatterMock.json deleted file mode 100644 index 55ae0be02..000000000 --- a/test/services/_/consumptionHalfHourlyDataFormatterMock.json +++ /dev/null @@ -1,194 +0,0 @@ -[ - { - "date": "2018-06-20T00:00:00.000+02:00", - "value": 1.3 - }, - { - "date": "2018-06-20T00:30:00.000+02:00", - "value": 3.58 - }, - { - "date": "2018-06-20T01:00:00.000+02:00", - "value": 5.71 - }, - { - "date": "2018-06-20T01:30:00.000+02:00", - "value": 2.56 - }, - { - "date": "2018-06-20T02:00:00.000+02:00", - "value": 1.52 - }, - { - "date": "2018-06-20T02:30:00.000+02:00", - "value": 2.16 - }, - { - "date": "2018-06-20T03:00:00.000+02:00", - "value": 2.19 - }, - { - "date": "2018-06-20T03:30:00.000+02:00", - "value": 4.21 - }, - { - "date": "2018-06-20T04:00:00.000+02:00", - "value": 3.7 - }, - { - "date": "2018-06-20T04:30:00.000+02:00", - "value": 5.93 - }, - { - "date": "2018-06-20T05:00:00.000+02:00", - "value": 6.24 - }, - { - "date": "2018-06-20T05:30:00.000+02:00", - "value": 6.45 - }, - { - "date": "2018-06-20T06:00:00.000+02:00", - "value": 6.87 - }, - { - "date": "2018-06-20T06:30:00.000+02:00", - "value": 5.83 - }, - { - "date": "2018-06-20T07:00:00.000+02:00", - "value": 6.45 - }, - { - "date": "2018-06-20T07:30:00.000+02:00", - "value": 8.67 - }, - { - "date": "2018-06-20T08:00:00.000+02:00", - "value": 7.79 - }, - { - "date": "2018-06-20T08:30:00.000+02:00", - "value": 5.34 - }, - { - "date": "2018-06-20T09:00:00.000+02:00", - "value": 8.78 - }, - { - "date": "2018-06-20T09:30:00.000+02:00", - "value": 2.75 - }, - { - "date": "2018-06-20T10:00:00.000+02:00", - "value": 3.32 - }, - { - "date": "2018-06-20T10:30:00.000+02:00", - "value": 3.56 - }, - { - "date": "2018-06-20T11:00:00.000+02:00", - "value": 5.25 - }, - { - "date": "2018-06-20T11:30:00.000+02:00", - "value": 9.85 - }, - { - "date": "2018-06-20T12:00:00.000+02:00", - "value": 5.74 - }, - { - "date": "2018-06-20T12:30:00.000+02:00", - "value": 6.45 - }, - { - "date": "2018-06-20T13:00:00.000+02:00", - "value": 2.71 - }, - { - "date": "2018-06-20T13:30:00.000+02:00", - "value": 0.65 - }, - { - "date": "2018-06-20T14:00:00.000+02:00", - "value": 5.09 - }, - { - "date": "2018-06-20T14:30:00.000+02:00", - "value": 4.2 - }, - { - "date": "2018-06-20T15:00:00.000+02:00", - "value": 3.59 - }, - { - "date": "2018-06-20T15:30:00.000+02:00", - "value": 3.62 - }, - { - "date": "2018-06-20T16:00:00.000+02:00", - "value": 2.09 - }, - { - "date": "2018-06-20T16:30:00.000+02:00", - "value": 8.92 - }, - { - "date": "2018-06-20T17:00:00.000+02:00", - "value": 6.61 - }, - { - "date": "2018-06-20T17:30:00.000+02:00", - "value": 7.75 - }, - { - "date": "2018-06-20T18:00:00.000+02:00", - "value": 0.3 - }, - { - "date": "2018-06-20T18:30:00.000+02:00", - "value": 2.56 - }, - { - "date": "2018-06-20T19:00:00.000+02:00", - "value": 5.72 - }, - { - "date": "2018-06-20T19:30:00.000+02:00", - "value": 5.11 - }, - { - "date": "2018-06-20T20:00:00.000+02:00", - "value": 4.42 - }, - { - "date": "2018-06-20T20:30:00.000+02:00", - "value": 0.4 - }, - { - "date": "2018-06-20T21:00:00.000+02:00", - "value": 1.58 - }, - { - "date": "2018-06-20T21:30:00.000+02:00", - "value": 7.03 - }, - { - "date": "2018-06-20T22:00:00.000+02:00", - "value": 4.31 - }, - { - "date": "2018-06-20T22:30:00.000+02:00", - "value": 1.09 - }, - { - "date": "2018-06-20T23:00:00.000+02:00", - "value": 1.48 - }, - { - "date": "2018-06-20T23:30:00.000+02:00", - "value": 1.9 - } -] \ No newline at end of file diff --git a/test/services/_/triggerDataMock.json b/test/services/_/triggerDataMock.json deleted file mode 100644 index 0c699826f..000000000 --- a/test/services/_/triggerDataMock.json +++ /dev/null @@ -1,72 +0,0 @@ -{ - "type": "@cron", - "id": "70b2fcc31ae9adb95c3ce0a344001941", - "attributes": { - "_id": "70b2fcc31ae9adb95c3ce0a344001941", - "_rev": "1-d84be387304c880015172c1e541c6f2b", - "domain": "cozy.tools:8080", - "prefix": "cozy35ba44d2d1749e6f21646edce51e7190", - "type": "@cron", - "worker": "konnector", - "arguments": "0 47 0 * * *", - "debounce": "", - "options": null, - "message": { - "account": "70b2fcc31ae9adb95c3ce0a34400185c", - "konnector": "enedis-scraping-connector" - }, - "current_state": { - "trigger_id": "70b2fcc31ae9adb95c3ce0a344001941", - "status": "errored", - "last_execution": "2020-01-16T15:53:50.2310024Z", - "last_executed_job_id": "70b2fcc31ae9adb95c3ce0a34400204a", - "last_failure": "2020-01-16T15:53:50.2310024Z", - "last_failed_job_id": "70b2fcc31ae9adb95c3ce0a34400204a", - "last_error": "fork/exec : no such file or directory", - "last_manual_execution": "2020-01-16T15:53:50.2310024Z", - "last_manual_job_id": "70b2fcc31ae9adb95c3ce0a34400204a" - }, - "cozyMetadata": { - "doctypeVersion": "1", - "metadataVersion": 1, - "createdAt": "2020-01-16T15:53:50.0323739Z", - "createdByApp": "ecolyo", - "updatedAt": "2020-01-16T15:53:50.0323739Z" - } - }, - "meta": {}, - "links": { - "self": "/jobs/triggers/70b2fcc31ae9adb95c3ce0a344001941" - }, - "_id": "70b2fcc31ae9adb95c3ce0a344001941", - "_type": "io.cozy.triggers", - "_rev": "1-d84be387304c880015172c1e541c6f2b", - "domain": "cozy.tools:8080", - "prefix": "cozy35ba44d2d1749e6f21646edce51e7190", - "worker": "konnector", - "arguments": "0 47 0 * * *", - "debounce": "", - "options": null, - "message": { - "account": "70b2fcc31ae9adb95c3ce0a34400185c", - "konnector": "enedis-scraping-connector" - }, - "current_state": { - "trigger_id": "70b2fcc31ae9adb95c3ce0a344001941", - "status": "errored", - "last_execution": "2020-01-16T15:53:50.2310024Z", - "last_executed_job_id": "70b2fcc31ae9adb95c3ce0a34400204a", - "last_failure": "2020-01-16T15:53:50.2310024Z", - "last_failed_job_id": "70b2fcc31ae9adb95c3ce0a34400204a", - "last_error": "fork/exec : no such file or directory", - "last_manual_execution": "2020-01-16T15:53:50.2310024Z", - "last_manual_job_id": "70b2fcc31ae9adb95c3ce0a34400204a" - }, - "cozyMetadata": { - "doctypeVersion": "1", - "metadataVersion": 1, - "createdAt": "2020-01-16T15:53:50.0323739Z", - "createdByApp": "ecolyo", - "updatedAt": "2020-01-16T15:53:50.0323739Z" - } -} -- GitLab