diff --git a/index.js b/index.js index b9d5383c6ab6f6519b173bc0956871f481d13644..1d1fd8bf2c665643e5bd3a3cd30871bb72d10668 100644 --- a/index.js +++ b/index.js @@ -134,7 +134,7 @@ const loadCurveURL = `${baseUrl}/v4/metering_data/consumption_load_curve` */ async function start(fields, cozyParameters, doRetry = true) { log('info', 'Starting the enedis konnector') - log('info', `Manual execution: ${manualExecution}` ) + log('info', `Manual execution: ${manualExecution}`) const accountId = getAccountId() let usage_point_id = '' try { @@ -166,7 +166,6 @@ async function start(fields, cozyParameters, doRetry = true) { ) log('info', 'Agregate enedis daily data for month and year') await agregateMonthAndYearData(processedDailyData) - log('info', 'Process enedis load data') await startLoadDataProcess(access_token, usage_point_id) } catch (err) { @@ -242,7 +241,8 @@ async function startLoadDataProcess(token, usagePointID) { if (isConsent) { log('info', 'Check history') const isHistory = await isHistoryLoaded('com.grandlyon.enedis.minute') - if (isHistory) { + log('info', `isHistory: ${isHistory}`) + if (isHistory || manualExecution) { log('info', 'launch process without history') await launchLoadDataProcess( token, @@ -123930,7 +123930,7 @@ const fs = __webpack_require__(167); const path = __webpack_require__(160); -let manifest = typeof {"version":"0.2.1","name":"Enedis","type":"konnector","language":"node","icon":"icon.png","slug":"enedisgrandlyon","source":"https://forge.grandlyon.com/web-et-numerique/llle_project/enedis-konnector.git","editor":"Métropole de Lyon","vendor_link":"https://www.enedis.fr/","categories":["energy"],"frequency":"daily","fields":{"access_token":{"type":"hidden"},"refresh_token":{"type":"hidden"}},"oauth":{},"data_types":[],"screenshots":[],"permissions":{"accounts":{"type":"io.cozy.accounts"},"enedis data":{"type":"com.grandlyon.enedis.*"}},"developer":{"name":"Métropole de Lyon","url":"https://www.grandlyon.com/"},"langs":["fr"],"locales":{"fr":{"short_description":"Récupère vos donnéees de courbe de charge depuis l'API Enedis","long_description":"Ce connecteur récupère la courbe de charge électrique enregistrée par le compteur Linky","permissions":{"enedis data":{"description":"La courbe de charge électrique enregistrée par le compteur Linky"},"accounts":{"description":"Utilisé pour obtenir les données du compte"}}}},"manifest_version":"2"} === 'undefined' ? {} : {"version":"0.2.1","name":"Enedis","type":"konnector","language":"node","icon":"icon.png","slug":"enedisgrandlyon","source":"https://forge.grandlyon.com/web-et-numerique/llle_project/enedis-konnector.git","editor":"Métropole de Lyon","vendor_link":"https://www.enedis.fr/","categories":["energy"],"frequency":"daily","fields":{"access_token":{"type":"hidden"},"refresh_token":{"type":"hidden"}},"oauth":{},"data_types":[],"screenshots":[],"permissions":{"accounts":{"type":"io.cozy.accounts"},"enedis data":{"type":"com.grandlyon.enedis.*"}},"developer":{"name":"Métropole de Lyon","url":"https://www.grandlyon.com/"},"langs":["fr"],"locales":{"fr":{"short_description":"Récupère vos donnéees de courbe de charge depuis l'API Enedis","long_description":"Ce connecteur récupère la courbe de charge électrique enregistrée par le compteur Linky","permissions":{"enedis data":{"description":"La courbe de charge électrique enregistrée par le compteur Linky"},"accounts":{"description":"Utilisé pour obtenir les données du compte"}}}},"manifest_version":"2"}; +let manifest = typeof {"version":"0.2.0","name":"Enedis","type":"konnector","language":"node","icon":"icon.png","slug":"enedisgrandlyon","source":"https://forge.grandlyon.com/web-et-numerique/llle_project/enedis-konnector.git","editor":"Métropole de Lyon","vendor_link":"https://www.enedis.fr/","categories":["energy"],"frequency":"daily","fields":{"access_token":{"type":"hidden"},"refresh_token":{"type":"hidden"}},"oauth":{},"data_types":[],"screenshots":[],"permissions":{"accounts":{"type":"io.cozy.accounts"},"enedis data":{"type":"com.grandlyon.enedis.*"}},"developer":{"name":"Métropole de Lyon","url":"https://www.grandlyon.com/"},"langs":["fr"],"locales":{"fr":{"short_description":"Récupère vos donnéees de courbe de charge depuis l'API Enedis","long_description":"Ce connecteur récupère la courbe de charge électrique enregistrée par le compteur Linky","permissions":{"enedis data":{"description":"La courbe de charge électrique enregistrée par le compteur Linky"},"accounts":{"description":"Utilisé pour obtenir les données du compte"}}}},"manifest_version":"2"} === 'undefined' ? {} : {"version":"0.2.0","name":"Enedis","type":"konnector","language":"node","icon":"icon.png","slug":"enedisgrandlyon","source":"https://forge.grandlyon.com/web-et-numerique/llle_project/enedis-konnector.git","editor":"Métropole de Lyon","vendor_link":"https://www.enedis.fr/","categories":["energy"],"frequency":"daily","fields":{"access_token":{"type":"hidden"},"refresh_token":{"type":"hidden"}},"oauth":{},"data_types":[],"screenshots":[],"permissions":{"accounts":{"type":"io.cozy.accounts"},"enedis data":{"type":"com.grandlyon.enedis.*"}},"developer":{"name":"Métropole de Lyon","url":"https://www.grandlyon.com/"},"langs":["fr"],"locales":{"fr":{"short_description":"Récupère vos donnéees de courbe de charge depuis l'API Enedis","long_description":"Ce connecteur récupère la courbe de charge électrique enregistrée par le compteur Linky","permissions":{"enedis data":{"description":"La courbe de charge électrique enregistrée par le compteur Linky"},"accounts":{"description":"Utilisé pour obtenir les données du compte"}}}},"manifest_version":"2"}; if (false) {} diff --git a/manifest.konnector b/manifest.konnector index 093a71315226eb9d0dbadc864e2835e69e8fbceb..bb794649e21660740f3cc05ead982e0b8df20698 100644 --- a/manifest.konnector +++ b/manifest.konnector @@ -1,5 +1,5 @@ { - "version": "0.2.1", + "version": "0.2.0", "name": "Enedis", "type": "konnector", "language": "node", diff --git a/package.json b/package.json index e01d79ec52cb1b51ee1b7d25cc7b8609f395cd94..af6fd523f62cf5aa0f3529442e6c6dd3654c408d 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "enedis", - "version": "0.2.1", + "version": "0.2.0", "description": "", "repository": { "type": "git",