Use Sunday as the start of the week on report

hypothesis · Dec 10, 2024 · 7bf014e · 7bf014e
1 parent a4865c4
commit 7bf014e
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/h/data_tasks/report/create_from_scratch/01_functions/01_date_functions.sql b/h/data_tasks/report/create_from_scratch/01_functions/01_date_functions.sql
@@ -18,6 +18,9 @@ AS $$
                 ELSE INTERVAL '6 months'
             END
         ))::DATE
+        WHEN resolution = 'week' THEN 
+             -- -1 day to start weeks on Sunday
+             (DATE_TRUNC('week', date) - '1 day'::interval)::date
         ELSE DATE_TRUNC(resolution, date)::date
     END
 $$

diff --git a/h/data_tasks/report/create_from_scratch/04_annotation_counts/01_create_view.sql b/h/data_tasks/report/create_from_scratch/04_annotation_counts/01_create_view.sql
@@ -47,7 +47,8 @@ CREATE MATERIALIZED VIEW report.annotation_counts AS (
         group_id,
         user_id,
         -- Cast to a date as it's 4 bytes instead of 8
-        DATE_TRUNC('week', created)::DATE AS created_week,
+        -- -1 day to start weeks on Sunday
+        (DATE_TRUNC('week', created) - '1 day'::interval)::date AS created_week,
         CASE
             WHEN ARRAY_LENGTH(parent_uuids, 1) IS NOT NULL
                 THEN 'reply'::report.annotation_sub_type

diff --git a/h/data_tasks/report/create_from_scratch/05_authority_activity/01_create_view.sql b/h/data_tasks/report/create_from_scratch/05_authority_activity/01_create_view.sql
@@ -49,7 +49,8 @@ CREATE MATERIALIZED VIEW report.authority_activity AS (
             SELECT
                 users.id AS user_id,
                 authorities.id AS authority_id,
-                DATE_TRUNC('week', users.registered_date)::DATE AS registered_week
+                -- -1 day to start weeks on Sunday
+                (DATE_TRUNC('week', users.registered_date) - '1 day'::interval)::date AS registered_date,
             FROM "user" AS users
             JOIN report.authorities ON
                 authorities.authority = users.authority