cozy-harvest-lib 9.32.1 → 9.32.2

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.32.2](https://github.com/cozy/cozy-libs/compare/cozy-harvest-lib@9.32.1...cozy-harvest-lib@9.32.2) (2022-12-02)
+
+
+### Bug Fixes
+
+* Only update cozy-client store when refreshing contracts ([85822d8](https://github.com/cozy/cozy-libs/commit/85822d8f12ba6578aae238e480bf7788349e875a))
+
+
+
+
+
 ## [9.32.1](https://github.com/cozy/cozy-libs/compare/cozy-harvest-lib@9.32.0...cozy-harvest-lib@9.32.1) (2022-12-02)
 
 

package/dist/services/biWebView.js

@@ -27,6 +27,7 @@ import { getBIConnectionAccountsList, getBIConnection } from './bi-http';
 import assert from '../assert';
 import logger from '../logger';
 import { Q } from 'cozy-client';
+import { receiveMutationResult } from 'cozy-client/dist/store';
 import PromiseCache from 'cozy-client/dist/promise-cache'; // @ts-ignore (its a peerDep and I don't know how to configure ts for that)
 
 import flag from 'cozy-flags';
@@ -443,7 +444,7 @@ export var getCozyBankIds = function getCozyBankIds(_ref10) {
 
 export var refreshContracts = /*#__PURE__*/function () {
   var _ref12 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee5(_ref11) {
-    var client, konnector, account, biConfig, code, config, connectionId, _yield$getBIConnectio, contracts, contractsById, _yield$client$query, currentContractsList, _iterator, _step, currentContract, disabledValue, hasChanged;
+    var client, konnector, account, biConfig, code, config, connectionId, _yield$getBIConnectio, contracts, contractsById, _yield$client$query, currentContractsList, _iterator, _step, currentContract, disabledValue, hasChanged, newMetadata;
 
     return _regeneratorRuntime.wrap(function _callee5$(_context5) {
       while (1) {
@@ -479,58 +480,39 @@ export var refreshContracts = /*#__PURE__*/function () {
             _yield$client$query = _context5.sent;
             currentContractsList = _yield$client$query.data;
             _iterator = _createForOfIteratorHelper(currentContractsList);
-            _context5.prev = 16;
 
-            _iterator.s();
-
-          case 18:
-            if ((_step = _iterator.n()).done) {
-              _context5.next = 29;
-              break;
-            }
-
-            currentContract = _step.value;
-            disabledValue = convertBIDateToStandardDate(contractsById[currentContract.vendorId]);
-            hasChanged = currentContract.metadata.disabledAt !== disabledValue;
-
-            if (!hasChanged) {
-              _context5.next = 27;
-              break;
+            try {
+              for (_iterator.s(); !(_step = _iterator.n()).done;) {
+                currentContract = _step.value;
+                disabledValue = convertBIDateToStandardDate(contractsById[currentContract.vendorId]);
+                hasChanged = currentContract.metadata.disabledAt !== disabledValue;
+
+                if (hasChanged) {
+                  newMetadata = {
+                    disabledAt: disabledValue,
+                    imported: !disabledValue
+                  }; // update the cozy-client store only to let the use see the result of the update fast
+                  // but without creating conflict with the update which will come from the BI webhooks
+
+                  client.store.dispatch(receiveMutationResult('contract-memory-update', {
+                    data: [_objectSpread(_objectSpread({}, currentContract), {}, {
+                      metadata: _objectSpread(_objectSpread({}, currentContract.metadata), newMetadata)
+                    })]
+                  }));
+                }
+              }
+            } catch (err) {
+              _iterator.e(err);
+            } finally {
+              _iterator.f();
             }
 
-            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 17:
           case "end":
             return _context5.stop();
         }
       }
-    }, _callee5, null, [[16, 31, 34, 37]]);
+    }, _callee5);
   }));
 
   return function refreshContracts(_x5) {

package/dist/services/biWebView.spec.js

@@ -349,7 +349,7 @@ describe('refreshContracts', function () {
             client = new CozyClient({
               uri: 'http://testcozy.mycozy.cloud'
             });
-            client.save = jest.fn();
+            client.store.dispatch = jest.fn();
             client.query = jest.fn().mockResolvedValueOnce({
               data: {
                 mode: 'prod',
@@ -407,34 +407,62 @@ describe('refreshContracts', function () {
             });
 
           case 6:
-            expect(client.save).toHaveBeenCalledTimes(4);
-            expect(client.save).toHaveBeenNthCalledWith(1, {
-              metadata: {
-                disabledAt: '2022-05-25T12:00:00',
-                imported: false
+            expect(client.store.dispatch).toHaveBeenCalledTimes(4);
+            expect(client.store.dispatch).toHaveBeenNthCalledWith(1, {
+              definition: {},
+              mutationId: 'contract-memory-update',
+              response: {
+                data: [{
+                  metadata: {
+                    disabledAt: '2022-05-25T12:00:00',
+                    imported: false
+                  },
+                  vendorId: '1'
+                }]
               },
-              vendorId: '1'
-            });
-            expect(client.save).toHaveBeenNthCalledWith(2, {
-              metadata: {
-                disabledAt: undefined,
-                imported: true
+              type: 'RECEIVE_MUTATION_RESULT'
+            });
+            expect(client.store.dispatch).toHaveBeenNthCalledWith(2, {
+              definition: {},
+              mutationId: 'contract-memory-update',
+              response: {
+                data: [{
+                  metadata: {
+                    disabledAt: undefined,
+                    imported: true
+                  },
+                  vendorId: '2'
+                }]
               },
-              vendorId: '2'
-            });
-            expect(client.save).toHaveBeenNthCalledWith(3, {
-              metadata: {
-                disabledAt: '2022-05-25T12:01:00',
-                imported: false
+              type: 'RECEIVE_MUTATION_RESULT'
+            });
+            expect(client.store.dispatch).toHaveBeenNthCalledWith(3, {
+              definition: {},
+              mutationId: 'contract-memory-update',
+              response: {
+                data: [{
+                  metadata: {
+                    disabledAt: '2022-05-25T12:01:00',
+                    imported: false
+                  },
+                  vendorId: '3'
+                }]
               },
-              vendorId: '3'
-            });
-            expect(client.save).toHaveBeenNthCalledWith(4, {
-              metadata: {
-                disabledAt: undefined,
-                imported: true
+              type: 'RECEIVE_MUTATION_RESULT'
+            });
+            expect(client.store.dispatch).toHaveBeenNthCalledWith(4, {
+              definition: {},
+              mutationId: 'contract-memory-update',
+              response: {
+                data: [{
+                  metadata: {
+                    disabledAt: undefined,
+                    imported: true
+                  },
+                  vendorId: '4'
+                }]
               },
-              vendorId: '4'
+              type: 'RECEIVE_MUTATION_RESULT'
             });
 
           case 11:

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cozy-harvest-lib",
-  "version": "9.32.1",
+  "version": "9.32.2",
   "description": "Provides logic, modules and components for Cozy's harvest applications.",
   "main": "dist/index.js",
   "author": "Cozy",
@@ -91,5 +91,5 @@
     "react-router-dom": "^5.0.1"
   },
   "sideEffects": false,
-  "gitHead": "31fb7f17b202dfedbb31ca265d5e62f790c3576c"
+  "gitHead": "17af5df3d39fd8b3bc37aa6f421ec0dd1c97b787"
 }

package/src/services/biWebView.js

@@ -9,6 +9,7 @@ import { getBIConnectionAccountsList, getBIConnection } from './bi-http'
 import assert from '../assert'
 import logger from '../logger'
 import { Q } from 'cozy-client'
+import { receiveMutationResult } from 'cozy-client/dist/store'
 import PromiseCache from 'cozy-client/dist/promise-cache'
 // @ts-ignore (its a peerDep and I don't know how to configure ts for that)
 import flag from 'cozy-flags'
@@ -341,10 +342,22 @@ export const refreshContracts = async ({ client, konnector, account }) => {
     )
     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)
+      const newMetadata = {
+        disabledAt: disabledValue,
+        imported: !disabledValue
+      }
+      // update the cozy-client store only to let the use see the result of the update fast
+      // but without creating conflict with the update which will come from the BI webhooks
+      client.store.dispatch(
+        receiveMutationResult('contract-memory-update', {
+          data: [
+            {
+              ...currentContract,
+              metadata: { ...currentContract.metadata, ...newMetadata }
+            }
+          ]
+        })
+      )
     }
   }
 }

package/src/services/biWebView.spec.js

@@ -211,7 +211,7 @@ describe('refreshContracts', () => {
     const client = new CozyClient({
       uri: 'http://testcozy.mycozy.cloud'
     })
-    client.save = jest.fn()
+    client.store.dispatch = jest.fn()
     client.query = jest
       .fn()
       .mockResolvedValueOnce({
@@ -226,12 +226,18 @@ describe('refreshContracts', () => {
       })
       .mockResolvedValue({
         data: [
-          { vendorId: '1', metadata: { imported: true } },
+          {
+            vendorId: '1',
+            metadata: { imported: true }
+          },
           {
             vendorId: '2',
             metadata: { imported: false, disabledAt: '2022-08-05 12:00:00' }
           },
-          { vendorId: '3', metadata: { imported: true } },
+          {
+            vendorId: '3',
+            metadata: { imported: true }
+          },
           {
             vendorId: '4',
             metadata: { imported: false, disabledAt: '2022-08-05 12:01:00' }
@@ -248,22 +254,64 @@ describe('refreshContracts', () => {
     })
 
     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'
+    expect(client.store.dispatch).toHaveBeenCalledTimes(4)
+    expect(client.store.dispatch).toHaveBeenNthCalledWith(1, {
+      definition: {},
+      mutationId: 'contract-memory-update',
+      response: {
+        data: [
+          {
+            metadata: {
+              disabledAt: '2022-05-25T12:00:00',
+              imported: false
+            },
+            vendorId: '1'
+          }
+        ]
+      },
+      type: 'RECEIVE_MUTATION_RESULT'
+    })
+    expect(client.store.dispatch).toHaveBeenNthCalledWith(2, {
+      definition: {},
+      mutationId: 'contract-memory-update',
+      response: {
+        data: [
+          {
+            metadata: {
+              disabledAt: undefined,
+              imported: true
+            },
+            vendorId: '2'
+          }
+        ]
+      },
+      type: 'RECEIVE_MUTATION_RESULT'
+    })
+    expect(client.store.dispatch).toHaveBeenNthCalledWith(3, {
+      definition: {},
+      mutationId: 'contract-memory-update',
+      response: {
+        data: [
+          {
+            metadata: { disabledAt: '2022-05-25T12:01:00', imported: false },
+            vendorId: '3'
+          }
+        ]
+      },
+      type: 'RECEIVE_MUTATION_RESULT'
+    })
+    expect(client.store.dispatch).toHaveBeenNthCalledWith(4, {
+      definition: {},
+      mutationId: 'contract-memory-update',
+      response: {
+        data: [
+          {
+            metadata: { disabledAt: undefined, imported: true },
+            vendorId: '4'
+          }
+        ]
+      },
+      type: 'RECEIVE_MUTATION_RESULT'
     })
   })
 })