cozy-harvest-lib 18.1.2 → 18.1.3

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.
 
+## [18.1.3](https://github.com/cozy/cozy-libs/compare/cozy-harvest-lib@18.1.2...cozy-harvest-lib@18.1.3) (2023-10-12)
+
+
+### Bug Fixes
+
+* Optimize the request ([b948b48](https://github.com/cozy/cozy-libs/commit/b948b487c560db1e208612d7d5496e595bc94f21))
+
+
+
+
+
 ## [18.1.2](https://github.com/cozy/cozy-libs/compare/cozy-harvest-lib@18.1.1...cozy-harvest-lib@18.1.2) (2023-10-11)
 
 

package/dist/connections/accounts.js

@@ -481,28 +481,34 @@ export var fetchAccountsWithoutTriggers = /*#__PURE__*/function () {
 
 export var fetchReusableAccount = /*#__PURE__*/function () {
   var _ref9 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee8(client, konnector) {
-    var _yield$client$collect, triggers, accountsWithoutTrigger;
-
+    var triggers, accountsWithoutTrigger;
     return _regeneratorRuntime.wrap(function _callee8$(_context8) {
       while (1) {
         switch (_context8.prev = _context8.next) {
           case 0:
             _context8.next = 2;
-            return client.collection('io.cozy.triggers').all();
+            return client.queryAll(Q('io.cozy.triggers').where({
+              _id: {
+                $gt: null
+              }
+            }).partialIndex({
+              worker: {
+                $in: ['konnector', 'client']
+              }
+            }).indexFields(['_id']));
 
           case 2:
-            _yield$client$collect = _context8.sent;
-            triggers = _yield$client$collect.data;
-            _context8.next = 6;
+            triggers = _context8.sent;
+            _context8.next = 5;
             return fetchAccountsWithoutTriggers(client, triggers);
 
-          case 6:
+          case 5:
             accountsWithoutTrigger = _context8.sent;
             return _context8.abrupt("return", accountsWithoutTrigger.find(function (account) {
               return account.account_type === konnector.slug;
             }));
 
-          case 8:
+          case 7:
           case "end":
             return _context8.stop();
         }

package/dist/connections/accounts.spec.js

@@ -564,22 +564,14 @@ describe('fetchReusableAccount', function () {
     var accounts = _ref22.accounts,
         triggers = _ref22.triggers;
     var client = new CozyClient({});
-    client.collection = jest.fn(function (doctype) {
-      if (doctype === 'io.cozy.triggers') {
-        return {
-          all: jest.fn().mockResolvedValue({
-            data: triggers
-          })
-        };
-      } else {
-        throw new Error("client.collection for ".concat(doctype, " is not mocked"));
-      }
-    });
     client.query = jest.fn().mockImplementation(function () {
       return {
         data: accounts
       };
     });
+    client.queryAll = jest.fn().mockImplementation(function () {
+      return triggers;
+    });
     return {
       client: client
     };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cozy-harvest-lib",
-  "version": "18.1.2",
+  "version": "18.1.3",
   "description": "Provides logic, modules and components for Cozy's harvest applications.",
   "main": "dist/index.js",
   "author": "Cozy",
@@ -112,5 +112,5 @@
     "react-router-dom": ">=4.3.1"
   },
   "sideEffects": false,
-  "gitHead": "db4a954385db84b920e714ae87bda1fb96010c80"
+  "gitHead": "3b33cc4d8c10f44d2824a0cb0e017c4c8290dced"
 }

package/src/connections/accounts.js

@@ -237,7 +237,22 @@ export const fetchAccountsWithoutTriggers = async (client, triggers) => {
  * @return {Account} An account without trigger for the given konnector
  */
 export const fetchReusableAccount = async (client, konnector) => {
-  const { data: triggers } = await client.collection('io.cozy.triggers').all()
+  // the where is there because ATM TriggerCollection check if there is
+  // a selector to know if it should call /jobs/triggers or
+  // /data/io.cozy.triggers.
+  // In our case, we only want the triggers without the job, so we want
+  // to use /data/io.cozy.triggers
+  const triggers = await client.queryAll(
+    Q('io.cozy.triggers')
+      .where({
+        _id: { $gt: null }
+      })
+      .partialIndex({
+        worker: { $in: ['konnector', 'client'] }
+      })
+      .indexFields(['_id'])
+  )
+
   const accountsWithoutTrigger = await fetchAccountsWithoutTriggers(
     client,
     triggers

package/src/connections/accounts.spec.js

@@ -417,20 +417,15 @@ describe('Account mutations', () => {
 describe('fetchReusableAccount', () => {
   const setup = ({ accounts, triggers }) => {
     const client = new CozyClient({})
-    client.collection = jest.fn(doctype => {
-      if (doctype === 'io.cozy.triggers') {
-        return {
-          all: jest.fn().mockResolvedValue({ data: triggers })
-        }
-      } else {
-        throw new Error(`client.collection for ${doctype} is not mocked`)
-      }
-    })
     client.query = jest.fn().mockImplementation(() => {
       return {
         data: accounts
       }
     })
+
+    client.queryAll = jest.fn().mockImplementation(() => {
+      return triggers
+    })
     return { client }
   }
   it('should return the right account when possible', async () => {