From a5667de0ad55ca7bbead14a9e2469b6c7d3a551c Mon Sep 17 00:00:00 2001
From: hnouts <hnouts@grandlyon.com>
Date: Tue, 6 Dec 2022 16:57:41 +0100
Subject: [PATCH] fixed tests
---
.../consumptionFormatter.service.spec.ts | 10 ++++-----
src/services/queryRunner.service.spec.ts | 22 ++++++-------------
src/services/queryRunner.service.ts | 11 ++++++----
3 files changed, 19 insertions(+), 24 deletions(-)
diff --git a/src/services/consumptionFormatter.service.spec.ts b/src/services/consumptionFormatter.service.spec.ts
index fd43404f4..085dab6fb 100644
--- a/src/services/consumptionFormatter.service.spec.ts
+++ b/src/services/consumptionFormatter.service.spec.ts
@@ -1,10 +1,10 @@
-import ConsumptionFormatterService from './consumptionFormatter.service'
+import { DataloadState } from 'enum/dataload.enum'
+import { FluidType } from 'enum/fluid.enum'
import { TimeStep } from 'enum/timeStep.enum'
import { DateTime } from 'luxon'
import { Dataload, FluidStatus, TimePeriod } from 'models'
-import { DataloadState } from 'enum/dataload.enum'
-import { FluidType } from 'enum/fluid.enum'
import { fluidStatusConnectedData } from '../../tests/__mocks__/fluidStatusData.mock'
+import ConsumptionFormatterService from './consumptionFormatter.service'
const localSpy = jest.spyOn(DateTime, 'local')
@@ -121,10 +121,10 @@ describe('ConsumptionFormatter service', () => {
})
it('should return a formattedData for HALF_AN_HOUR', () => {
mockTimePeriod = {
- startDate: DateTime.fromISO('2020-10-01T00:00:00.000Z', {
+ startDate: DateTime.fromISO('2020-10-01T00:30:00.000Z', {
zone: 'utc',
}),
- endDate: DateTime.fromISO('2020-10-01T01:00:00.000Z', {
+ endDate: DateTime.fromISO('2020-10-01T01:30:00.000Z', {
zone: 'utc',
}),
}
diff --git a/src/services/queryRunner.service.spec.ts b/src/services/queryRunner.service.spec.ts
index d31b29f14..1df675451 100644
--- a/src/services/queryRunner.service.spec.ts
+++ b/src/services/queryRunner.service.spec.ts
@@ -1,15 +1,15 @@
import { QueryResult } from 'cozy-client'
+import { DataloadState } from 'enum/dataload.enum'
import { FluidType } from 'enum/fluid.enum'
import { TimeStep } from 'enum/timeStep.enum'
import { DateTime } from 'luxon'
import { Dataload, DataloadEntity } from 'models'
-import QueryRunner from './queryRunner.service'
import mockClient from '../../tests/__mocks__/client'
-import { loadYearData } from '../../tests/__mocks__/loadYearData.mock'
-import { loadMonthData } from '../../tests/__mocks__/loadMonthData.mock'
import { loadDayData } from '../../tests/__mocks__/loadDayData.mock'
import { loadMinuteData } from '../../tests/__mocks__/loadMinuteData.mock'
-import { DataloadState } from 'enum/dataload.enum'
+import { loadMonthData } from '../../tests/__mocks__/loadMonthData.mock'
+import { loadYearData } from '../../tests/__mocks__/loadYearData.mock'
+import QueryRunner from './queryRunner.service'
describe('queryRunner service', () => {
const queryRunner = new QueryRunner(mockClient)
@@ -244,20 +244,12 @@ describe('queryRunner service', () => {
date: DateTime.fromISO('2020-11-02T00:00:00.000Z', {
zone: 'utc',
}),
- value: 4.5,
- state: DataloadState.VALID,
- valueDetail: null,
- },
- {
- date: DateTime.fromISO('2020-11-02T00:30:00.000Z', {
- zone: 'utc',
- }),
value: 1.33,
state: DataloadState.VALID,
valueDetail: null,
},
{
- date: DateTime.fromISO('2020-11-02T01:00:00.000Z', {
+ date: DateTime.fromISO('2020-11-02T00:30:00.000Z', {
zone: 'utc',
}),
value: 3.22,
@@ -265,7 +257,7 @@ describe('queryRunner service', () => {
valueDetail: null,
},
{
- date: DateTime.fromISO('2020-11-02T01:30:00.000Z', {
+ date: DateTime.fromISO('2020-11-02T01:00:00.000Z', {
zone: 'utc',
}),
value: 7.82,
@@ -273,7 +265,7 @@ describe('queryRunner service', () => {
valueDetail: null,
},
{
- date: DateTime.fromISO('2020-11-02T02:00:00.000Z', {
+ date: DateTime.fromISO('2020-11-02T01:30:00.000Z', {
zone: 'utc',
}),
value: 1.23,
diff --git a/src/services/queryRunner.service.ts b/src/services/queryRunner.service.ts
index 73f96fd08..d58685b85 100644
--- a/src/services/queryRunner.service.ts
+++ b/src/services/queryRunner.service.ts
@@ -143,8 +143,8 @@ export default class QueryRunner {
}
}
- private mapDataList(data: any): Dataload[] {
- if (data.length === 48) {
+ private mapDataList(data: any, timeStep?: TimeStep): Dataload[] {
+ if (timeStep && timeStep === 10) {
const test = data.map((entry: any) => ({
date: DateTime.local(
entry.year,
@@ -365,7 +365,10 @@ export default class QueryRunner {
if (result?.data) {
const filteredResult = this.filterDataList(result, timePeriod)
- const mappedResult: Dataload[] = this.mapDataList(filteredResult)
+ const mappedResult: Dataload[] = this.mapDataList(
+ filteredResult,
+ timeStep
+ )
return mappedResult
}
return null
@@ -421,7 +424,7 @@ export default class QueryRunner {
}
if (result?.data) {
const filteredResult = this.filterDataList(result, maxTimePeriod)
- const mappedResult = this.mapDataList(filteredResult)
+ const mappedResult = this.mapDataList(filteredResult, timeStep)
if (withDate) {
return mappedResult && mappedResult[0] && mappedResult[0]
}
--
GitLab