diff --git a/src/services/queryRunner.service.ts b/src/services/queryRunner.service.ts index 30dcbdf0c1e0b0e01efeb83740ccb15bb897f0f0..39041690fb5f97956e28f2b14d0ca8ab21ca0a01 100644 --- a/src/services/queryRunner.service.ts +++ b/src/services/queryRunner.service.ts @@ -297,7 +297,7 @@ export default class QueryRunner { timeStep: TimeStep, fluidType: FluidType ): Promise<Dataload[] | null> { - const query: QueryDefinition = this.buildListQuery( + const query = this.buildListQuery( timeStep, timePeriod, fluidType, @@ -307,10 +307,7 @@ export default class QueryRunner { if (result?.data) { const filteredResult = this.filterDataList(result, timePeriod, timeStep) - const mappedResult: Dataload[] = this.mapDataList( - filteredResult, - timeStep - ) + const mappedResult = this.mapDataList(filteredResult, timeStep) return mappedResult } return null @@ -321,7 +318,7 @@ export default class QueryRunner { timeStep: TimeStep, fluidType: FluidType ) { - const query: QueryDefinition = this.buildListQuery( + const query = this.buildListQuery( timeStep, timePeriod, fluidType, @@ -336,7 +333,7 @@ export default class QueryRunner { fluidType: FluidType, withDate?: boolean ): Promise<number | Dataload | null> { - const query: QueryDefinition = this.buildMaxQuery( + const query = this.buildMaxQuery( timeStep, maxTimePeriod, fluidType, @@ -348,7 +345,7 @@ export default class QueryRunner { startDate: maxTimePeriod.startDate.plus({ day: -1 }), endDate: maxTimePeriod.startDate.plus({ day: -1 }).endOf('day'), } - const lastDayOfPreviousMonthQuery: QueryDefinition = this.buildMaxQuery( + const lastDayOfPreviousMonthQuery = this.buildMaxQuery( timeStep, lastDayOfPreviousMonth, fluidType, @@ -383,11 +380,7 @@ export default class QueryRunner { fluidType: FluidType, timeStep?: TimeStep ): Promise<DateTime | null> { - const query: QueryDefinition = this.buildFirstDateQuery( - fluidType, - 1, - timeStep - ) + const query = this.buildFirstDateQuery(fluidType, 1, timeStep) const result = await this.fetchData(query) if ( result?.data[0]?.year && @@ -411,11 +404,7 @@ export default class QueryRunner { fluidType: FluidType, timeStep?: TimeStep ): Promise<DateTime | null> { - const query: QueryDefinition = this.buildLastDateQuery( - fluidType, - 1, - timeStep - ) + const query = this.buildLastDateQuery(fluidType, 1, timeStep) const result = await this.fetchData(query) if ( result?.data[0]?.year && diff --git a/src/services/quiz.service.ts b/src/services/quiz.service.ts index 26271500527efae3b6cb4a890b3983a3673a7db7..4e4c0ea895670fd0c1c07dcd2eabc9279603d1dc 100644 --- a/src/services/quiz.service.ts +++ b/src/services/quiz.service.ts @@ -265,7 +265,7 @@ export default class QuizService { let answers: Answer[] const explanation = 'Vous pouvez vérifier cette information sur l’écran Conso.' - const finalInterval: TimePeriod = this.getTimePeriodFromInterval( + const finalInterval = this.getTimePeriodFromInterval( customQuestionEntity.interval, customQuestionEntity.period.weekday ? {} : customQuestionEntity.period ) diff --git a/src/services/timePeriod.service.ts b/src/services/timePeriod.service.ts index 46804b2e55b687df5c0352d75c20e87dc7655979..617b9b3e3b709e42295a9c5850e339560ff85e6d 100644 --- a/src/services/timePeriod.service.ts +++ b/src/services/timePeriod.service.ts @@ -27,11 +27,11 @@ export default class TimePeriodService { timeStep ).endOf('day') - const timePeriod: TimePeriod = this.getLastCompletePeriod( + const timePeriod = this.getLastCompletePeriod( lastDayOfCompletePeriod, timeStep ) - const comparisonTimePeriod: TimePeriod = this.getComparisonTimePeriod( + const comparisonTimePeriod = this.getComparisonTimePeriod( timePeriod, timeStep )