refactor: use course_run instead of run_name

This change upgrades to the latest version of aspects-dbt and uses the
already-parsed `course_run` field instead of the ad-hoc `run_name`
field. This change also includes updates to the filter name and to the
queries that rely on that filter.

Author: SoryRawyer

tutoraspects/plugin.py

@@ -214,7 +214,7 @@
         # For now we are pulling this from github, which should allow maximum
         # flexibility for forking, running branches, specific versions, etc.
         ("DBT_REPOSITORY", "https://github.com/openedx/aspects-dbt"),
-        ("DBT_BRANCH", "v1.3.1"),
+        ("DBT_BRANCH", "v2.0.0"),
         # Path to the dbt project inside the repository
         ("DBT_REPOSITORY_PATH", "aspects-dbt/aspects"),
         # This is a pip compliant list of Python packages to install to run dbt

tutoraspects/templates/openedx-assets/assets/dashboards/Instructor_dashboard.yaml

@@ -74,7 +74,7 @@ metadata:
     description: ''
     filterType: filter_select
     id: NATIVE_FILTER-Vx7HxG8_7
-    name: org
+    name: Org
     requiredFirst: true
     scope:
       excluded: []
@@ -89,7 +89,7 @@ metadata:
     targets:
     - column:
         name: org
-      datasetUuid: 4b274428-d781-41be-b362-ed6917443678
+      datasetUuid: 41278a97-d0ff-4645-9514-d79f80d275df
     type: NATIVE_FILTER
   - cascadeParentIds:
     - NATIVE_FILTER-Vx7HxG8_7
@@ -131,7 +131,7 @@ metadata:
     targets:
     - column:
         name: course_name
-      datasetUuid: 4b274428-d781-41be-b362-ed6917443678
+      datasetUuid: 41278a97-d0ff-4645-9514-d79f80d275df
     type: NATIVE_FILTER
   - cascadeParentIds:
     - NATIVE_FILTER-Vx7HxG8_7
@@ -160,7 +160,7 @@ metadata:
     description: ''
     filterType: filter_select
     id: NATIVE_FILTER-E6-vOpjZv
-    name: Run name
+    name: Course run
     scope:
       excluded: []
       rootPath:
@@ -173,8 +173,8 @@ metadata:
     - TAB-CLiLC4zxo
     targets:
     - column:
-        name: run_name
-      datasetUuid: 4b274428-d781-41be-b362-ed6917443678
+        name: course_run
+      datasetUuid: 41278a97-d0ff-4645-9514-d79f80d275df
     type: NATIVE_FILTER
   - cascadeParentIds:
     - NATIVE_FILTER-Vx7HxG8_7

tutoraspects/templates/openedx-assets/assets/datasets/dim_courses.yaml tutoraspects/templates/openedx-assets/assets/datasets/course_names.yaml

@@ -1,4 +1,4 @@
-_file_name: dim_courses.yaml
+_file_name: course_names.yaml
 cache_timeout: null
 columns:
 - advanced_data_type: null
@@ -14,7 +14,7 @@ columns:
   type: String
   verbose_name: null
 - advanced_data_type: null
-  column_name: run_name
+  column_name: course_key
   description: null
   expression: null
   extra: null
@@ -26,7 +26,7 @@ columns:
   type: String
   verbose_name: null
 - advanced_data_type: null
-  column_name: course_key
+  column_name: course_run
   description: null
   expression: null
   extra: null
@@ -59,17 +59,17 @@ main_dttm_col: null
 metrics:
 - d3format: null
   description: null
-  expression: count(*)
+  expression: COUNT(*)
   extra: null
   metric_name: count
-  metric_type: null
-  verbose_name: null
+  metric_type: count
+  verbose_name: COUNT(*)
   warning_text: null
 offset: 0
 params: null
