diff --git a/src/services/fluid.service.ts b/src/services/fluid.service.ts index 7a286d1542c11a03b5e190ea1572375e3a4bc75b..2d4a24fc310b6cba29247ddaf93fff4cd9fcf0b8 100644 --- a/src/services/fluid.service.ts +++ b/src/services/fluid.service.ts @@ -1,13 +1,6 @@ import { Client } from 'cozy-client' import { FluidState, FluidType } from 'enums' -import { - Account, - FluidStatus, - Konnector, - PartnersInfo, - Trigger, - TriggerState, -} from 'models' +import { FluidStatus, Konnector, PartnersInfo, TriggerState } from 'models' import AccountService from 'services/account.service' import ConsumptionService from 'services/consumption.service' import ConfigService from 'services/fluidConfig.service' @@ -64,51 +57,47 @@ export default class FluidService { ): Promise<FluidStatus[]> => { const fluidConfig = new ConfigService().getFluidConfig() const accountService = new AccountService(this._client) - const [elecAccount, waterAccount, gasAccount]: (Account | null)[] = - await Promise.all([ - accountService.getAccountByType( - fluidConfig[FluidType.ELECTRICITY].konnectorConfig.slug - ), - accountService.getAccountByType( - fluidConfig[FluidType.WATER].konnectorConfig.slug - ), - accountService.getAccountByType( - fluidConfig[FluidType.GAS].konnectorConfig.slug - ), - ]) + const [elecAccount, waterAccount, gasAccount] = await Promise.all([ + accountService.getAccountByType( + fluidConfig[FluidType.ELECTRICITY].konnectorConfig.slug + ), + accountService.getAccountByType( + fluidConfig[FluidType.WATER].konnectorConfig.slug + ), + accountService.getAccountByType( + fluidConfig[FluidType.GAS].konnectorConfig.slug + ), + ]) const konnectorService = new KonnectorService(this._client) - const [elecKonnector, waterKonnector, gasKonnector]: (Konnector | null)[] = - await Promise.all([ - konnectorService.getKonnector( - fluidConfig[FluidType.ELECTRICITY].konnectorConfig.slug - ), - konnectorService.getKonnector( - fluidConfig[FluidType.WATER].konnectorConfig.slug - ), - konnectorService.getKonnector( - fluidConfig[FluidType.GAS].konnectorConfig.slug - ), - ]) + const [elecKonnector, waterKonnector, gasKonnector] = await Promise.all([ + konnectorService.getKonnector( + fluidConfig[FluidType.ELECTRICITY].konnectorConfig.slug + ), + konnectorService.getKonnector( + fluidConfig[FluidType.WATER].konnectorConfig.slug + ), + konnectorService.getKonnector( + fluidConfig[FluidType.GAS].konnectorConfig.slug + ), + ]) const triggerService = new TriggerService(this._client) - const [elecTrigger, waterTrigger, gasTrigger]: (Trigger | null)[] = - await Promise.all([ - elecAccount && elecKonnector - ? triggerService.getTrigger(elecAccount, elecKonnector) - : null, - waterAccount && waterKonnector - ? triggerService.getTrigger(waterAccount, waterKonnector) - : null, - gasAccount && gasKonnector - ? triggerService.getTrigger(gasAccount, gasKonnector) - : null, - ]) + const [elecTrigger, waterTrigger, gasTrigger] = await Promise.all([ + elecAccount && elecKonnector + ? triggerService.getTrigger(elecAccount, elecKonnector) + : null, + waterAccount && waterKonnector + ? triggerService.getTrigger(waterAccount, waterKonnector) + : null, + gasAccount && gasKonnector + ? triggerService.getTrigger(gasAccount, gasKonnector) + : null, + ]) const consumptionService = new ConsumptionService(this._client) - const [elecStatus, waterStatus, gasStatus]: (TriggerState | null)[] = - await Promise.all([ - elecTrigger ? triggerService.fetchTriggerState(elecTrigger) : null, - waterTrigger ? triggerService.fetchTriggerState(waterTrigger) : null, - gasTrigger ? triggerService.fetchTriggerState(gasTrigger) : null, - ]) + const [elecStatus, waterStatus, gasStatus] = await Promise.all([ + elecTrigger ? triggerService.fetchTriggerState(elecTrigger) : null, + waterTrigger ? triggerService.fetchTriggerState(waterTrigger) : null, + gasTrigger ? triggerService.fetchTriggerState(gasTrigger) : null, + ]) console.log('🚀 ~ FluidService ~ gasStatus:', gasStatus) const firstDataDates = await consumptionService.fetchAllFirstDateData(allFluids)