Merge branch...

Merge branch '299-eau-elec-prix-backoffice-non-prise-en-compte-d-un-nouveau-prix-nouvelle-date-dans-changement' into 'dev'

Resolve "[Eau/ Elec/ Prix/Backoffice] Non prise en compte d'un nouveau prix/nouvelle date dans changement prix d'un fluide dans la modale estimation des prix"

See merge request !830

src/components/ConsumptionVisualizer/EstimatedConsumptionModal.tsx

-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

src/services/fluidsPrices.service.spec.ts

-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)

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)