fix: add segment by channel

Author: samparsky

primitives/src/analytics.rs

@@ -25,6 +25,7 @@ pub mod postgres {
 }
 
 #[derive(Debug, Deserialize)]
+#[serde(rename_all = "camelCase")]
 pub struct AnalyticsQuery {
     #[serde(default = "default_limit")]
     pub limit: u32,
@@ -34,6 +35,7 @@ pub struct AnalyticsQuery {
     pub metric: String,
     #[serde(default = "default_timeframe")]
     pub timeframe: String,
+    pub segment_by_channel: Option<String>
 }
 
 impl AnalyticsQuery {

sentry/src/db/analytics.rs

@@ -48,6 +48,7 @@ pub async fn get_analytics(
     query: AnalyticsQuery,
     pool: &DbPool,
     analytics_type: AnalyticsType,
+    segment_by_channel: bool,
 ) -> Result<Vec<AnalyticsResponse>, RunError<bb8_postgres::tokio_postgres::Error>> {
     let applied_limit = query.limit.min(ANALYTICS_QUERY_LIMIT);
     let (interval, period) = get_time_frame(&query.timeframe);
@@ -103,11 +104,18 @@ pub async fn get_analytics(
         }
     };
 
+    let group = if segment_by_channel {
+        "time, channelId"
+    } else {
+        "time"
+    };
+
     let sql_query = format!(
-        "{} WHERE {} GROUP BY time LIMIT {}",
+        "{} WHERE {} GROUP BY {} LIMIT {}",
         select_query,
         where_clauses.join(" AND "),
-        applied_limit
+        group,
+        applied_limit,
     );
 
     // execute query

sentry/src/routes/analytics.rs

@@ -93,7 +93,9 @@ pub async fn process_analytics<A: Adapter>(
         .is_valid()
         .map_err(|e| ResponseError::BadRequest(e.to_string()))?;
 
-    let result = get_analytics(query, &app.pool, analytics_type).await?;
+    let segment_channel = query.segment_by_channel.clone().map(|_| true).unwrap_or_else(|| false);
+
+    let result = get_analytics(query, &app.pool, analytics_type, segment_channel).await?;
 
     serde_json::to_string(&result)
         .map_err(|_| ResponseError::BadRequest("error occurred; try again later".to_string()))