From fbbd5942241a336e632637462958783a81673c03 Mon Sep 17 00:00:00 2001
From: Hugo SUBTIL <ext.sopra.husubtil@grandlyon.com>
Date: Mon, 8 Aug 2022 17:43:58 +0200
Subject: [PATCH] fix: issue in env

---
 src/helpers/env.js   |  5 +++++
 src/index.js         | 20 +++++++++-----------
 src/requests/cozy.js |  5 ++++-
 3 files changed, 18 insertions(+), 12 deletions(-)
 create mode 100644 src/helpers/env.js

diff --git a/src/helpers/env.js b/src/helpers/env.js
new file mode 100644
index 0000000..9f62628
--- /dev/null
+++ b/src/helpers/env.js
@@ -0,0 +1,5 @@
+function iSLocal() {
+  return process.env.NODE_ENV === 'development' || process.env.NODE_ENV
+}
+
+module.exports = { iSLocal }
diff --git a/src/index.js b/src/index.js
index 5a60236..887b1da 100644
--- a/src/index.js
+++ b/src/index.js
@@ -34,6 +34,7 @@ const { activateContract } = require('./core/contractActivation')
 const { verifyContract } = require('./core/contractVerification')
 const { terminateContract } = require('./core/contractTermination')
 const { getAccount, saveAccountData } = require('./requests/cozy')
+const { iSLocal } = require('./helpers/env')
 
 moment.locale('fr') // set the language
 moment.tz.setDefault('Europe/Paris') // set the timezone
@@ -48,7 +49,7 @@ let startDailyDateString = startDailyDate.format('YYYY-MM-DD')
 const startLoadDate = moment().subtract(7, 'day')
 const endDate = moment()
 const endDateString = endDate.format('YYYY-MM-DD')
-const ACCOUNT_ID = 'default_account_id'
+const ACCOUNT_ID = iSLocal() ? 'default_account_id' : 'enedis-sge-grandlyon'
 
 module.exports = new BaseKonnector(start)
 module.exports = { getContractStartDate }
@@ -129,6 +130,11 @@ async function start(fields, cozyParameters) {
     consent = await updateBoConsent(consent, serviceId)
     // Save bo id into account
     const accountData = await getAccount(ACCOUNT_ID)
+    console.log(
+      '🚀 ~ file: index.js ~ line 132 ~ start ~ accountData',
+      accountData
+    )
+
     await saveAccountData(this.accountId, {
       ...accountData.data,
       consentId: consent.id,
@@ -486,16 +492,8 @@ async function agregateMonthAndYearData(data) {
  * @returns {boolean}
  */
 function isFirstStart(account) {
-  console.log(
-    '🚀 ~ file: index.js ~ line 490 ~ isFirstStart ~ account.data',
-    account.data
-  )
-  console.log(
-    '🚀 ~ file: index.js ~ line 490 ~ isFirstStart ~ account.data',
-    account.data.consentId
-  )
-
-  if (account.data && account.data.consentId) {
+  console.log(account)
+  if (account && account.data && account.data.consentId) {
     log('info', 'Konnector not first start')
     return false
   }
diff --git a/src/requests/cozy.js b/src/requests/cozy.js
index 511a7ab..6acbce7 100644
--- a/src/requests/cozy.js
+++ b/src/requests/cozy.js
@@ -1,4 +1,5 @@
 const { log, updateOrCreate } = require('cozy-konnector-libs')
+const { iSLocal } = require('../helpers/env')
 const cozyClient = require('cozy-konnector-libs/dist/libs/cozyclient')
 
 async function saveAccountData(accountId, accountData) {
@@ -17,7 +18,9 @@ async function getAccount(accountId) {
   log('info', `getAccount: ${accountId}`)
   //TODO: refactor with usageof cozy-libs. Not working during implementation
   const accounts = await cozyClient.data.findAll('io.cozy.accounts')
-  return accounts.filter(account => account._id === accountId)[0]
+  return accounts.filter(account =>
+    iSLocal() ? account._id === accountId : account.account_type === accountId
+  )[0]
 }
 
 module.exports = { getAccount, saveAccountData }
-- 
GitLab