fix: advanced analytics recorder

Author: samparsky

sentry/src/analytics_recorder.rs

@@ -3,7 +3,7 @@ use crate::Session;
 use primitives::sentry::Event;
 use primitives::sentry::{ChannelReport, PublisherReport};
 use primitives::{BigNum, Channel};
-use redis;
+use redis::pipe;
 use redis::aio::MultiplexedConnection;
 use slog::{error, Logger};
 
@@ -32,7 +32,7 @@ pub async fn record(
     events: Vec<Event>,
     logger: Logger,
 ) {
-    let mut db = redis::pipe();
+    let mut db = pipe();
 
     events
         .iter()
@@ -121,12 +121,10 @@ pub async fn record(
                     .ignore();
                 }
 
-                let hostname = match (referrer, &session.referrer_header) {
-                    (Some(referrer), _) | (_, Some(referrer)) => {
-                        referrer.split('/').nth(2).map(ToString::to_string)
-                    }
-                    _ => None,
-                };
+                let hostname = (referrer.as_ref())
+                                .or_else(|| session.referrer_header.as_ref())
+                                .map(|rf| rf.split('/').nth(2).map(ToString::to_string))
+                                .flatten();
 
                 if let Some(hostname) = &hostname {
                     db.zincr(

sentry/src/db/analytics.rs

@@ -40,15 +40,23 @@ pub async fn advertiser_channel_ids(
     .await
 }
 
+fn metric_to_column(metric: &str) -> String {
+    match metric {
+        "eventCounts" => "count".to_string(),
+        "eventPayouts" => "payout".to_string(),
+        _ => "count".to_string(),
+    }
+}
+
 pub async fn get_analytics(
-    mut query: AnalyticsQuery,
+    query: AnalyticsQuery,
     pool: &DbPool,
     analytics_type: AnalyticsType,
     segment_by_channel: bool,
     channel_id: Option<&ChannelId>,
 ) -> Result<Vec<AnalyticsData>, RunError<bb8_postgres::tokio_postgres::Error>> {
     // converts metric to column
-    query.metric_to_column();
+    let metric = metric_to_column(&query.metric);
 
     let mut params = Vec::<&(dyn ToSql + Sync)>::new();
     let applied_limit = query.limit.min(ANALYTICS_QUERY_LIMIT);
@@ -61,7 +69,7 @@ pub async fn get_analytics(
 
     where_clauses.extend(vec![
         format!("event_type = ${}", params.len()),
-        format!("{} IS NOT NULL", query.metric)
+        format!("{} IS NOT NULL", metric)
     ]);
 
     if let Some(id) = channel_id {
@@ -82,23 +90,23 @@ pub async fn get_analytics(
 
             format!(
                 "SUM({}::numeric)::varchar as value, (extract(epoch from created) - (MOD( CAST (extract(epoch from created) AS NUMERIC), {}))) as time", 
-                query.metric, interval
+                metric, interval
             )
         }
         AnalyticsType::Global => {
             where_clauses.push("earner IS NULL".to_string());
 
             format!(
                 "SUM({}::numeric)::varchar as value, (extract(epoch from created) - (MOD( CAST (extract(epoch from created) AS NUMERIC), {}))) as time", 
-                query.metric, interval
+                metric, interval
             )
         }
         AnalyticsType::Publisher { session } => {
             where_clauses.push(format!("earner = '{}'", session.uid));
 
             format!(
                 "SUM({}::numeric)::varchar as value, (extract(epoch from created) - (MOD( CAST (extract(epoch from created) AS NUMERIC), {}))) as time", 
-                query.metric, interval
+                metric, interval
             )
         }
     };

sentry/src/routes/analytics.rs

@@ -80,7 +80,7 @@ pub async fn process_analytics<A: Adapter>(
     app: &Application<A>,
     analytics_type: AnalyticsType,
 ) -> Result<String, ResponseError> {
-    let mut query = serde_urlencoded::from_str::<AnalyticsQuery>(&req.uri().query().unwrap_or(""))?;
+    let query = serde_urlencoded::from_str::<AnalyticsQuery>(&req.uri().query().unwrap_or(""))?;
     query
         .is_valid()
         .map_err(|e| ResponseError::BadRequest(e.to_string()))?;