Refactor delivery of accounting summary

crates/query/src/api4.rs

@@ -3,17 +3,27 @@ pub mod events;
 
 use err::Error;
 use netpod::get_url_query_pairs;
+use netpod::range::evrange::SeriesRange;
 use netpod::AppendToUrl;
 use netpod::FromUrl;
 use netpod::HasBackend;
 use netpod::HasTimeout;
 use serde::Deserialize;
 use serde::Serialize;
+use std::collections::BTreeMap;
 use std::time::Duration;
+use url::Url;
 
 #[derive(Debug, Clone, Serialize, Deserialize)]
 pub struct AccountingIngestedBytesQuery {
     backend: String,
+    range: SeriesRange,
+}
+
+impl AccountingIngestedBytesQuery {
+    pub fn range(&self) -> &SeriesRange {
+        &self.range
+    }
 }
 
 impl HasBackend for AccountingIngestedBytesQuery {
@@ -29,25 +39,29 @@ impl HasTimeout for AccountingIngestedBytesQuery {
 }
 
 impl FromUrl for AccountingIngestedBytesQuery {
-    fn from_url(url: &url::Url) -> Result<Self, err::Error> {
+    fn from_url(url: &Url) -> Result<Self, err::Error> {
         let pairs = get_url_query_pairs(url);
         Self::from_pairs(&pairs)
     }
 
-    fn from_pairs(pairs: &std::collections::BTreeMap<String, String>) -> Result<Self, Error> {
+    fn from_pairs(pairs: &BTreeMap<String, String>) -> Result<Self, Error> {
         let ret = Self {
             backend: pairs
                 .get("backend")
                 .ok_or_else(|| Error::with_msg_no_trace("missing backend"))?
                 .to_string(),
+            range: SeriesRange::from_pairs(pairs)?,
         };
         Ok(ret)
     }
 }
 
 impl AppendToUrl for AccountingIngestedBytesQuery {
-    fn append_to_url(&self, url: &mut url::Url) {
-        let mut g = url.query_pairs_mut();
-        g.append_pair("backend", &self.backend);
+    fn append_to_url(&self, url: &mut Url) {
+        {
+            let mut g = url.query_pairs_mut();
+            g.append_pair("backend", &self.backend);
+        }
+        self.range.append_to_url(url);
     }
 }

crates/query/src/api4/binned.rs

@@ -171,16 +171,9 @@ impl FromUrl for BinnedQuery {
     }
 
     fn from_pairs(pairs: &BTreeMap<String, String>) -> Result<Self, Error> {
-        let range = if let Ok(x) = TimeRangeQuery::from_pairs(pairs) {
-            SeriesRange::TimeRange(x.into())
-        } else if let Ok(x) = PulseRangeQuery::from_pairs(pairs) {
-            SeriesRange::PulseRange(x.into())
-        } else {
-            return Err(Error::with_msg_no_trace("no series range in url"));
-        };
         let ret = Self {
             channel: SfDbChannel::from_pairs(&pairs)?,
-            range,
+            range: SeriesRange::from_pairs(pairs)?,
             bin_count: pairs
                 .get("binCount")
                 .ok_or_else(|| Error::with_msg_no_trace("missing binCount"))?
@@ -218,11 +211,8 @@ impl FromUrl for BinnedQuery {
 
 impl AppendToUrl for BinnedQuery {
     fn append_to_url(&self, url: &mut Url) {
-        match &self.range {
-            SeriesRange::TimeRange(k) => TimeRangeQuery::from(k).append_to_url(url),
-            SeriesRange::PulseRange(k) => PulseRangeQuery::from(k).append_to_url(url),
-        }
         self.channel.append_to_url(url);
+        self.range.append_to_url(url);
         {
             let mut g = url.query_pairs_mut();
             g.append_pair("binCount", &format!("{}", self.bin_count));

crates/query/src/api4/events.rs

@@ -198,7 +198,7 @@ impl FromUrl for PlainEventsQuery {
         } else if let Ok(x) = PulseRangeQuery::from_pairs(pairs) {
             SeriesRange::PulseRange(x.into())
         } else {
-            return Err(Error::with_msg_no_trace("no series range in url"));
+            return Err(Error::with_public_msg_no_trace("no time range in url"));
         };
         let ret = Self {
             channel: SfDbChannel::from_pairs(pairs)?,