add screen size to the backend

Author: alexbruy

src/app/core/reports.rs

@@ -62,6 +62,7 @@ pub enum Dimension {
     UtmCampaign,
     UtmContent,
     UtmTerm,
+    ScreenResolution,
 }
 
 #[derive(Serialize, Deserialize, JsonSchema, Debug, Clone, Copy, Hash, Eq, PartialEq, PartialOrd, Ord)]
@@ -181,6 +182,7 @@ fn filter_sql(filters: &[DimensionFilter]) -> Result<(String, ParamVec<'_>)> {
                 Dimension::UtmCampaign => format!("utm_campaign {filter_value}"),
                 Dimension::UtmContent => format!("utm_content {filter_value}"),
                 Dimension::UtmTerm => format!("utm_term {filter_value}"),
+                Dimension::ScreenResolution => format!("concat_ws('x', screen_width::text, screen_height::text) {filter_value}"),
             })
         })
         .collect::<Result<Vec<String>>>()?;
@@ -457,6 +459,7 @@ pub fn dimension_report(
         Dimension::UtmCampaign => ("utm_campaign", "utm_campaign"),
         Dimension::UtmContent => ("utm_content", "utm_content"),
         Dimension::UtmTerm => ("utm_term", "utm_term"),
+        Dimension::ScreenResolution => ("concat_ws('x', screen_width::text, screen_height::text)", "screen_width, screen_height"),
     };
 
     params.push(range.start);

src/app/models.rs

@@ -23,6 +23,8 @@ pub struct Event {
     pub utm_campaign: Option<String>,
     pub utm_content: Option<String>,
     pub utm_term: Option<String>,
+    pub screen_width: Option<i32>,
+    pub screen_height: Option<i32>,
 }
 
 #[derive(Debug, Clone)]
@@ -100,6 +102,8 @@ macro_rules! event_params {
             $event.utm_term,
             None::<std::time::Duration>,
             None::<std::time::Duration>,
+            $event.screen_width,
+            $event.screen_height,
         ]
     };
 }

src/utils/seed.rs

@@ -125,6 +125,8 @@ pub fn random_events(
             utm_medium: Some(random_el(UTM_MEDIUMS, 0.6).to_string()),
             utm_source: Some(random_el(UTM_SOURCES, 0.6).to_string()),
             utm_term: Some(random_el(UTM_TERMS, 0.6).to_string()),
+            screen_width: None,
+            screen_height: None,
         })
     })
 }

src/web/routes/dashboard.rs

@@ -227,6 +227,9 @@ async fn project_detailed_handler(
                 let city = city.filter(|city| !city.is_empty());
                 data.push(DimensionTableRow { dimension_value: key, value, display_name: city, icon: country });
             }
+            Dimension::ScreenResolution => {
+                data.push(DimensionTableRow { dimension_value: key, value, display_name: None, icon: None });
+            }
             _ => {
                 data.push(DimensionTableRow { dimension_value: key, value, display_name: None, icon: None });
             }

src/web/routes/event.rs

@@ -30,6 +30,8 @@ struct EventRequest {
     url: String,
     referrer: Option<String>,
     utm: Option<Utm>,
+    screen_width: Option<i32>,
+    screen_height: Option<i32>,
 }
 
 #[derive(serde::Deserialize, JsonSchema)]
@@ -124,6 +126,8 @@ fn process_event(
         utm_medium: event.utm.as_ref().and_then(|u| u.medium.clone()),
         utm_source: event.utm.as_ref().and_then(|u| u.source.clone()),
         utm_term: event.utm.as_ref().and_then(|u| u.term.clone()),
+        screen_width: event.screen_width,
+        screen_height: event.screen_height,
     };
 
     events.send(event)?;