Merge branch '270-mauvaise-gestion-du-cas-derniere-donnee-pour-la-demi-heure' into 'dev'

Resolve "Mauvaise gestion du cas "Dernière donnée" pour la demi-heure"

Closes #270

See merge request web-et-numerique/llle_project/ecolyo!727

src/services/consumptionFormatter.service.spec.ts

@@ -309,7 +309,7 @@ describe('ConsumptionFormatter service', () => {
       )
       expect(result).toEqual(expectedResult)
     })
-    it('sould return EMPTY state because data.date < firstFluidDataDate for day timestep', () => {
+    it('sould return VALID state because data.date < firstFluidDataDate for day timestep', () => {
       fluidStatus[FluidType.ELECTRICITY].firstDataDate = DateTime.fromISO(
         '2020-10-20T00:00:00.000Z',
         {
@@ -318,7 +318,7 @@ describe('ConsumptionFormatter service', () => {
       )
       const expectedResult: Dataload = {
         ...mockData,
-        state: DataloadState.EMPTY,
+        state: DataloadState.VALID,
       }
       const result: Dataload = consumptionFormatterService.defineDataloadState(
         mockData,
@@ -328,7 +328,7 @@ describe('ConsumptionFormatter service', () => {
       )
       expect(result).toEqual(expectedResult)
     })
-    it('sould return EMPTY state because data.date < start of month of firstFluidDataDate for month timestep', () => {
+    it('sould return VALID state because data.date < start of month of firstFluidDataDate for month timestep', () => {
       fluidStatus[FluidType.ELECTRICITY].firstDataDate = DateTime.fromISO(
         '2020-11-01T00:00:00.000Z',
         {
@@ -337,7 +337,7 @@ describe('ConsumptionFormatter service', () => {
       )
       const expectedResult: Dataload = {
         ...mockData,
-        state: DataloadState.EMPTY,
+        state: DataloadState.VALID,
       }
       const result: Dataload = consumptionFormatterService.defineDataloadState(
         mockData,
@@ -347,7 +347,7 @@ describe('ConsumptionFormatter service', () => {
       )
       expect(result).toEqual(expectedResult)
     })
-    it('sould return EMPTY state because data.date < start of year firstFluidDataDate for year timestep', () => {
+    it('sould return VALID state because data.date < start of year firstFluidDataDate for year timestep', () => {
       fluidStatus[FluidType.ELECTRICITY].firstDataDate = DateTime.fromISO(
         '2021-10-20T00:00:00.000Z',
         {
@@ -356,7 +356,7 @@ describe('ConsumptionFormatter service', () => {
       )
       const expectedResult: Dataload = {
         ...mockData,
-        state: DataloadState.EMPTY,
+        state: DataloadState.VALID,
       }
       const result: Dataload = consumptionFormatterService.defineDataloadState(
         mockData,

src/services/consumptionFormatter.service.ts

@@ -5,6 +5,7 @@ import { DateTime, Interval } from 'luxon'
 import { Dataload, FluidStatus, TimePeriod } from 'models'
 import DateChartService from 'services/dateChart.service'
 import { compareDates } from 'utils/date'
+import log from 'utils/logger'
 import ConfigService from './fluidConfig.service'
 
 export default class ConsumptionFormatterService {
@@ -63,6 +64,11 @@ export default class ConsumptionFormatterService {
     if (!fluidStatus) {
       return data
     }
+
+    if (data.value !== -1) {
+      return { ...data, state: DataloadState.VALID }
+    }
+
     // Define state in function of first and last fluid data date
     if (
       fluidStatus.firstDataDate &&