Merge branch 'fix/issue-contract-less-than-6-month' into 'main'

fix: issue-contract-less-than-6-month

See merge request !26

src/core/contractVerification.js

@@ -9,7 +9,7 @@ const {
 } = require('../helpers/parsing')
 const { rechercherServicesSouscritsMesures } = require('../requests/sge')
 const xml2js = require('xml2js')
-const { contractState, contractLibelle } = require('./types/enum')
+const { contractState } = require('./types/enum')
 
 /**
  * @param {string} url
@@ -55,9 +55,8 @@ async function verifyContract(url, apiAuthKey, appLogin, contractId, pointId) {
       currentContract = currentContracts
     }
     if (
-      (currentContract.etatCode === contractState.ACTIF ||
-        currentContract.etatCode === contractState.DEMANDE) &&
-      currentContract.serviceSouscritLibelle === contractLibelle.ACTIF
+      currentContract.etatCode === contractState.ACTIF ||
+      currentContract.etatCode === contractState.DEMANDE
     )
       return currentContract.serviceSouscritId
     return null
@@ -71,7 +70,7 @@ async function verifyContract(url, apiAuthKey, appLogin, contractId, pointId) {
     }
     log(
       'error',
-      'if an erorr is thrown here, it probably means that the contract has already been open today and that enedis cannot open a second one. Wait until tomorow to try again'
+      'if an error is thrown here, it probably means that the contract has already been open today and that enedis cannot open a second one. Wait until tomorow to try again'
     )
     throw errors.LOGIN_FAILED
   }

src/core/types/enum.js

@@ -9,14 +9,4 @@ const contractState = {
   DEMANDE: 'DEMANDE',
 }
 
-/**
- * Enum for contractLibelle values.
- * @readonly
- * @enum {number}
- */
-const contractLibelle = {
-  ACTIF:
-    'Collecte de la courbe de charge au pas 30 min avec transmission quotidienne des données brutes en soutirage',
-}
-
-module.exports = { contractState, contractLibelle }
+module.exports = { contractState }

src/index.js

@@ -277,7 +277,16 @@ async function deleteConsent(
  */
 async function gatherData(baseUrl, apiAuthKey, sgeLogin, pointId) {
   log('info', 'Querying data...')
-  await getContractStartDate(baseUrl, apiAuthKey, sgeLogin, pointId)
+  const userContractstartDate = await getContractStartDate(
+    baseUrl,
+    apiAuthKey,
+    sgeLogin,
+    pointId
+  )
+
+  startDailyDate = moment(userContractstartDate, 'YYYY-MM-DD')
+  startDailyDateString = startDailyDate.format('YYYY-MM-DD')
+
   await getData(
     `${baseUrl}/enedis_SGE_ConsultationMesuresDetaillees/1.0`,
     apiAuthKey,
@@ -482,9 +491,9 @@ function processData(doctype = 'com.grandlyon.enedis.day') {
         ['year', 'month', 'day', 'hour', 'minute']
       )
 
-      log('info', 'Agregate enedis daily data for month and year')
+      log('info', 'Aggregate enedis daily data for month and year')
       if (doctype === 'com.grandlyon.enedis.day') {
-        log('info', 'Agregating...')
+        log('info', 'Aggregating...')
         await agregateMonthAndYearData(processedDailyData)
       }
     } catch (e) {

src/requests/cozy.js

@@ -39,7 +39,6 @@ async function saveAccountData(accountId, accountData) {
 async function getAccount(accountId) {
   log('info', `getAccount: ${accountId}`)
   const accounts = await cozyClient.data.findAll('io.cozy.accounts')
-  log('info', `getAccount data: ${JSON.stringify(accounts)}`)
   return accounts.filter(account =>
     isLocal() ? account._id === accountId : account.account_type === accountId
   )[0]