From b07c12d3978123cc890a7831edf9802b1dbb240d Mon Sep 17 00:00:00 2001 From: gak Date: Sun, 24 Jul 2022 09:16:34 +1000 Subject: [PATCH] wip: calendar_history --- Cargo.toml | 1 + src/energy.rs | 54 ++++++++++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 52 insertions(+), 3 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 31f7001..38899c6 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -23,6 +23,7 @@ sha256 = "1.0" base64 = "0.13" rand = "0.8" regex = "1.5" +strum = { version = "0.24.1", features = ["derive"] } [dev-dependencies] test-log = { version = "0.2", default-features = false, features = ["trace"] } diff --git a/src/energy.rs b/src/energy.rs index 76d6f46..de26798 100644 --- a/src/energy.rs +++ b/src/energy.rs @@ -5,6 +5,7 @@ use crate::{ get, get_arg, get_args, post_arg, post_arg_empty, Api, Empty, ExternalVehicleId, VehicleId, }; use serde::{Deserialize, Serialize}; +use url::Url; #[rustfmt::skip] impl Api { @@ -20,14 +21,45 @@ trait Values { fn format(&self, url: &str) -> String; } +#[derive(Debug, Clone, strum::Display)] +#[strum(serialize_all = "snake_case")] +pub enum HistoryKind { + Power, + Energy, +} + +#[derive(Debug, Clone, strum::Display)] +#[strum(serialize_all = "snake_case")] +pub enum HistoryPeriod { + Day, + Week, + Month, + Year, +} + pub struct CalendarHistoryValues { - period: String, - kind: String, + site_id: EnergySiteId, + period: HistoryPeriod, + kind: HistoryKind, + start_date: Option>, + end_date: Option>, } impl Values for CalendarHistoryValues { fn format(&self, url: &str) -> String { - format!("{}?period={}&kind={}", url, self.period, self.kind) + let url = url.replace("{}", &format!("{}", self.site_id.0)); + let mut url = Url::parse(&url).unwrap(); + let mut pairs = url.query_pairs_mut(); + pairs.append_pair("period", &self.period.to_string()); + pairs.append_pair("kind", &self.kind.to_string()); + if let Some(start_date) = self.start_date { + pairs.append_pair("start_date", &start_date.to_rfc3339()); + } + if let Some(end_date) = self.end_date { + pairs.append_pair("end_date", &end_date.to_rfc3339()); + } + drop(pairs); + url.to_string() } } @@ -240,4 +272,20 @@ mod tests { panic!("Wrong EnergySite"); } } + + #[test] + fn calendar_history_values() { + let v = CalendarHistoryValues { + site_id: EnergySiteId(123), + period: HistoryPeriod::Month, + kind: HistoryKind::Energy, + start_date: None, + end_date: None, + }; + let url = v.format("https://base.com/e/{}/history"); + assert_eq!( + url, + "https://base.com/e/123/history?period=month&kind=energy" + ); + } }