Merge pull request #537 from AmbireTech/sentry-analytics-routes-to-axum

Sentry analytics routes to axum

Author: elpiel

primitives/src/analytics.rs

@@ -103,10 +103,13 @@ pub mod query;
 #[derive(Debug, Serialize, Deserialize, Clone)]
 #[serde(rename_all = "camelCase")]
 pub struct AnalyticsQuery {
+    /// Default: `100`
     #[serde(default = "default_limit")]
     pub limit: u32,
+    /// Default: [`EventType::Impression`]
     #[serde(default = "default_event_type")]
     pub event_type: EventType,
+    // Default: [`Metric::Count`]
     #[serde(default = "default_metric")]
     pub metric: Metric,
     pub segment_by: Option<AllowedKey>,
@@ -125,6 +128,28 @@ pub struct AnalyticsQuery {
     pub chains: Vec<ChainId>,
 }
 
+impl Default for AnalyticsQuery {
+    fn default() -> Self {
+        Self {
+            limit: default_limit(),
+            event_type: default_event_type(),
+            metric: default_metric(),
+            segment_by: None,
+            time: Time::default(),
+            campaign_id: None,
+            ad_unit: None,
+            ad_slot: None,
+            ad_slot_type: None,
+            advertiser: None,
+            publisher: None,
+            hostname: None,
+            country: None,
+            os_name: None,
+            chains: Vec::new(),
+        }
+    }
+}
+
 #[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Display, Hash, Eq)]
 #[serde(untagged, into = "String", from = "String")]
 pub enum OperatingSystem {

primitives/src/analytics/query.rs

@@ -107,6 +107,20 @@ pub struct Time {
     // #[serde(default = "default_timezone_utc")]
     // pub timezone: Tz,//: chrono::TimeZone,
 }
+
+impl Default for Time {
+    fn default() -> Self {
+        let timeframe = Timeframe::Day;
+        let start = DateHour::now() - &timeframe;
+
+        Self {
+            timeframe,
+            start,
+            end: None,
+        }
+    }
+}
+
 mod de {
     use crate::{analytics::Timeframe, sentry::DateHour};
 
@@ -211,6 +225,12 @@ mod test {
             let empty = json!({});
 
             let time = from_value::<Time>(empty).expect("Should use defaults on empty JSON");
+            let default = Time::default();
+            pretty_assertions::assert_eq!(
+                time,
+                default,
+                "Default should generate the same as the default deserialization values!"
+            );
             pretty_assertions::assert_eq!(
                 time,
                 Time {

sentry/src/application.rs

@@ -37,8 +37,8 @@ use crate::{
     routes::{
         get_cfg, get_cfg_axum,
         routers::{
-            analytics_router, campaigns_router, campaigns_router_axum, channels_router,
-            channels_router_axum,
+            analytics_router, analytics_router_axum, campaigns_router, campaigns_router_axum,
+            channels_router, channels_router_axum,
         },
     },
 };
@@ -187,13 +187,10 @@ where
             // "*"
             .allow_origin(tower_http::cors::Any);
 
-        let channels = channels_router_axum::<C>();
-
-        let campaigns = campaigns_router_axum::<C>();
-
         let router = Router::new()
-            .nest("/channel", channels)
-            .nest("/campaign", campaigns);
+            .nest("/channel", channels_router_axum::<C>())
+            .nest("/campaign", campaigns_router_axum::<C>())
+            .nest("/analytics", analytics_router_axum::<C>());
 
         Router::new()
             .nest("/v5", router)