add: analytics advertiser route id param

Author: samparsky

sentry/src/db/analytics.rs

@@ -1,13 +1,12 @@
 use crate::db::DbPool;
-use crate::RouteParams;
 use crate::Session;
 use bb8::RunError;
 use chrono::Utc;
 use primitives::analytics::{AnalyticsQuery, AnalyticsResponse};
 
 pub async fn get_analytics(
     query: AnalyticsQuery,
-    route_params: Option<&RouteParams>,
+    channels: Option<String>,
     sess: Option<&Session>,
     pool: &DbPool,
     is_advertiser: bool,
@@ -20,17 +19,15 @@ pub async fn get_analytics(
     let mut where_clauses = vec![format!("created > to_timestamp({})", time_limit)];
 
     if is_advertiser {
-        match route_params {
-            Some(params) => where_clauses.push(format!("channel_id IN ({})", params.index(0))),
+        match channels {
+            Some(id) => where_clauses.push(format!("channel_id IN ({})", id)),
             None => where_clauses.push(format!(
                 "channel_id IN (SELECT id FROM channels WHERE creator = {})",
                 sess.unwrap().uid.to_string()
             )),
         };
-    } else if let Some(params) = route_params {
-        if let Some(id) = params.get(0) {
-            where_clauses.push(format!("channel_id = {}", id));
-        };
+    } else if let Some(id) = channels {
+        where_clauses.push(format!("channel_id = {}", id));
     }
 
     let select_query = match (skip_publisher_filter, sess) {

sentry/src/lib.rs

@@ -47,6 +47,7 @@ lazy_static! {
     static ref CHANNEL_VALIDATOR_MESSAGES: Regex = Regex::new(r"^/channel/0x([a-zA-Z0-9]{64})/validator-messages(/.*)?$").expect("The regex should be valid");
     // @TODO define other regex routes
     static ref ANALYTICS_BY_CHANNEL_ID: Regex = Regex::new(r"^/analytics/0x([a-zA-Z0-9]{64})/?$").expect("The regex should be valid");
+    static ref ADVERTISER_ANALYTICS_BY_CHANNEL_ID: Regex = Regex::new(r"^/analytics/for-advertiser/0x([a-zA-Z0-9]{64})/?$").expect("The regex should be valid");
     static ref PUBLISHER_ANALYTICS_BY_CHANNEL_ID: Regex = Regex::new(r"^/analytics/for-publisher/0x([a-zA-Z0-9]{64})/?$").expect("The regex should be valid");
 
 }
@@ -134,6 +135,7 @@ impl<A: Adapter + 'static> Application<A> {
 
             ("/analytics", &Method::GET) => analytics(req, &self).await,
             ("/analytics/for-advertiser", &Method::GET) => {
+                // @TODO get advertiser channels
                 let req = match chain(req, &self, vec![auth_required_middleware]).await {
                     Ok(req) => req,
                     Err(error) => {
@@ -191,6 +193,14 @@ async fn analytics_router<A: Adapter>(
                 let req = chain(req, app, vec![auth_required_middleware]).await?;
 
                 publisher_analytics(req, app).await
+            } else if let Some(caps) = ADVERTISER_ANALYTICS_BY_CHANNEL_ID.captures(route) {
+                let param = RouteParams(vec![caps
+                    .get(1)
+                    .map_or("".to_string(), |m| m.as_str().to_string())]);
+                req.extensions_mut().insert(param);
+
+                let req = chain(req, app, vec![auth_required_middleware]).await?;
+                advertiser_analytics(req, app).await
             } else {
                 Err(ResponseError::NotFound)
             }

sentry/src/routes/analytics.rs

@@ -32,6 +32,7 @@ pub async fn analytics<A: Adapter>(
     {
         Ok(response) => Ok(success_response(response)),
         _ => {
+            // checks if /:id route param is present cache
             let cache_timeframe = match req.extensions().get::<RouteParams>() {
                 Some(_) => 600,
                 None => 300,
@@ -64,11 +65,14 @@ pub async fn process_analytics<A: Adapter>(
         .map_err(|e| ResponseError::BadRequest(e.to_string()))?;
 
     let sess = req.extensions().get::<Session>();
-    let params = req.extensions().get::<RouteParams>();
+    let channels = match req.extensions().get::<RouteParams>() {
+        Some(param) => param.get(0),
+        None => None,
+    };
 
     let result = get_analytics(
         query,
-        params,
+        channels,
         sess,
         &app.pool,
         is_advertiser,