diff --git a/app/ecolyo.e96a22337af81a012d69.js b/app/ecolyo.2af4937013bcdb13c454.js
similarity index 99%
rename from app/ecolyo.e96a22337af81a012d69.js
rename to app/ecolyo.2af4937013bcdb13c454.js
index 2303425d9ec5238f7d5da48a9e94238362e0f92d..1df5bd354592ff9342efba3146fb795cb4816352 100644
--- a/app/ecolyo.e96a22337af81a012d69.js
+++ b/app/ecolyo.2af4937013bcdb13c454.js
@@ -1741,7 +1741,7 @@ var SplashRoot = function SplashRoot(_ref) {
switch (_context.prev = _context.next) {
case 0:
initializationService = new _initialization.default(client, setinitStep, setinitStepErrors);
- partnersInfoService = new _partnersInfo.default(client, setinitStepErrors);
+ partnersInfoService = new _partnersInfo.default(client);
ms = new _migration.MigrationService(client, setinitStepErrors);
_context.prev = 3;
_context.next = 6;
@@ -29495,30 +29495,32 @@ var AccountService = /*#__PURE__*/function () {
while (1) {
switch (_context3.prev = _context3.next) {
case 0:
+ _context3.prev = 0;
query = (0, _cozyClient.Q)(_doctypes.ACCOUNTS_DOCTYPE) // eslint-disable-next-line @typescript-eslint/camelcase
.where({
account_type: type
- }).indexFields(['account_type']);
- _context3.next = 3;
+ }); // .indexFields(['account_type'])
+
+ _context3.next = 4;
return this._client.query(query);
- case 3:
+ case 4:
_yield$this$_client$q = _context3.sent;
accounts = _yield$this$_client$q.data;
if (!(accounts.length > 1)) {
- _context3.next = 18;
+ _context3.next = 19;
break;
}
// If several account are found we will used trigger date to select the older
triggerService = new _triggers.default(this._client);
- _context3.next = 9;
+ _context3.next = 10;
return Promise.all(accounts.map(function (_account) {
return triggerService.getTriggerForAccount(_account);
}));
- case 9:
+ case 10:
triggers = _context3.sent;
// Keep the accountid which have the older trigger
olderDate = _luxon.DateTime.now();
@@ -29550,15 +29552,25 @@ var AccountService = /*#__PURE__*/function () {
});
return _context3.abrupt("return", filteredAccounts[0] ? filteredAccounts[0] : null);
- case 18:
+ case 19:
return _context3.abrupt("return", accounts[0] ? accounts[0] : null);
- case 19:
+ case 20:
+ _context3.next = 26;
+ break;
+
+ case 22:
+ _context3.prev = 22;
+ _context3.t0 = _context3["catch"](0);
+ console.error("Error GetAccountByType: ".concat(_context3.t0));
+ return _context3.abrupt("return", null);
+
+ case 26:
case "end":
return _context3.stop();
}
}
- }, _callee3, this);
+ }, _callee3, this, [[0, 22]]);
}));
function getAccountByType(_x4) {
@@ -29577,24 +29589,32 @@ var AccountService = /*#__PURE__*/function () {
while (1) {
switch (_context4.prev = _context4.next) {
case 0:
+ _context4.prev = 0;
query = (0, _cozyClient.Q)(_doctypes.ACCOUNTS_DOCTYPE) // eslint-disable-next-line @typescript-eslint/camelcase
.where({
account_type: type
- }).indexFields(['account_type']);
- _context4.next = 3;
+ }); // .indexFields(['account_type'])
+
+ _context4.next = 4;
return this._client.query(query);
- case 3:
+ case 4:
_yield$this$_client$q2 = _context4.sent;
accounts = _yield$this$_client$q2.data;
return _context4.abrupt("return", accounts);
- case 6:
+ case 9:
+ _context4.prev = 9;
+ _context4.t0 = _context4["catch"](0);
+ console.error("Error: GetAccountsByType: ".concat(_context4.t0));
+ return _context4.abrupt("return", []);
+
+ case 13:
case "end":
return _context4.stop();
}
}
- }, _callee4, this);
+ }, _callee4, this, [[0, 9]]);
}));
function getAccountsByType(_x5) {
@@ -29688,7 +29708,8 @@ var AccountService = /*#__PURE__*/function () {
query = (0, _cozyClient.Q)(_doctypes.ACCOUNTS_DOCTYPE) // eslint-disable-next-line @typescript-eslint/camelcase
.where({
account_type: 'index'
- }).indexFields(['account_type']).limitBy(1);
+ }) // .indexFields(['account_type'])
+ .limitBy(1);
_context7.next = 3;
return this._client.query(query);
diff --git a/index.html b/index.html
index f039f6ff707ffb08eaaa9088abc558fd4ea5d4ab..bec71d97e2cd44b11a5c373d5a074d22c8cf1c0d 100644
--- a/index.html
+++ b/index.html
@@ -1 +1 @@
-<!DOCTYPE html><html lang="{{.Locale}}"><head><meta charset="utf-8"><title>Ecolyo</title><link rel="icon" type="image/png" href="/favicon-32x32.png" sizes="32x32"><link rel="icon" type="image/png" href="/favicon-16x16.png" sizes="16x16"><!-- PWA Manifest --><link rel="manifest" href="/manifest.json" crossorigin="use-credentials"><link rel="mask-icon" href="/safari-pinned-tab.svg" color="#297EF2"><meta name="viewport" content="width=device-width,height=device-height,initial-scale=1,user-scalable=0,viewport-fit=cover"><!-- PWA Chrome --><link rel="icon" sizes="192x192" href="/android-chrome-192x192.png"><link rel="icon" sizes="512x512" href="/android-chrome-512x512.png"><!-- PWA iOS --><link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png"><link rel="apple-touch-startup-image" href="/apple-touch-icon.png"><meta name="apple-mobile-web-app-title" content="Ecolyo"><meta name="apple-mobile-web-app-capable" content="yes"><meta name="apple-mobile-web-app-status-bar-style" content="black"><!-- PWA Colors --><meta name="theme-color" content="#343641"><meta name="background-color" content="#121212">{{.ThemeCSS}} {{.CozyBar}}</head><body><div role="application" class="application" data-cozy-token="{{.Token}}" data-cozy-domain="{{.Domain}}" data-cozy-locale="{{.Locale}}" data-cozy-app-name="{{.AppName}}" data-cozy-app-slug="{{.AppSlug}}" data-cozy-app-name-prefix="{{.AppNamePrefix}}" data-cozy-app-editor="{{.AppEditor}}" data-cozy-icon-path="{{.IconPath}}"><script src="vendors/ecolyo.3256cfd41a1e2c66ff46.js"></script><script src="app/ecolyo.e96a22337af81a012d69.js"></script></div></body></html>
\ No newline at end of file
+<!DOCTYPE html><html lang="{{.Locale}}"><head><meta charset="utf-8"><title>Ecolyo</title><link rel="icon" type="image/png" href="/favicon-32x32.png" sizes="32x32"><link rel="icon" type="image/png" href="/favicon-16x16.png" sizes="16x16"><!-- PWA Manifest --><link rel="manifest" href="/manifest.json" crossorigin="use-credentials"><link rel="mask-icon" href="/safari-pinned-tab.svg" color="#297EF2"><meta name="viewport" content="width=device-width,height=device-height,initial-scale=1,user-scalable=0,viewport-fit=cover"><!-- PWA Chrome --><link rel="icon" sizes="192x192" href="/android-chrome-192x192.png"><link rel="icon" sizes="512x512" href="/android-chrome-512x512.png"><!-- PWA iOS --><link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png"><link rel="apple-touch-startup-image" href="/apple-touch-icon.png"><meta name="apple-mobile-web-app-title" content="Ecolyo"><meta name="apple-mobile-web-app-capable" content="yes"><meta name="apple-mobile-web-app-status-bar-style" content="black"><!-- PWA Colors --><meta name="theme-color" content="#343641"><meta name="background-color" content="#121212">{{.ThemeCSS}} {{.CozyBar}}</head><body><div role="application" class="application" data-cozy-token="{{.Token}}" data-cozy-domain="{{.Domain}}" data-cozy-locale="{{.Locale}}" data-cozy-app-name="{{.AppName}}" data-cozy-app-slug="{{.AppSlug}}" data-cozy-app-name-prefix="{{.AppNamePrefix}}" data-cozy-app-editor="{{.AppEditor}}" data-cozy-icon-path="{{.IconPath}}"><script src="vendors/ecolyo.3256cfd41a1e2c66ff46.js"></script><script src="app/ecolyo.2af4937013bcdb13c454.js"></script></div></body></html>
\ No newline at end of file
diff --git a/services/aggregatorUsageEvents/ecolyo.js b/services/aggregatorUsageEvents/ecolyo.js
index 00907fa8dc14ed440d635b2f1aa9ea99e5f0c55c..4d1a305fdbf3fca6d8527939c2734387ec5a4211 100644
--- a/services/aggregatorUsageEvents/ecolyo.js
+++ b/services/aggregatorUsageEvents/ecolyo.js
@@ -92972,51 +92972,63 @@ class AccountService {
}
async getAccountByType(type) {
- const query = (0, _cozyClient.Q)(_doctypes.ACCOUNTS_DOCTYPE) // eslint-disable-next-line @typescript-eslint/camelcase
- .where({
- account_type: type
- }).indexFields(['account_type']);
- const {
- data: accounts
- } = await this._client.query(query);
+ try {
+ const query = (0, _cozyClient.Q)(_doctypes.ACCOUNTS_DOCTYPE) // eslint-disable-next-line @typescript-eslint/camelcase
+ .where({
+ account_type: type
+ }); // .indexFields(['account_type'])
- if (accounts.length > 1) {
- // If several account are found we will used trigger date to select the older
- const triggerService = new _triggers.default(this._client);
- const triggers = await Promise.all(accounts.map(_account => triggerService.getTriggerForAccount(_account))); // Keep the accountid which have the older trigger
+ const {
+ data: accounts
+ } = await this._client.query(query);
- let olderDate = _luxon.DateTime.now();
+ if (accounts.length > 1) {
+ // If several account are found we will used trigger date to select the older
+ const triggerService = new _triggers.default(this._client);
+ const triggers = await Promise.all(accounts.map(_account => triggerService.getTriggerForAccount(_account))); // Keep the accountid which have the older trigger
- let olderAccountId = null;
+ let olderDate = _luxon.DateTime.now();
- for (const _trigger of triggers) {
- if (_trigger && _trigger.cozyMetadata && _trigger.cozyMetadata.createdAt && _luxon.DateTime.fromISO(_trigger.cozyMetadata.createdAt, {
- zone: 'utc'
- }) < olderDate) {
- olderDate = _luxon.DateTime.fromISO(_trigger.cozyMetadata.createdAt, {
+ let olderAccountId = null;
+
+ for (const _trigger of triggers) {
+ if (_trigger && _trigger.cozyMetadata && _trigger.cozyMetadata.createdAt && _luxon.DateTime.fromISO(_trigger.cozyMetadata.createdAt, {
zone: 'utc'
- });
- olderAccountId = _trigger.message.account;
- }
- } // Retrieve the accountId and return it
+ }) < olderDate) {
+ olderDate = _luxon.DateTime.fromISO(_trigger.cozyMetadata.createdAt, {
+ zone: 'utc'
+ });
+ olderAccountId = _trigger.message.account;
+ }
+ } // Retrieve the accountId and return it
- const filteredAccounts = accounts.filter(_account => _account._id === olderAccountId);
- return filteredAccounts[0] ? filteredAccounts[0] : null;
- } else {
- return accounts[0] ? accounts[0] : null;
+ const filteredAccounts = accounts.filter(_account => _account._id === olderAccountId);
+ return filteredAccounts[0] ? filteredAccounts[0] : null;
+ } else {
+ return accounts[0] ? accounts[0] : null;
+ }
+ } catch (err) {
+ console.error(`Error GetAccountByType: ${err}`);
+ return null;
}
}
async getAccountsByType(type) {
- const query = (0, _cozyClient.Q)(_doctypes.ACCOUNTS_DOCTYPE) // eslint-disable-next-line @typescript-eslint/camelcase
- .where({
- account_type: type
- }).indexFields(['account_type']);
- const {
- data: accounts
- } = await this._client.query(query);
- return accounts;
+ try {
+ const query = (0, _cozyClient.Q)(_doctypes.ACCOUNTS_DOCTYPE) // eslint-disable-next-line @typescript-eslint/camelcase
+ .where({
+ account_type: type
+ }); // .indexFields(['account_type'])
+
+ const {
+ data: accounts
+ } = await this._client.query(query);
+ return accounts;
+ } catch (err) {
+ console.error(`Error: GetAccountsByType: ${err}`);
+ return [];
+ }
}
async updateAccount(account) {
@@ -93043,7 +93055,8 @@ class AccountService {
const query = (0, _cozyClient.Q)(_doctypes.ACCOUNTS_DOCTYPE) // eslint-disable-next-line @typescript-eslint/camelcase
.where({
account_type: 'index'
- }).indexFields(['account_type']).limitBy(1);
+ }) // .indexFields(['account_type'])
+ .limitBy(1);
const {
data: result
} = await this._client.query(query);