diff --git a/src/models/initialisationSteps.model.ts b/src/models/initialisationSteps.model.ts index f8584e812b1262725d10bf1b4041633a660403fa..8f2516a387c622fb4e58e642d3d84ef8aeff4de4 100644 --- a/src/models/initialisationSteps.model.ts +++ b/src/models/initialisationSteps.model.ts @@ -15,7 +15,6 @@ export enum InitStepsErrors { ECOGESTURE_ERROR = 'ecogesture_error', CHALLENGES_ERROR = 'challenges_error', ANALYSIS_ERROR = 'analysis_error', - PRICES_ERROR = 'prices_error', CONSOS_ERROR = 'consos_error', PARTNERS_ERROR = 'partners_error', NETWORK_ERROR = 'network_error', diff --git a/src/services/customPopup.service.test.ts b/src/services/customPopup.service.test.ts index 1c15f8f3b4fa180a4638254b571bf2ca4b7c0ad4..7b30e3b92329b3185f0fe33978da9d737eca13cd 100644 --- a/src/services/customPopup.service.test.ts +++ b/src/services/customPopup.service.test.ts @@ -21,11 +21,12 @@ describe('PartnersInfo service', () => { it('should return an error', async () => { mockClient.getStackClient().fetchJSON.mockRejectedValue(new Error()) + let res try { - await customPupopService.getCustomPopup() + res = await customPupopService.getCustomPopup() expect(true).toBe(false) } catch (error) { - expect(error).toEqual(new Error('Error while getting customPopup')) + expect(res).toBe(undefined) } }) }) diff --git a/src/services/customPopup.service.ts b/src/services/customPopup.service.ts index ef6fcb4976db6bd7ffbb353983360278e27e1fd1..38e77cba7c1ed178e61207ac8cb71593f7f4f502 100644 --- a/src/services/customPopup.service.ts +++ b/src/services/customPopup.service.ts @@ -1,7 +1,8 @@ import { Client } from 'cozy-client' import { CustomPopup } from 'models/customPopup.model' import EnvironmentService from './environment.service' - +import logger from 'cozy-logger' +const log = logger.namespace('customPupopService') export default class CustomPupopService { private readonly _client: Client constructor(_client: Client) { @@ -24,8 +25,10 @@ export default class CustomPupopService { .fetchJSON('GET', remoteUrl) return result as CustomPopup } catch (error) { - console.error(`getCustomPopup: Failed to get custom popup:${error}`) - throw new Error('Error while getting customPopup') + log( + 'error', + `getCustomPopup: Failed to get custom popup:${JSON.stringify(error)}` + ) } } } diff --git a/src/services/initialization.service.ts b/src/services/initialization.service.ts index e199dff5074c37e92938b06e70795305fd452932..288edbc9f60faa09d4579067af38323915ad65b6 100644 --- a/src/services/initialization.service.ts +++ b/src/services/initialization.service.ts @@ -1,4 +1,4 @@ -import { Client, Q, QueryDefinition } from 'cozy-client' +import { Client } from 'cozy-client' import challengeEntityData from 'db/challengeEntity.json' import duelEntityData from 'db/duelEntity.json' import ecogestureData from 'db/ecogestureData.json' @@ -43,7 +43,8 @@ import FluidPricesService from './fluidsPrices.service' import ProfileEcogestureService from './profileEcogesture.service' import ProfileTypeEntityService from './profileTypeEntity.service' import TermsService from './terms.service' - +import logger from 'cozy-logger' +const cozyLog = logger.namespace('initializationService') export default class InitializationService { private readonly _client: Client private readonly _setinitStep: React.Dispatch<React.SetStateAction<InitSteps>> @@ -240,9 +241,8 @@ export default class InitializationService { log.info('[Initialization] FluidPrices db created successfully') return true } catch (err) { - this._setinitStepError(InitStepsErrors.PRICES_ERROR) - log.error('Initialization error - initFluidPrices: ', err) + cozyLog('error', `Initialization error - initFluidPrices: ${err}`) return false } } diff --git a/src/services/partnersInfo.service.spec.ts b/src/services/partnersInfo.service.spec.ts index ace20739b7a76826075f81dd905a56f96504bcac..ffb46973ef0254e7772d44917dfe3565a880f38f 100644 --- a/src/services/partnersInfo.service.spec.ts +++ b/src/services/partnersInfo.service.spec.ts @@ -32,11 +32,12 @@ describe('PartnersInfo service', () => { it('should return an error', async () => { mockClient.getStackClient().fetchJSON.mockRejectedValue(new Error()) + let res try { - await partnersInfoService.getPartnersInfo() + res = await partnersInfoService.getPartnersInfo() expect(true).toBe(false) } catch (error) { - expect(error).toEqual(new Error('Error while getting partnersInfo')) + expect(res).toBe(undefined) } }) }) diff --git a/src/services/partnersInfo.service.ts b/src/services/partnersInfo.service.ts index da6a98738a286409c2b8429548be8c74e2e23605..68ba53641d22507bf1328ddc2f853c0506ae2176 100644 --- a/src/services/partnersInfo.service.ts +++ b/src/services/partnersInfo.service.ts @@ -1,6 +1,8 @@ import { Client } from 'cozy-client' import { PartnersInfo } from 'models/partnersInfo.model' import EnvironmentService from './environment.service' +import logger from 'cozy-logger' +const log = logger.namespace('partnersInfoService') export default class PartnersInfoService { private readonly _client: Client @@ -24,8 +26,10 @@ export default class PartnersInfoService { .fetchJSON('GET', remoteUrl) return result as PartnersInfo } catch (error) { - console.error(`getPartnersInfo: Failed to get partners info:${error}`) - throw new Error('Error while getting partnersInfo') + log( + 'error', + `getPartnersInfo: Failed to get partners info: ${JSON.stringify(error)}` + ) } } }