feat: update views to use functions with interval, combing rolling and aggregate tables

Author: omardoescode

backend/migrations/0003_views.sql

@@ -1,3 +1,4 @@
+drop function if exists jsonb_sum_aggregate(rows jsonb[]);
 create or replace function jsonb_sum_aggregate(rows jsonb[])
 returns jsonb language plpgsql immutable as $$
 declare
@@ -22,12 +23,16 @@ begin
 end;
 $$;
 
+drop function if exists user_analytics_aggregate_period(user_id integer,
+    p_start timestamptz,
+    p_interval interval);
+
 create or replace function user_analytics_aggregate_period(
+    user_id integer,
     p_start timestamptz,
     p_interval interval
 )
 returns table (
-    user_id int,
     window_start timestamptz,
     window_end timestamptz,
     lang_durations jsonb,
@@ -36,28 +41,61 @@ returns table (
     project_durations jsonb,
     activity_durations jsonb
 ) language sql as $$
+    with combined as (
+        -- aggregate_daily rows
+        select
+            d.window_start,
+            d.window_end,
+            d.lang_durations,
+            d.machine_durations,
+            d.editor_durations,
+            d.project_durations,
+            d.activity_durations
+        from user_stats_aggregate_daily d
+        where d.user_id = user_id
+          and d.window_start >= p_start
+          and d.window_start < p_start + p_interval
+
+        union all
+
+        -- rolling_day row
+        select
+            now() as window_start,   -- placeholder timestamp
+            now() as window_end,     -- placeholder timestamp
+            r.lang_durations,
+            r.machine_durations,
+            r.editor_durations,
+            r.project_durations,
+            r.activity_durations
+        from user_stats_rolling_day r
+        where r.user_id = user_id
+          and p_start + p_interval > now() - interval '24 hours'
+    )
     select
-        d.user_id,
-        min(d.window_start) as window_start,
-        max(d.window_end) as window_end,
-        jsonb_sum_aggregate(array_agg(d.lang_durations)) as lang_durations,
-        jsonb_sum_aggregate(array_agg(d.machine_durations)) as machine_durations,
-        jsonb_sum_aggregate(array_agg(d.editor_durations)) as editor_durations,
-        jsonb_sum_aggregate(array_agg(d.project_durations)) as project_durations,
-        jsonb_sum_aggregate(array_agg(d.activity_durations)) as activity_durations
-    from user_stats_aggregate_daily d
-    where d.window_start >= p_start
-      and d.window_start < p_start + p_interval
-    group by d.user_id;
+        min(window_start) as window_start,
+        max(window_end) as window_end,
+        jsonb_sum_aggregate(array_agg(lang_durations)) as lang_durations,
+        jsonb_sum_aggregate(array_agg(machine_durations)) as machine_durations,
+        jsonb_sum_aggregate(array_agg(editor_durations)) as editor_durations,
+        jsonb_sum_aggregate(array_agg(project_durations)) as project_durations,
+        jsonb_sum_aggregate(array_agg(activity_durations)) as activity_durations
+    from combined
 $$;
 
+drop function if exists user_project_analytics_aggregate_period(
+    user_id integer,
+    project_path varchar,
+    p_start timestamptz,
+    p_interval interval
+);
+
 create or replace function user_project_analytics_aggregate_period(
+    user_id integer,
+    project_path varchar,
     p_start timestamptz,
     p_interval interval
 )
 returns table (
-    user_id int,
-    project_path varchar,
     window_start timestamptz,
     window_end timestamptz,
     lang_durations jsonb,
@@ -66,18 +104,45 @@ returns table (
     activity_durations jsonb,
     files_durations jsonb
 ) language sql as $$
+    with combined as (
+        -- aggregate_daily rows
+        select
+            d.window_start,
+            d.window_end,
+            d.lang_durations,
+            d.machine_durations,
+            d.editor_durations,
+            d.activity_durations,
+            d.files_durations
+        from user_project_stats_aggregate_daily d
+        where d.user_id = user_id
+          and d.project_path = project_path
+          and d.window_start >= p_start
+          and d.window_start < p_start + p_interval
+
+        union all
+
+        -- rolling_day row
+        select
+            now() as window_start,   -- placeholder timestamp
+            now() as window_end,     -- placeholder timestamp
+            r.lang_durations,
+            r.machine_durations,
+            r.editor_durations,
+            r.activity_durations,
+            r.files_durations
+        from user_project_stats_rolling_day r
+        where r.user_id = user_id
+          and r.project_path = project_path
+          and p_start + p_interval > now() - interval '24 hours'
+    )
     select
-        d.user_id,
-        d.project_path,
-        min(d.window_start) as window_start,
-        max(d.window_end) as window_end,
-        jsonb_sum_aggregate(array_agg(d.lang_durations)) as lang_durations,
-        jsonb_sum_aggregate(array_agg(d.machine_durations)) as machine_durations,
-        jsonb_sum_aggregate(array_agg(d.editor_durations)) as editor_durations,
-        jsonb_sum_aggregate(array_agg(d.activity_durations)) as activity_durations,
-        jsonb_sum_aggregate(array_agg(d.files_durations)) as files_durations
-    from user_project_stats_aggregate_daily d
-    where d.window_start >= p_start
-      and d.window_start < p_start + p_interval
-    group by d.user_id, d.project_path;
+        min(window_start) as window_start,
+        max(window_end) as window_end,
+        jsonb_sum_aggregate(array_agg(lang_durations)) as lang_durations,
+        jsonb_sum_aggregate(array_agg(machine_durations)) as machine_durations,
+        jsonb_sum_aggregate(array_agg(editor_durations)) as editor_durations,
+        jsonb_sum_aggregate(array_agg(activity_durations)) as activity_durations,
+        jsonb_sum_aggregate(array_agg(files_durations)) as files_durations
+    from combined
 $$;