diff --git a/src/components/ConsumptionVisualizer/EstimatedConsumptionModal.tsx b/src/components/ConsumptionVisualizer/EstimatedConsumptionModal.tsx index 7d3c7fa407bfe08039e7d81f900d8403374fe5c9..267b981cdb1122fc7cce0a735602bd43da9de3e8 100644 --- a/src/components/ConsumptionVisualizer/EstimatedConsumptionModal.tsx +++ b/src/components/ConsumptionVisualizer/EstimatedConsumptionModal.tsx @@ -1,15 +1,15 @@ -import React, { useEffect, useState } from 'react' -import { useI18n } from 'cozy-ui/transpiled/react/I18n' +import { IconButton } from '@material-ui/core' import Dialog from '@material-ui/core/Dialog' -import { FluidType } from 'enum/fluid.enum' import CloseIcon from 'assets/icons/ico/close.svg' -import Icon from 'cozy-ui/transpiled/react/Icon' -import { IconButton } from '@material-ui/core' -import './estimatedConsumptionModal.scss' -import FluidPricesService from 'services/fluidsPrices.service' import { useClient } from 'cozy-client' +import { useI18n } from 'cozy-ui/transpiled/react/I18n' +import Icon from 'cozy-ui/transpiled/react/Icon' +import { FluidType } from 'enum/fluid.enum' import { DateTime } from 'luxon' import { FluidPrice } from 'models' +import React, { useEffect, useState } from 'react' +import FluidPricesService from 'services/fluidsPrices.service' +import './estimatedConsumptionModal.scss' interface EstimatedConsumptionModalProps { open: boolean diff --git a/src/services/fluidsPrices.service.spec.ts b/src/services/fluidsPrices.service.spec.ts index e3c1c5f785fbb153906512a02166584a9a65613b..f83929e3bd6e2636351cb916845d7734d5ba316d 100644 --- a/src/services/fluidsPrices.service.spec.ts +++ b/src/services/fluidsPrices.service.spec.ts @@ -1,13 +1,13 @@ -import FluidPricesService from './fluidsPrices.service' -import mockClient from '../../tests/__mocks__/client' import { QueryResult } from 'cozy-client' +import { FluidType } from 'enum/fluid.enum' +import { DateTime } from 'luxon' import { FluidPrice } from 'models' +import mockClient from '../../tests/__mocks__/client' import { - fluidPrices, allLastFluidPrices, + fluidPrices, } from '../../tests/__mocks__/fluidPrice.mock' -import { FluidType } from 'enum/fluid.enum' -import { DateTime } from 'luxon' +import FluidPricesService from './fluidsPrices.service' describe('FluidPrices service', () => { const fluidPricesService = new FluidPricesService(mockClient) diff --git a/src/services/fluidsPrices.service.ts b/src/services/fluidsPrices.service.ts index 39ac3bf3469841cbef873209ff80e67d88869bc3..700f9ec7b014fa9cdc12fda61a0ebfa1b0a73c88 100644 --- a/src/services/fluidsPrices.service.ts +++ b/src/services/fluidsPrices.service.ts @@ -62,7 +62,7 @@ export default class FluidPricesService { public async getAllLastPrices(): Promise<FluidPrice[]> { const query: QueryDefinition = Q(FLUIDPRICES_DOCTYPE) .indexFields(['fluidType']) - .where({ endDate: { $eq: null } }) + .where({ endDate: { $eq: '' } }) .sortBy([{ fluidType: 'asc' }]) .limitBy(3)