feat: add timezone support

ssaavedra · Aug 26, 2024 · bc12dd0 · bc12dd0
1 parent f689a45
commit bc12dd0
Show file tree

Hide file tree

Showing 5 changed files with 170 additions and 46 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -19,3 +19,4 @@ sqlx = { version = "=0.7.3", features = ["chrono", "macros", "migrate"], default
 chrono = { version = "0.4.38", features = ["serde"] }
 anyhow = "1.0.86"
 poloto = "19.1.2"
+chrono-tz = "0.9.0"
diff --git a/src/form.rs b/src/form.rs
@@ -1,6 +1,9 @@
 //! Custom form fields for Rocket
 
+use std::str::FromStr;
+
 use chrono::NaiveDateTime;
+use chrono::TimeZone;
 
 /// Custom form field to parse a datetime string
 /// in the format of %Y-%m-%dT%H:%M:%S
@@ -27,6 +30,36 @@ impl<'r> rocket::form::FromFormField<'r> for ParseableDateTime {
 impl core::ops::Deref for ParseableDateTime {
     type Target = chrono::DateTime<chrono::Utc>;
 
+    fn deref(&self) -> &Self::Target {
+        &self.0
+    }
+}
+
+#[derive(Default)]
+pub struct Tz(pub chrono_tz::Tz);
+
+impl<'r> rocket::form::FromFormField<'r> for Tz {
+    fn from_value(field: rocket::form::ValueField<'r>) -> rocket::form::Result<'r, Self> {
+        let value = field.value.to_string();
+        let tz = match value.as_str() {
+            // Try to parse as "Europe/Paris, America/New_York, etc"
+            s if s.contains('/') => {
+                chrono_tz::Tz::from_str(s).ok().unwrap_or(chrono_tz::Tz::UTC)
+            },
+            _ => chrono_tz::Tz::UTC,
+        };
+
+        Ok(Tz(tz))
+    }
+
+    fn default() -> Option<Self> {
+        Some(Tz(chrono_tz::Tz::UTC))
+    }
+}
+
+impl core::ops::Deref for Tz {
+    type Target = chrono_tz::Tz;
+
     fn deref(&self) -> &Self::Target {
         &self.0
     }

diff --git a/src/main.rs b/src/main.rs
@@ -37,6 +37,7 @@
 //! - New fairings like the EVChargeFairing could be implmented in the future to
 //!   add add other IoT devices or additional functionality.
 //!
+use chrono::TimeZone;
 use form::ParseableDateTime;
 use governor::Quota;
 use print_table::{get_avg_max_rows_for_token, get_paginated_rows_for_token, NoRowsError};
@@ -147,18 +148,19 @@ async fn post_token(
 }
 
 /// Route GET /log/:token/html will return the data in HTML format
-#[get("/log/<_>/html?<page>&<count>", rank = 1)]
+#[get("/log/<_>/html?<page>&<count>&<tz>", rank = 1)]
 async fn list_table_html(
     page: Option<i32>,
     count: Option<i32>,
     token: &ValidDbToken,
+    tz: form::Tz,
     mut db: Connection<Logs>,
     _ratelimit: RocketGovernor<'_, RateLimitGuard>,
 ) -> (ContentType, String) {
     let page = page.unwrap_or(0);
     let count = count.unwrap_or(10);
 
-    let (rows, has_next) = get_paginated_rows_for_token(&mut db, &token, page, count).await;
+    let (rows, has_next) = get_paginated_rows_for_token(&mut db, &token, page, count, &tz.0).await;
 
     let mut result = String::new();
     result.push_str("<!DOCTYPE html><html><head><meta charset=\"utf-8\"/><title>Consumption info</title></head><body><table>");
@@ -169,6 +171,7 @@ async fn list_table_html(
         result.push_str(&row.to_html());
     }
     result.push_str("\n</table>\n");
+
     if has_next {
         result.push_str(&format!(
             "<a href=\"/log/{}/html?page={}&count={}\">Next</a>",
@@ -177,24 +180,29 @@ async fn list_table_html(
             count
         ));
     }
+
+    // Add svg embedded
+    result.push_str(format!("<hr /><img src=\"/log/{}/svg?tz={}\" alt=\"Energy consumption\" />\n", token.full_token(), tz.0).as_str());
+
     result.push_str("</body></html>\n");
 
     (ContentType::HTML, result)
 }
 
 /// Route GET /log/:token/json will return the data in JSON format
-#[get("/log/<_>/json?<page>&<count>", rank = 1)]
+#[get("/log/<_>/json?<page>&<count>&<tz>", rank = 1)]
 async fn list_table_json(
     page: Option<i32>,
     count: Option<i32>,
     token: &ValidDbToken,
+    tz: form::Tz,
     mut db: Connection<Logs>,
     _ratelimit: RocketGovernor<'_, RateLimitGuard>,
 ) -> rocket::response::content::RawJson<String> {
     let page = page.unwrap_or(0);
     let count = count.unwrap_or(10);
 
-    let (rows, has_next) = get_paginated_rows_for_token(&mut db, &token, page, count).await;
+    let (rows, has_next) = get_paginated_rows_for_token(&mut db, &token, page, count, &tz.0).await;
 
     let next_url = if has_next {
         format!(
@@ -217,12 +225,13 @@ async fn list_table_json(
 
 
 /// Route GET /log/:token/html will return the data in HTML format
-#[get("/log/<_>/svg?<start>&<end>&<interval>", rank = 1)]
+#[get("/log/<_>/svg?<start>&<end>&<interval>&<tz>", rank = 1)]
 async fn list_table_svg(
     start: Option<ParseableDateTime>,
     end: Option<ParseableDateTime>,
     interval: Option<i32>,
     token: &ValidDbToken,
+    tz: form::Tz,
     mut db: Connection<Logs>,
     _ratelimit: RocketGovernor<'_, RateLimitGuard>,
 ) -> (ContentType, String) {
@@ -235,7 +244,7 @@ async fn list_table_svg(
 
     let (avg, max) = get_avg_max_rows_for_token(&mut db, &token, &start, &end, interval).await;
 
-    match print_table::to_svg_plot(avg, max) {
+    match print_table::to_svg_plot(avg, max, &tz.0) {
         Ok(svg) => (ContentType::SVG, svg),
         Err(e) if e.downcast_ref::<NoRowsError>().is_some() => {
             (ContentType::Plain, "No data found for the given request".to_string())