Merge branch 'fix/no-contract' into 'main'

fix: no contract found throw errors

See merge request web-et-numerique/llle_project/enedis-sge-konnector!13

.gitlab-ci.yml

@@ -40,7 +40,7 @@ unit-test:
     - apk add bash
   script:
     - yarn
-    - yarn test --ci --reporters=default --reporters=jest-junit
+    - yarn test --ci --reporters=default --reporters=jest-junit --coverage
   coverage: "/All files[^|]*\\|[^|]*\\s+([\\d\\.]+)/"
   artifacts:
     when: always

__tests__/core/contractVerification.spec.js

@@ -6,8 +6,10 @@ const mockSoapRequest = jest.fn()
 jest.mock('easy-soap-request', () => async () => mockSoapRequest())
 
 const mockParseContracts = jest.fn()
+const mockCheckContractExists = jest.fn()
 jest.mock('../../src/helpers/parsing', () => ({
   parseContracts: () => mockParseContracts(),
+  checkContractExists: () => mockCheckContractExists(),
 }))
 
 const responseMock = {
@@ -33,6 +35,7 @@ describe('verifyContract', () => {
           'Collecte de la courbe de charge au pas 30 min avec transmission quotidienne des données brutes en soutirage',
       },
     ])
+    mockCheckContractExists.mockReturnValueOnce(true)
 
     jest.spyOn(xml2js, 'parseStringPromise').mockResolvedValue(
       {
@@ -84,6 +87,7 @@ describe('verifyContract', () => {
       serviceSouscritLibelle:
         'Collecte de la courbe de charge au pas 30 min avec transmission quotidienne des données brutes en soutirage',
     })
+    mockCheckContractExists.mockReturnValueOnce(true)
 
     jest.spyOn(xml2js, 'parseStringPromise').mockResolvedValue(
       {
@@ -143,6 +147,7 @@ describe('verifyContract', () => {
           'Collecte de la courbe de charge au pas 30 min avec transmission quotidienne des données brutes en soutirage',
       },
     ])
+    mockCheckContractExists.mockReturnValueOnce(true)
 
     jest.spyOn(xml2js, 'parseStringPromise').mockResolvedValue(
       {
@@ -212,6 +217,7 @@ describe('verifyContract', () => {
         },
       },
     })
+    mockCheckContractExists.mockReturnValueOnce(true)
 
     try {
       await verifyContract(
@@ -226,4 +232,28 @@ describe('verifyContract', () => {
       expect(error).toBe(errors.LOGIN_FAILED)
     }
   })
+  it('should return NULL if no contract are found 🚫', async () => {
+    mockSoapRequest.mockResolvedValue(responseMock)
+    jest.spyOn(xml2js, 'parseStringPromise').mockResolvedValueOnce({
+      Envelope: {
+        Body: {
+          rechercherServicesSouscritsMesuresResponse: {},
+        },
+      },
+    })
+
+    try {
+      const serviceId = await verifyContract(
+        'http://test.com',
+        '111',
+        'login@log.com',
+        '1234567',
+        '1111111111111'
+      )
+      expect(serviceId).toBe(null)
+    } catch (error) {
+      expect(true).toBe(false)
+    }
+    mockParseContracts.mockRestore()
+  })
 })

src/core/contractVerification.js

 // @ts-check
 const { log, errors } = require('cozy-konnector-libs')
 const soapRequest = require('easy-soap-request')
-const { parseTags, parseValue, parseContracts } = require('../helpers/parsing')
+const {
+  parseTags,
+  parseValue,
+  parseContracts,
+  checkContractExists,
+} = require('../helpers/parsing')
 const { rechercherServicesSouscritsMesures } = require('../requests/sge')
 const xml2js = require('xml2js')
 const { contractState, contractLibelle } = require('./types/enum')
@@ -37,6 +42,11 @@ async function verifyContract(url, apiAuthKey, appLogin, contractId, pointId) {
   })
 
   try {
+    if (!checkContractExists(parsedReply)) {
+      log('error', 'no contract found')
+      return null
+    }
+
     const currentContracts = parseContracts(parsedReply)
     let currentContract = null
     if (Array.isArray(currentContracts)) {

src/helpers/parsing.js

@@ -89,6 +89,18 @@ async function formateDataForDoctype(data) {
   })
 }
 
+/**
+ * Check if response contains contracts
+ * @param {string} parsedReply
+ * @return {boolean}
+ */
+function checkContractExists(parsedReply) {
+  const json = JSON.stringify(parsedReply)
+  return JSON.parse(json)['Envelope']['Body'][
+    'rechercherServicesSouscritsMesuresResponse'
+  ]['servicesSouscritsMesures']
+}
+
 /**
  * Format tag in order to be manipulated easly
  * @param {string} name
@@ -124,4 +136,5 @@ module.exports = {
   parseContracts,
   parseContractStartDate,
   parseServiceId,
+  checkContractExists,
 }