-schema: null
-sql: "{% include 'openedx-assets/queries/dim_courses.sql' %}"
-table_name: dim_courses
-template_params: {}
-uuid: 4b274428-d781-41be-b362-ed6917443678
+schema: {{ ASPECTS_EVENT_SINK_DATABASE }}
+sql: null
+table_name: course_names
+template_params: null
+uuid: 41278a97-d0ff-4645-9514-d79f80d275df
 version: 1.0.0

tutoraspects/templates/openedx-assets/assets/datasets/dim_course_problems.yaml

@@ -26,7 +26,7 @@ columns:
   type: String
   verbose_name: null
 - advanced_data_type: null
-  column_name: run_name
+  column_name: course_run
   description: null
   expression: null
   extra: null

tutoraspects/templates/openedx-assets/assets/datasets/dim_course_videos.yaml

@@ -26,7 +26,7 @@ columns:
   type: String
   verbose_name: null
 - advanced_data_type: null
-  column_name: run_name
+  column_name: course_run
   description: null
   expression: null
   extra: null

tutoraspects/templates/openedx-assets/assets/datasets/fact_enrollments.yaml

@@ -62,7 +62,7 @@ columns:
   type: String
   verbose_name: null
 - advanced_data_type: null
-  column_name: run_name
+  column_name: course_run
   description: null
   expression: null
   extra: null

tutoraspects/templates/openedx-assets/assets/datasets/fact_enrollments_by_day.yaml

@@ -62,7 +62,7 @@ columns:
   type: String
   verbose_name: null
 - advanced_data_type: null
-  column_name: run_name
+  column_name: course_run
   description: null
   expression: null
   extra: null

tutoraspects/templates/openedx-assets/assets/datasets/fact_learner_problem_summary.yaml

@@ -86,7 +86,7 @@ columns:
   type: String
   verbose_name: null
 - advanced_data_type: null
-  column_name: run_name
+  column_name: course_run
   description: null
   expression: null
   extra: null

tutoraspects/templates/openedx-assets/assets/datasets/fact_problem_responses.yaml

@@ -74,7 +74,7 @@ columns:
   type: String
   verbose_name: null
 - advanced_data_type: null
-  column_name: run_name
+  column_name: course_run
   description: null
   expression: null
   extra: null

tutoraspects/templates/openedx-assets/assets/datasets/fact_transcript_usage.yaml

@@ -50,7 +50,7 @@ columns:
   type: String
   verbose_name: null
 - advanced_data_type: null
-  column_name: run_name
+  column_name: course_run
   description: null
   expression: null
   extra: {}

tutoraspects/templates/openedx-assets/assets/datasets/fact_video_plays.yaml

@@ -50,7 +50,7 @@ columns:
   type: String
   verbose_name: null
 - advanced_data_type: null
-  column_name: run_name
+  column_name: course_run
   description: null
   expression: null
   extra: {}

tutoraspects/templates/openedx-assets/assets/datasets/fact_watched_video_segments.yaml

@@ -62,7 +62,7 @@ columns:
   type: String
   verbose_name: null
 - advanced_data_type: null
-  column_name: run_name
+  column_name: course_run
   description: null
   expression: null
   extra: {}

tutoraspects/templates/openedx-assets/assets/datasets/hints_per_success.yaml

@@ -50,7 +50,7 @@ columns:
   type: String
   verbose_name: null
 - advanced_data_type: null
-  column_name: run_name
+  column_name: course_run
   description: null
   expression: null
   extra: null

tutoraspects/templates/openedx-assets/queries/dim_course_problems.sql

