diff --git a/src/helpers/env.js b/src/helpers/env.js new file mode 100644 index 0000000000000000000000000000000000000000..9f62628a11f49c40ca1f59ab268955a34e2ba4ac --- /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 5a6023603a5fc626cb41fce8762c585d254685ac..887b1da82e9bf6001f7dfeb1034066a097e1e44c 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 511a7ab92a7614ca278605e1c8957e3f2bb23607..6acbce7565b1f27f1629340b70d1c27e7b9cd8e7 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 }