Merge branch 'bug/tz'

unsync · Jan 26, 2024 · a160916 · a160916
2 parents e2c1fa8 + fa782bf
commit a160916
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 3 deletions.
diff --git a/.github/workflows/release-package.yml b/.github/workflows/release-package.yml
@@ -1,6 +1,7 @@
 name: publish package
 
 on:
+  workflow_dispatch:
   push:
     branches:
       - main

diff --git a/src/veolia.ts b/src/veolia.ts
@@ -1,9 +1,12 @@
 import { getLogger } from '@unsync/nodejs-tools'
 import type { Dayjs } from 'dayjs'
 import dayjs from 'dayjs'
+import utc from 'dayjs/plugin/utc.js'
 import { XMLBuilder, XMLParser } from 'fast-xml-parser'
 import { httpRequest } from './http-client.js'
 
+dayjs.extend(utc)
+
 export interface EnergyDataPoint {
   start: string
   state: number
@@ -91,8 +94,11 @@ export class VeoliaClient {
       }
 
       return soapBody.map((r: any) => {
+        const dateReleveLocal = dayjs(r.dateReleve)
+        const dateReleveUTC = dateReleveLocal.add(dateReleveLocal.utcOffset(), 'minute').utc()
+        this.logger.info(`VeoliaClient > getEnergyData > ${dateReleveUTC.toISOString()}: ${r.consommation}`)
         return {
-          start: dayjs(r.dateReleve).startOf('day').add(12, 'hour').toISOString(),
+          start: dateReleveUTC.set('hour', 10).toISOString(),
           state: r.consommation,
           // veolia set the index to the start of the day,
           // so we need to add the consumption to get the end of the day index

diff --git a/test/mocks.ts b/test/mocks.ts
@@ -12,5 +12,5 @@ export const mockEnergyData = '\n'
   + 'Content-Transfer-Encoding: binary\n'
   + 'Content-ID: <[email protected]>\n'
   + '\n'
-  + '<soap:Envelope xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/"><soap:Body><ns2:getConsommationJournaliereResponse xmlns:ns2="http://ws.icl.veolia.com/"><return><codeRetour>00</codeRetour><consommation>200</consommation><dateReleve>2023-10-26T00:00:00+02:00</dateReleve><fiabiliteIndex>M</fiabiliteIndex><index>34374</index></return><return><codeRetour>00</codeRetour><consommation>142</consommation><dateReleve>2023-10-27T00:00:00+02:00</dateReleve><fiabiliteIndex>M</fiabiliteIndex><index>34574</index></return></ns2:getConsommationJournaliereResponse></soap:Body></soap:Envelope>\n'
+  + '<soap:Envelope xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/"><soap:Body><ns2:getConsommationJournaliereResponse xmlns:ns2="http://ws.icl.veolia.com/"><return><codeRetour>00</codeRetour><consommation>200</consommation><dateReleve>2023-10-26T00:00:00+02:00</dateReleve><fiabiliteIndex>M</fiabiliteIndex><index>34374</index></return><return><codeRetour>00</codeRetour><consommation>142</consommation><dateReleve>2023-10-29T00:00:00+02:00</dateReleve><fiabiliteIndex>M</fiabiliteIndex><index>34574</index></return></ns2:getConsommationJournaliereResponse></soap:Body></soap:Envelope>\n'
   + '--uuid:8ad230ff-7d22-45bf-9e5e-19161316f835--'
diff --git a/test/veolia.test.ts b/test/veolia.test.ts
@@ -25,7 +25,7 @@ it('should fetch data', async () => {
     state: 200,
     sum: 34574,
   }, {
-    start: '2023-10-27T10:00:00.000Z',
+    start: '2023-10-29T10:00:00.000Z',
     state: 142,
     sum: 34716,
   }],