@@ -1,6 +1,4 @@
-with courses as (
-    {% include 'openedx-assets/queries/dim_courses.sql' %}
-), problems as (
+with problems as (
     select
         org,
         course_key,
@@ -21,14 +19,14 @@ with courses as (
 )
 
 select
-    courses.org as org,
-    courses.course_name as course_name,
-    courses.course_key as course_key,
-    courses.run_name as run_name,
+    course_names.org as org,
+    course_names.course_name as course_name,
+    course_names.course_key as course_key,
+    course_names.course_run as course_run,
     problems.problem_id as problem_id,
     problems.problem_name as problem_name
 from
     problems
-    join courses
-        on (problems.org = courses.org
-            and problems.course_key = courses.course_key)
+    join {{ ASPECTS_EVENT_SINK_DATABASE }}.course_names course_names
+        on (problems.org = course_names.org
+            and problems.course_key = course_names.course_key)

tutoraspects/templates/openedx-assets/queries/dim_course_videos.sql

@@ -1,6 +1,4 @@
-with courses as (
-    {% include 'openedx-assets/queries/dim_courses.sql' %}
-), video_blocks as (
+with video_blocks as (
     select
         org,
         course_key,
@@ -21,14 +19,14 @@ with courses as (
 )
 
 select
-    courses.org as org,
-    courses.course_name as course_name,
-    courses.course_key as course_key,
-    courses.run_name as run_name,
+    course_names.org as org,
+    course_names.course_name as course_name,
+    course_names.course_key as course_key,
+    course_names.course_run as course_run,
     video_blocks.video_id as video_id,
     video_blocks.video_name as video_name
 from
-    courses
+    {{ ASPECTS_EVENT_SINK_DATABASE }}.course_names course_names
     join video_blocks
-        on (courses.org = video_blocks.org
-            and courses.course_key = video_blocks.course_key)
+        on (course_names.org = video_blocks.org
+            and course_names.course_key = video_blocks.course_key)

tutoraspects/templates/openedx-assets/queries/dim_courses.sql

@@ -3,11 +3,11 @@ with enrollments_ranked as (
     emission_time,
     org,
     course_name,
-    run_name,
+    course_run,
     actor_id,
     enrollment_mode,
     enrollment_status,
-    rank() over (partition by date(emission_time), org, course_name, run_name, actor_id order by emission_time desc) as event_rank
+    rank() over (partition by date(emission_time), org, course_name, course_run, actor_id order by emission_time desc) as event_rank
   from
     {{ DBT_PROFILE_TARGET_DATABASE }}.fact_enrollments
   {% raw -%}
@@ -20,12 +20,12 @@ with enrollments_ranked as (
   select
     org,
     course_name,
-    run_name,
+    course_run,
     actor_id,
     enrollment_status,
     enrollment_mode,
     emission_time as window_start_at,
-    lagInFrame(emission_time, 1, now() + interval '1' day) over (partition by org, course_name, run_name, actor_id order by emission_time desc) as window_end_at
+    lagInFrame(emission_time, 1, now() + interval '1' day) over (partition by org, course_name, course_run, actor_id order by emission_time desc) as window_end_at
   from
     enrollments_ranked
   where
@@ -34,7 +34,7 @@ with enrollments_ranked as (
     select
         org,
         course_name,
-        run_name,
+        course_run,
         actor_id,
         enrollment_status,
         enrollment_mode,
@@ -54,7 +54,7 @@ select
     )) as enrollment_status_date,
     org,
     course_name,
-    run_name,
+    course_run,
     actor_id,
     enrollment_status,
     enrollment_mode

tutoraspects/templates/openedx-assets/queries/fact_enrollments_by_day.sql

@@ -60,7 +60,7 @@ with starts as (
     select
         segments.org as org,
         courses.course_name as course_name,
-        splitByString('+', courses.course_key)[-1] as run_name,
+        courses.course_run as course_run,
         blocks.block_name as video_name,
         segments.actor_id as actor_id,
         segments.started_at as started_at,
@@ -77,7 +77,7 @@ with starts as (
 select
     org,
     course_name,
-    run_name,
+    course_run,
     video_name,
     actor_id,
     started_at,

tutoraspects/templates/openedx-assets/queries/fact_watched_video_segments.sql

@@ -1,7 +1,7 @@
 select
     org,
     course_name,
-    run_name,
+    course_run,
     problem_name,
     actor_id,
     sum(num_hints_displayed) + sum(num_answers_displayed) as total_hints
@@ -11,6 +11,6 @@ where success = 1
 group by
     org,
     course_name,
-    run_name,
+    course_run,
     problem_name,
     actor_id