Merge pull request #108 from code-dot-org/feature/dataops-657

adding us_intl label and country column to dim_user_course_activity

Author: jordan-springer

dbt/models/marts/users/_users__models.yml

@@ -77,6 +77,12 @@ models:
       tests: 
         - not_null 
 
+    - name: us_intl
+      description: label for us / intl 
+
+    - name: country
+      description: the country associated with the individual user's activity in a given school year
+    
     - name: first_activity_at
       description: timestamp of the student's first activity within the given course and school year- this field is later used to determine when a section/school first started teaching
 

dbt/models/marts/users/dim_user_course_activity.sql

@@ -52,9 +52,7 @@ school_years as (
 ),
 
 users as (
-    select 
-        user_id,
-        user_type
+    select *
     from {{ ref('dim_users') }}
 ),
 
@@ -63,9 +61,12 @@ combined as (
         ul.user_id,
         u.user_type,
         sy.school_year,
+        u.us_intl,
+        u.country,
         cs.course_name_true                     as course_name,  
         min(ul.created_at)                      as first_activity_at,
 		max(ul.created_at)                      as last_activity_at
+
 	from user_levels ul 
     join users u
         on ul.user_id = u.user_id
@@ -74,8 +75,10 @@ combined as (
         and ul.level_id = cs.level_id 
 	join school_years sy 
 		on ul.created_at 
-            between sy.started_at and sy.ended_at
-    {{ dbt_utils.group_by(4) }}
+            between sy.started_at 
+                and sy.ended_at
+                
+    {{ dbt_utils.group_by(6) }}
 )
 
 select *