From f1a54bc7cc78c28aacec6a2c42fda4cc2fd65e13 Mon Sep 17 00:00:00 2001
From: gcarron <gcarron@grandlyon.com>
Date: Mon, 19 Sep 2022 17:50:34 +0200
Subject: [PATCH] fix(alert): fix water consumption alert
---
src/services/consumption.service.ts | 1 -
src/services/mail.service.ts | 2 --
src/targets/services/consumptionAlert.ts | 5 ++---
3 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/src/services/consumption.service.ts b/src/services/consumption.service.ts
index cdb594de2..18db7623b 100644
--- a/src/services/consumption.service.ts
+++ b/src/services/consumption.service.ts
@@ -20,7 +20,6 @@ import ConsumptionValidatorService from 'services/consumptionValidator.service'
import ConverterService from 'services/converter.service'
import QueryRunnerService from 'services/queryRunner.service'
-// eslint-disable-next-line @typescript-eslint/interface-name-prefix
export interface ISingleFluidChartData {
chartData: Datachart | null
chartFluid: FluidType
diff --git a/src/services/mail.service.ts b/src/services/mail.service.ts
index dd9a3822c..762b53661 100644
--- a/src/services/mail.service.ts
+++ b/src/services/mail.service.ts
@@ -1,5 +1,3 @@
-/* eslint-disable @typescript-eslint/no-explicit-any */
-
import { Client } from 'cozy-client'
export default class MailService {
diff --git a/src/targets/services/consumptionAlert.ts b/src/targets/services/consumptionAlert.ts
index 44c288a08..c254f1246 100644
--- a/src/targets/services/consumptionAlert.ts
+++ b/src/targets/services/consumptionAlert.ts
@@ -59,12 +59,11 @@ const consumptionAlert = async ({ client }: ConsumptionAlertProps) => {
let alertDay: DateTime = DateTime.local().setZone('utc', {
keepLocalTime: true,
})
+
if (fetchedData && fetchedData.length > 0) {
fetchedData.forEach(element => {
- if (element.value) {
+ if (element.value && element.value > lastDayValue) {
lastDayValue = element.value
- }
- if (element.date) {
alertDay = element.date
}
})
--
GitLab