cozy-harvest-lib 9.26.0 → 9.26.1

package/CHANGELOG.md

@@ -3,6 +3,17 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [9.26.1](https://github.com/cozy/cozy-libs/compare/cozy-harvest-lib@9.26.0...cozy-harvest-lib@9.26.1) (2022-08-22)
+
+
+### Bug Fixes
+
+* RefreshContracts now updates contracts in realtime ([463e716](https://github.com/cozy/cozy-libs/commit/463e7169d78ce633308229257bd262d01842fdc1))
+
+
+
+
+
 # [9.26.0](https://github.com/cozy/cozy-libs/compare/cozy-harvest-lib@9.25.0...cozy-harvest-lib@9.26.0) (2022-08-22)
 
 

package/dist/components/KonnectorConfiguration/ConfigurationTab/BiContractActivationWindow.js

@@ -42,38 +42,13 @@ var BIContractActivationWindow = function BIContractActivationWindow(_ref) {
   };
 
   useEffect(function () {
-    function refreshContracts() {
-      return _refreshContracts.apply(this, arguments);
-    }
-
-    function _refreshContracts() {
-      _refreshContracts = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
-        return _regeneratorRuntime.wrap(function _callee$(_context) {
-          while (1) {
-            switch (_context.prev = _context.next) {
-              case 0:
-                _context.next = 2;
-                return konnectorPolicy.refreshContracts({
-                  client: client,
-                  account: account,
-                  konnector: konnector
-                });
-
-              case 2:
-                setShouldRefreshContracts(false);
-
-              case 3:
-              case "end":
-                return _context.stop();
-            }
-          }
-        }, _callee);
-      }));
-      return _refreshContracts.apply(this, arguments);
-    }
-
     if (shouldRefreshContracts) {
-      refreshContracts();
+      setShouldRefreshContracts(false);
+      konnectorPolicy.refreshContracts({
+        client: client,
+        account: account,
+        konnector: konnector
+      });
     }
   }, [account, client, konnectorPolicy, shouldRefreshContracts, konnector]);
   useEffect(function () {
@@ -82,13 +57,13 @@ var BIContractActivationWindow = function BIContractActivationWindow(_ref) {
     }
 
     function _handleLinkFetch() {
-      _handleLinkFetch = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
+      _handleLinkFetch = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
         var result;
-        return _regeneratorRuntime.wrap(function _callee2$(_context2) {
+        return _regeneratorRuntime.wrap(function _callee$(_context) {
           while (1) {
-            switch (_context2.prev = _context2.next) {
+            switch (_context.prev = _context.next) {
               case 0:
-                _context2.next = 2;
+                _context.next = 2;
                 return konnectorPolicy.fetchExtraOAuthUrlParams({
                   client: client,
                   account: account,
@@ -96,15 +71,15 @@ var BIContractActivationWindow = function BIContractActivationWindow(_ref) {
                 });
 
               case 2:
-                result = _context2.sent;
+                result = _context.sent;
                 setExtraParams(result);
 
               case 4:
               case "end":
-                return _context2.stop();
+                return _context.stop();
             }
           }
-        }, _callee2);
+        }, _callee);
       }));
       return _handleLinkFetch.apply(this, arguments);
     }

package/dist/services/biWebView.js

@@ -422,9 +422,7 @@ export var getCozyBankIds = function getCozyBankIds(_ref10) {
 
 export var refreshContracts = /*#__PURE__*/function () {
   var _ref12 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee5(_ref11) {
-    var _account$relationship, _account$relationship2;
-
-    var client, konnector, account, biConfig, code, config, connectionId, _yield$getBIConnectio, contracts, contractsById, currentContractsList, _iterator, _step, currentContract, disabledValue;
+    var client, konnector, account, biConfig, code, config, connectionId, _yield$getBIConnectio, contracts, contractsById, _yield$client$query, currentContractsList, _iterator, _step, currentContract, disabledValue, hasChanged;
 
     return _regeneratorRuntime.wrap(function _callee5$(_context5) {
       while (1) {
@@ -451,31 +449,67 @@ export var refreshContracts = /*#__PURE__*/function () {
             contractsById = contracts.reduce(function (memo, contract) {
               return _objectSpread(_objectSpread({}, memo), {}, _defineProperty({}, contract.id + '', contract.disabled));
             }, {});
-            currentContractsList = (account === null || account === void 0 ? void 0 : (_account$relationship = account.relationships) === null || _account$relationship === void 0 ? void 0 : (_account$relationship2 = _account$relationship.contracts) === null || _account$relationship2 === void 0 ? void 0 : _account$relationship2.data) || [];
+            _context5.next = 13;
+            return client.query(Q('io.cozy.bank.accounts').where({
+              'relationships.connection.data._id': account._id
+            }).include(['owners']).indexFields(['relationships.connection.data._id']));
+
+          case 13:
+            _yield$client$query = _context5.sent;
+            currentContractsList = _yield$client$query.data;
             _iterator = _createForOfIteratorHelper(currentContractsList);
+            _context5.prev = 16;
 
-            try {
-              for (_iterator.s(); !(_step = _iterator.n()).done;) {
-                currentContract = _step.value;
-                disabledValue = convertBIDateToStandardDate(contractsById[currentContract.metadata.vendorId]);
-                currentContract.metadata.imported = !disabledValue;
-                currentContract.metadata.disabledAt = disabledValue;
-              }
-            } catch (err) {
-              _iterator.e(err);
-            } finally {
-              _iterator.f();
+            _iterator.s();
+
+          case 18:
+            if ((_step = _iterator.n()).done) {
+              _context5.next = 29;
+              break;
             }
 
-            _context5.next = 16;
-            return client.save(account);
+            currentContract = _step.value;
+            disabledValue = convertBIDateToStandardDate(contractsById[currentContract.vendorId]);
+            hasChanged = currentContract.metadata.disabledAt !== disabledValue;
 
-          case 16:
+            if (!hasChanged) {
+              _context5.next = 27;
+              break;
+            }
+
+            currentContract.metadata.disabledAt = disabledValue;
+            currentContract.metadata.imported = !disabledValue; // FIXME bulk save via client.collection().updateAll does not show update of accounts in realtime
+
+            _context5.next = 27;
+            return client.save(currentContract);
+
+          case 27:
+            _context5.next = 18;
+            break;
+
+          case 29:
+            _context5.next = 34;
+            break;
+
+          case 31:
+            _context5.prev = 31;
+            _context5.t0 = _context5["catch"](16);
+
+            _iterator.e(_context5.t0);
+
+          case 34:
+            _context5.prev = 34;
+
+            _iterator.f();
+
+            return _context5.finish(34);
+
+          case 37:
           case "end":
             return _context5.stop();
         }
       }
-    }, _callee5);
+    }, _callee5, null, [[16, 31, 34, 37]]);
   }));
 
   return function refreshContracts(_x5) {
@@ -620,7 +654,7 @@ export var createTemporaryToken = /*#__PURE__*/function () {
   var _ref16 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee6(_ref15) {
     var _tokenCache;
 
-    var client, konnector, account, tokenCache, cozyBankIds, _yield$client$query, biUser, _tokenCache2, biMapping;
+    var client, konnector, account, tokenCache, cozyBankIds, _yield$client$query2, biUser, _tokenCache2, biMapping;
 
     return _regeneratorRuntime.wrap(function _callee6$(_context6) {
       while (1) {
@@ -643,8 +677,8 @@ export var createTemporaryToken = /*#__PURE__*/function () {
             return client.query(Q('io.cozy.accounts').getById('bi-aggregator-user'));
 
           case 8:
-            _yield$client$query = _context6.sent;
-            biUser = _yield$client$query.data;
+            _yield$client$query2 = _context6.sent;
+            biUser = _yield$client$query2.data;
 
             if (!isCacheExpired(tokenCache, biUser)) {
               _context6.next = 15;

package/dist/services/biWebView.spec.js

@@ -344,7 +344,7 @@ describe('isBiWebViewConnector', function () {
 });
 describe('refreshContracts', function () {
   it('update current contracts with values from BI', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee7() {
-    var client, accountWithContracts;
+    var client;
     return _regeneratorRuntime.wrap(function _callee7$(_context7) {
       while (1) {
         switch (_context7.prev = _context7.next) {
@@ -353,7 +353,7 @@ describe('refreshContracts', function () {
               uri: 'http://testcozy.mycozy.cloud'
             });
             client.save = jest.fn();
-            client.query = jest.fn().mockResolvedValue({
+            client.query = jest.fn().mockResolvedValueOnce({
               data: {
                 mode: 'prod',
                 timestamp: Date.now(),
@@ -362,37 +362,31 @@ describe('refreshContracts', function () {
                 clientId: 'test-client-id',
                 code: 'bi-temporary-access-token-145613'
               }
-            });
-            accountWithContracts = {
-              _id: 'testaccount',
-              relationships: {
-                contracts: {
-                  data: [{
-                    metadata: {
-                      vendorId: '1',
-                      imported: true
-                    }
-                  }, {
-                    metadata: {
-                      vendorId: '2',
-                      imported: false,
-                      disabledAt: '2022-05-24T12:00:00'
-                    }
-                  }, {
-                    metadata: {
-                      vendorId: '3',
-                      imported: true
-                    }
-                  }, {
-                    metadata: {
-                      vendorId: '4',
-                      imported: false,
-                      disabledAt: '2022-05-23T13:00:00'
-                    }
-                  }]
+            }).mockResolvedValue({
+              data: [{
+                vendorId: '1',
+                metadata: {
+                  imported: true
                 }
-              }
-            };
+              }, {
+                vendorId: '2',
+                metadata: {
+                  imported: false,
+                  disabledAt: '2022-08-05 12:00:00'
+                }
+              }, {
+                vendorId: '3',
+                metadata: {
+                  imported: true
+                }
+              }, {
+                vendorId: '4',
+                metadata: {
+                  imported: false,
+                  disabledAt: '2022-08-05 12:01:00'
+                }
+              }]
+            });
             getBIConnectionAccountsList.mockResolvedValue({
               accounts: [{
                 id: 1,
@@ -408,46 +402,45 @@ describe('refreshContracts', function () {
                 disabled: null
               }]
             });
-            _context7.next = 7;
+            _context7.next = 6;
             return refreshContracts({
               client: client,
               konnector: konnector,
-              account: accountWithContracts
+              account: {}
             });
 
-          case 7:
-            expect(client.save).toHaveBeenCalledWith({
-              _id: 'testaccount',
-              relationships: {
-                contracts: {
-                  data: [{
-                    metadata: {
-                      vendorId: '1',
-                      imported: false,
-                      disabledAt: '2022-05-25T12:00:00'
-                    }
-                  }, {
-                    metadata: {
-                      vendorId: '2',
-                      imported: true
-                    }
-                  }, {
-                    metadata: {
-                      vendorId: '3',
-                      imported: false,
-                      disabledAt: '2022-05-25T12:01:00'
-                    }
-                  }, {
-                    metadata: {
-                      vendorId: '4',
-                      imported: true
-                    }
-                  }]
-                }
-              }
-            });
-
-          case 8:
+          case 6:
+            expect(client.save).toHaveBeenCalledTimes(4);
+            expect(client.save).toHaveBeenNthCalledWith(1, {
+              metadata: {
+                disabledAt: '2022-05-25T12:00:00',
+                imported: false
+              },
+              vendorId: '1'
+            });
+            expect(client.save).toHaveBeenNthCalledWith(2, {
+              metadata: {
+                disabledAt: undefined,
+                imported: true
+              },
+              vendorId: '2'
+            });
+            expect(client.save).toHaveBeenNthCalledWith(3, {
+              metadata: {
+                disabledAt: '2022-05-25T12:01:00',
+                imported: false
+              },
+              vendorId: '3'
+            });
+            expect(client.save).toHaveBeenNthCalledWith(4, {
+              metadata: {
+                disabledAt: undefined,
+                imported: true
+              },
+              vendorId: '4'
+            });
+
+          case 11:
           case "end":
             return _context7.stop();
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cozy-harvest-lib",
-  "version": "9.26.0",
+  "version": "9.26.1",
   "description": "Provides logic, modules and components for Cozy's harvest applications.",
   "main": "dist/index.js",
   "author": "Cozy",
@@ -90,5 +90,5 @@
     "react-router-dom": "^5.0.1"
   },
   "sideEffects": false,
-  "gitHead": "c161a9100ebf53d77cc5b7226d124ee954dfc875"
+  "gitHead": "cd08838aeee723ac6dba639509cee4acbbd29f25"
 }

package/src/components/KonnectorConfiguration/ConfigurationTab/BiContractActivationWindow.jsx

@@ -31,12 +31,9 @@ const BIContractActivationWindow = ({
   }
 
   useEffect(() => {
-    async function refreshContracts() {
-      await konnectorPolicy.refreshContracts({ client, account, konnector })
-      setShouldRefreshContracts(false)
-    }
     if (shouldRefreshContracts) {
-      refreshContracts()
+      setShouldRefreshContracts(false)
+      konnectorPolicy.refreshContracts({ client, account, konnector })
     }
   }, [account, client, konnectorPolicy, shouldRefreshContracts, konnector])
 

package/src/services/biWebView.js

@@ -306,15 +306,24 @@ export const refreshContracts = async ({ client, konnector, account }) => {
     (memo, contract) => ({ ...memo, [contract.id + '']: contract.disabled }),
     {}
   )
-  const currentContractsList = account?.relationships?.contracts?.data || []
+  const { data: currentContractsList } = await client.query(
+    Q('io.cozy.bank.accounts')
+      .where({ 'relationships.connection.data._id': account._id })
+      .include(['owners'])
+      .indexFields(['relationships.connection.data._id'])
+  )
   for (const currentContract of currentContractsList) {
     const disabledValue = convertBIDateToStandardDate(
-      contractsById[currentContract.metadata.vendorId]
+      contractsById[currentContract.vendorId]
     )
-    currentContract.metadata.imported = !disabledValue
-    currentContract.metadata.disabledAt = disabledValue
+    const hasChanged = currentContract.metadata.disabledAt !== disabledValue
+    if (hasChanged) {
+      currentContract.metadata.disabledAt = disabledValue
+      currentContract.metadata.imported = !disabledValue
+      // FIXME bulk save via client.collection().updateAll does not show update of accounts in realtime
+      await client.save(currentContract)
+    }
   }
-  await client.save(account)
 }
 
 function convertBIDateToStandardDate(biDate) {

package/src/services/biWebView.spec.js

@@ -212,41 +212,32 @@ describe('refreshContracts', () => {
       uri: 'http://testcozy.mycozy.cloud'
     })
     client.save = jest.fn()
-    client.query = jest.fn().mockResolvedValue({
-      data: {
-        mode: 'prod',
-        timestamp: Date.now(),
-        biMapping: {},
-        url: 'https://cozy.biapi.pro/2.0',
-        clientId: 'test-client-id',
-        code: 'bi-temporary-access-token-145613'
-      }
-    })
-    const accountWithContracts = {
-      _id: 'testaccount',
-      relationships: {
-        contracts: {
-          data: [
-            { metadata: { vendorId: '1', imported: true } },
-            {
-              metadata: {
-                vendorId: '2',
-                imported: false,
-                disabledAt: '2022-05-24T12:00:00'
-              }
-            },
-            { metadata: { vendorId: '3', imported: true } },
-            {
-              metadata: {
-                vendorId: '4',
-                imported: false,
-                disabledAt: '2022-05-23T13:00:00'
-              }
-            }
-          ]
+    client.query = jest
+      .fn()
+      .mockResolvedValueOnce({
+        data: {
+          mode: 'prod',
+          timestamp: Date.now(),
+          biMapping: {},
+          url: 'https://cozy.biapi.pro/2.0',
+          clientId: 'test-client-id',
+          code: 'bi-temporary-access-token-145613'
         }
-      }
-    }
+      })
+      .mockResolvedValue({
+        data: [
+          { vendorId: '1', metadata: { imported: true } },
+          {
+            vendorId: '2',
+            metadata: { imported: false, disabledAt: '2022-08-05 12:00:00' }
+          },
+          { vendorId: '3', metadata: { imported: true } },
+          {
+            vendorId: '4',
+            metadata: { imported: false, disabledAt: '2022-08-05 12:01:00' }
+          }
+        ]
+      })
     getBIConnectionAccountsList.mockResolvedValue({
       accounts: [
         { id: 1, disabled: '2022-05-25 12:00:00' },
@@ -256,31 +247,23 @@ describe('refreshContracts', () => {
       ]
     })
 
-    await refreshContracts({ client, konnector, account: accountWithContracts })
-    expect(client.save).toHaveBeenCalledWith({
-      _id: 'testaccount',
-      relationships: {
-        contracts: {
-          data: [
-            {
-              metadata: {
-                vendorId: '1',
-                imported: false,
-                disabledAt: '2022-05-25T12:00:00'
-              }
-            },
-            { metadata: { vendorId: '2', imported: true } },
-            {
-              metadata: {
-                vendorId: '3',
-                imported: false,
-                disabledAt: '2022-05-25T12:01:00'
-              }
-            },
-            { metadata: { vendorId: '4', imported: true } }
-          ]
-        }
-      }
+    await refreshContracts({ client, konnector, account: {} })
+    expect(client.save).toHaveBeenCalledTimes(4)
+    expect(client.save).toHaveBeenNthCalledWith(1, {
+      metadata: { disabledAt: '2022-05-25T12:00:00', imported: false },
+      vendorId: '1'
+    })
+    expect(client.save).toHaveBeenNthCalledWith(2, {
+      metadata: { disabledAt: undefined, imported: true },
+      vendorId: '2'
+    })
+    expect(client.save).toHaveBeenNthCalledWith(3, {
+      metadata: { disabledAt: '2022-05-25T12:01:00', imported: false },
+      vendorId: '3'
+    })
+    expect(client.save).toHaveBeenNthCalledWith(4, {
+      metadata: { disabledAt: undefined, imported: true },
+      vendorId: '4'
     })
   })
 })