From f36be8a19aaa772334d7345b62fe0fcdc7652122 Mon Sep 17 00:00:00 2001
From: Romulus21 <romain@delanoe.pro>
Date: Mon, 19 Aug 2024 17:05:24 +0200
Subject: [PATCH] add sensors loop

---
 src/main.rs | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/main.rs b/src/main.rs
index 29ef5b5..7b827ad 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -83,18 +83,20 @@ fn aggregate_values(conn: &mut PooledConn, date: NaiveDate) -> Result<(), Box<dy
 
     let start_time = Utc.with_ymd_and_hms(date.year(), date.month(), date.day(), 00, 00, 00).unwrap() - Duration::minutes(15);
     let end_time = start_time + Duration::days(1);
-    let mut current_time = start_time;
 
     let sensors = [
         Sensor::new("maison".to_string(), "bureau".to_string(), "co2".to_string()),
         Sensor::new("maison".to_string(), "bureau".to_string(), "tvoc".to_string())
     ];
 
-    while current_time <= end_time {
-        let start_time_loop = current_time.to_string();
-        let end_time_loop = (current_time + Duration::minutes(29) + Duration::seconds(59)).to_string();
-        for sensor in &sensors {
-            let query = format!("SELECT * FROM donnees WHERE capteur = '{}' AND type = '{}' AND (date_donnee BETWEEN '{}' AND '{}');", sensor.capteur, sensor.type_donnee, start_time_loop, end_time_loop);
+    for sensor in &sensors {
+        let mut current_time = start_time;
+
+        while current_time <= end_time {
+            let start_time_loop = current_time.to_string();
+            let end_time_loop = (current_time + Duration::minutes(29) + Duration::seconds(59)).to_string();
+
+            let query = format!("SELECT * FROM donnees WHERE service = '{}' AND capteur = '{}' AND type = '{}' AND (date_donnee BETWEEN '{}' AND '{}');", sensor.service, sensor.capteur, sensor.type_donnee, start_time_loop, end_time_loop);
             let selected_rows: Vec<Row> = conn.query(query)?;
 
             let donnees: Vec<Donnee> = selected_rows.into_iter().map(Donnee::from).collect();