From ff32e505aa004db305c1cf3f616d6b01c2fbf4cd Mon Sep 17 00:00:00 2001 From: Haris Razis Date: Wed, 25 Nov 2020 11:35:14 +0200 Subject: [PATCH] =?UTF-8?q?=20=F0=9F=94=A8=20Change=20Filter=20in=20DB=20q?= =?UTF-8?q?uery?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- client/src/class/ClientService.ts | 4 ++-- server/src/class/Database.ts | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/client/src/class/ClientService.ts b/client/src/class/ClientService.ts index 4b8e88e..bdd92ed 100644 --- a/client/src/class/ClientService.ts +++ b/client/src/class/ClientService.ts @@ -13,12 +13,12 @@ export class ClientService { tempService(): void { setInterval(() => { this.clientSocket.sendTemp(this.sensor.takeMeasure, 'temperature'); - }, 1 * 60000); + }, 5 * 60000); } tempTestService(): void { setInterval(() => { this.clientSocket.sendTemp(this.sensor.takeTestMeasure, 'temperature'); - }, 1 * 60000); + }, 5 * 60000); } } diff --git a/server/src/class/Database.ts b/server/src/class/Database.ts index bcd8950..60533e7 100644 --- a/server/src/class/Database.ts +++ b/server/src/class/Database.ts @@ -49,7 +49,8 @@ export class Database { } query(filter: string, timeFrame: string) { - const query = `from(bucket: "${process.env.DB_BUCKET}") |> range(start: -${timeFrame}) |> filter(fn: (r) => r._measurement == "${filter}")`; + const query = `from(bucket: "${process.env.DB_BUCKET}") |> range(start: -${timeFrame}) |> group(columns: ["client"]) + |> filter(fn: (r) => r._measurement == "${filter}")`; const data = this.queryApi .collectRows(query)