Merge branch 'features/unit-tests' of...

Merge branch 'features/unit-tests' of https://forge.grandlyon.com/web-et-numerique/llle_project/ecolyo into features/unit-tests

src/services/konnector.service.spec.ts

@@ -2,6 +2,7 @@ import KonnectorService from './konnector.service'
 import { Client, QueryDefinition } from 'cozy-client'
 import TriggerService from 'services/triggers.service'
 import { Trigger, TriggerState, Account } from 'models'
+import mockAccount from './__mocks__/accountsData.json'
 
 const mockTriggers = ({
   getTrigger: jest.fn(),
@@ -17,19 +18,6 @@ const mockClient = ({
   getStackClient: jest.fn(),
 } as unknown) as jest.Mocked<Client>
 
-const mockAccount: Account = {
-  _id: 'a686348c1fc85f92033e19eb6b0042af',
-  // eslint-disable-next-line @typescript-eslint/camelcase
-  account_type: 'eglgrandlyon',
-  auth: {
-    // eslint-disable-next-line @typescript-eslint/camelcase
-    credentials_encrypted:
-      'bmFjbNDdeM1X3TDBNfSmJTWOsiMkZHLkhUZVdfIh/BlrsTpNKYKZ6p63eBOpXUBSok5cTJBNuP2fVwOZAPzVKAACO+FMC2sdZtgk/CDqxwOA/roQlg==',
-    login: 'test',
-  },
-  identifier: 'login',
-}
-
 const mockKonnectorData = [
   {
     _id: 'test',
@@ -38,7 +26,6 @@ const mockKonnectorData = [
     state: 'test',
   },
 ]
-const mockFind = new QueryDefinition()
 const mockTriggerData: Trigger = {
   _id: 'test',
   type: 'test',
@@ -65,7 +52,6 @@ const mockTriggerState: TriggerState = {
 
 describe('KonnectorService service', () => {
   const konnectorService = new KonnectorService(mockClient)
-  mockClient.find.mockReturnValue(mockFind)
   mockClient.query.mockImplementation(() =>
     Promise.resolve({ data: mockKonnectorData })
   )

src/services/konnector.service.ts

-import { Client } from 'cozy-client'
+import { Client, Q } from 'cozy-client'
 import { KONNECTORS_DOCTYPE } from 'doctypes'
 import { Account, Konnector, TriggerState } from 'models'
 import TriggerService from 'services/triggers.service'
@@ -11,11 +11,12 @@ export default class KonnectorService {
   }
 
   public async getKonnector(id: string) {
-    const { data } = await this._client.query(
-      this._client.find(KONNECTORS_DOCTYPE).where({
+    const query = Q(KONNECTORS_DOCTYPE)
+      // eslint-disable-next-line @typescript-eslint/camelcase
+      .where({
         _id: KONNECTORS_DOCTYPE + '/' + id,
       })
-    )
+    const { data } = await this._client.query(query)
     const konnector: Konnector = data && data[0]
     return konnector
   }
@@ -34,8 +35,7 @@ export default class KonnectorService {
   }
 
   public async createIndexKonnector() {
-    const query = this._client
-      .find('io.cozy.konnectors')
+    const query = Q(KONNECTORS_DOCTYPE)
       // eslint-disable-next-line @typescript-eslint/camelcase
       .where({ _id: 'index' })
       .limitBy(1)