chore: refactor ranges, add more tests

Signed-off-by: Henry Gressmann <[email protected]>

Author: explodingcamera

.github/workflows/test.yaml

@@ -12,6 +12,25 @@ on:
   workflow_dispatch:
 
 jobs:
+  build-web:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: oven-sh/setup-bun@v2
+        with:
+          bun-version: latest
+      - name: Build web project
+        run: |
+          bun install
+          bun run build
+        working-directory: ./web
+      - name: Run tests
+        run: bun test
+        working-directory: ./web
+      - name: Run typecheck
+        run: bun typecheck
+        working-directory: ./web
+
   test:
     strategy:
       matrix:

Cargo.lock

@@ -6,23 +6,14 @@ use crate::utils::duckdb::{repeat_vars, ParamVec};
 use duckdb::params_from_iter;
 use eyre::{bail, Result};
 use poem_openapi::{Enum, Object};
-use time::OffsetDateTime;
 
 #[derive(Object)]
 pub struct DateRange {
-    pub start: u64,
-    pub end: u64,
+    pub start: time::OffsetDateTime,
+    pub end: time::OffsetDateTime,
 }
 
 impl DateRange {
-    pub fn start(&self) -> OffsetDateTime {
-        OffsetDateTime::from_unix_timestamp((self.start / 1000) as i64).unwrap_or(OffsetDateTime::UNIX_EPOCH)
-    }
-
-    pub fn end(&self) -> OffsetDateTime {
-        OffsetDateTime::from_unix_timestamp((self.end / 1000) as i64).unwrap_or(OffsetDateTime::UNIX_EPOCH)
-    }
-
     pub fn prev(&self) -> DateRange {
         let duration = self.end - self.start;
         DateRange { start: self.start - duration, end: self.start }
@@ -241,14 +232,14 @@ pub fn overall_report(
 
     let entity_vars = repeat_vars(entities.len());
 
-    params.push(range.start());
-    params.push(range.end());
+    params.push(range.start);
+    params.push(range.end);
     params.push(data_points);
     params.push(data_points);
     params.push(event);
     params.extend(entities);
     params.extend_from_params(filters_params);
-    params.push(range.end());
+    params.push(range.end);
 
     let query = format!("--sql
         with
@@ -335,8 +326,8 @@ pub fn overall_stats(
     let metric_unique_visitors = metric_sql(Metric::UniqueVisitors);
     let metric_avg_views_per_visitor = metric_sql(Metric::AvgViewsPerSession);
 
-    params.push(range.start());
-    params.push(range.end());
+    params.push(range.start);
+    params.push(range.end);
     params.push(event);
     params.extend(entities);
     params.extend_from_params(filters_params);
@@ -418,8 +409,8 @@ pub fn dimension_report(
         Dimension::UtmTerm => ("utm_term", "utm_term"),
     };
 
-    params.push(range.start());
-    params.push(range.end());
+    params.push(range.start);
+    params.push(range.end);
     params.push(event);
     params.extend(entities);
     params.extend_from_params(filters_params);

src/app/core/reports.rs

@@ -3,7 +3,7 @@ use crate::{
     web::SessionUser,
 };
 
-pub const MAX_DATAPOINTS: u32 = 100;
+pub const MAX_DATAPOINTS: u32 = 2000;
 
 pub fn is_valid_id(id: &str) -> bool {
     id.chars().all(|c| c.is_alphanumeric() || c == '-' || c == '_' || c == '.' || c == ':')

src/utils/validate.rs

@@ -18,7 +18,7 @@
 		"@radix-ui/react-accordion": "^1.2.1",
 		"@radix-ui/react-dialog": "^1.1.2",
 		"@radix-ui/react-tabs": "^1.1.1",
-		"@tanstack/react-query": "^5.60.5",
+		"@tanstack/react-query": "^5.61.0",
 		"@uidotdev/usehooks": "^2.4.1",
 		"date-fns": "^4.1.0",
 		"fets": "^0.8.4",
@@ -29,16 +29,16 @@
 		"react": "^18.3.1",
 		"react-dom": "^18.3.1",
 		"react-simple-maps": "^3.0.0",
-		"react-tag-autocomplete": "^7.3.0",
+		"react-tag-autocomplete": "^7.4.0",
 		"react-tooltip": "^5.28.0"
 	},
 	"devDependencies": {
 		"@biomejs/biome": "1.9.4",
+		"@types/bun": "^1.1.13",
 		"@types/react": "^18.3.12",
 		"@types/react-dom": "^18.3.1",
 		"@types/react-simple-maps": "^3.0.6",
 		"astro": "^4.16.13",
-		"bun-types": "^1.1.34",
 		"rollup-plugin-license": "^3.5.3",
 		"typescript": "^5.6.3"
 	},