Fix/add school year week to curriculum students (#306)

Author: coryamanda

dbt/models/marts/metrics/_metrics__models.yml

@@ -160,6 +160,8 @@ models:
           - not_null
       - name: week_number
         description: ISO week number
+      - name: week_number_school_year
+        description: week of the school year (starts July 1, ends June 30)
       - name: n_students
         description: number of unique students meeting at least 1+ day of curriculum (including HS). This is the number to use for reporting total curriculum students externally.
       - name: n_students_adj
@@ -180,6 +182,12 @@ models:
         description: school year to date counts for that school year for ES, adjusted to account for expected 40% anonymous. Code.org goals should use the adjusted number for ES. External reporting should not use this number. 
         data_tests:
           - not_null
+    data_tests:
+    - dbt_utils.unique_combination_of_columns:
+        combination_of_columns:
+          - country
+          - qualifying_date
+
     config:
       tags: ['released','reporting']
 

dbt/models/marts/metrics/fct_daily_curriculum_student_users.sql

@@ -7,6 +7,7 @@ This is a daily cut so that the stakeholders can see YOY changes below the schoo
 Edit log: 
 
 2025-03-17 CK - edited to make global + replaced dssla with duca as a source of all_students data (for speed)
+2025-04-17 CK - edited to add school year week
 
 */
 
@@ -60,6 +61,11 @@ with curriculum_counts as (
     group by 1,2
 )
 
+, school_weeks as (
+    select * 
+    from {{ ref('int_school_weeks') }}
+)
+
 , date_spine as (
     {{ dbt_utils.date_spine(
     datepart="day",
@@ -142,9 +148,10 @@ with curriculum_counts as (
 
 , final as (
     select 
-        school_year
+        calculations.school_year
         , qualifying_date
         , date_part(week, qualifying_date)::int week_number
+        , sw.school_year_week as week_number_school_year
         , decode (date_part(dayofweek, qualifying_date),
                      0, 'sun',
                      1, 'mon',
@@ -162,6 +169,10 @@ with curriculum_counts as (
         , coalesce(n_students_es, 0) as n_students_es
         , coalesce(round(n_students_es * 1.4)::int,0) as n_students_es_adj
     from calculations
+    left join school_weeks  as sw
+        on calculations.qualifying_date 
+            between sw.started_at 
+            and sw.ended_at
 )
 
 select *