Merge pull request #476 from SoryRawyer/rds/use-extended-block-names

refactor: use extended block names in instructor dashboard (FC-0033)
openedx · Oct 18, 2023 · 319decc · 319decc
2 parents 24a0f42 + d2145f0
commit 319decc
Show file tree

Hide file tree

Showing 25 changed files with 162 additions and 30 deletions.
diff --git a/tutoraspects/plugin.py b/tutoraspects/plugin.py
@@ -319,7 +319,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", "v2.5"),
+        ("DBT_BRANCH", "v2.6"),
         # Path to the dbt project inside the repository
         ("DBT_REPOSITORY_PATH", "aspects-dbt"),
         # This is a pip compliant list of Python packages to install to run dbt

diff --git a/tutoraspects/templates/openedx-assets/assets/charts/Responses_Per_Problem.yaml b/tutoraspects/templates/openedx-assets/assets/charts/Responses_Per_Problem.yaml
@@ -18,7 +18,7 @@ params:
   datasource: 2__table
   extra_form_data: {}
   groupby:
-  - problem_name
+  - problem_name_with_location
   metrics:
   - aggregate: COUNT_DISTINCT
     column:

diff --git a/tutoraspects/templates/openedx-assets/assets/charts/Transcripts_Captions_Per_Video.yaml b/tutoraspects/templates/openedx-assets/assets/charts/Transcripts_Captions_Per_Video.yaml
@@ -17,7 +17,7 @@ params:
   extra_form_data: {}
   granularity_sqla: emission_time
   groupby:
-  - video_name
+  - video_name_with_location
   metrics:
   - count
   - aggregate: COUNT_DISTINCT

diff --git a/tutoraspects/templates/openedx-assets/assets/charts/Watches_Per_Video.yaml b/tutoraspects/templates/openedx-assets/assets/charts/Watches_Per_Video.yaml
@@ -17,7 +17,7 @@ params:
   extra_form_data: {}
   granularity_sqla: emission_time
   groupby:
-  - video_name
+  - video_name_with_location
   metrics:
   - count
   - aggregate: COUNT_DISTINCT

diff --git a/tutoraspects/templates/openedx-assets/assets/dashboards/Instructor_Dashboard.yaml b/tutoraspects/templates/openedx-assets/assets/dashboards/Instructor_Dashboard.yaml
@@ -71,18 +71,20 @@ metadata:
   native_filter_configuration:
   - cascadeParentIds: []
     chartsInScope:
+    - 24
     - 25
-    - 30
-    - 40
+    - 32
+    - 34
+    - 37
+    - 45
+    - 46
     - 47
-    - 87
-    - 111
-    - 166
-    - 204
-    - 262
-    - 314
-    - 345
-    - 352
+    - 52
+    - 865
+    - 879
+    - 894
+    - 908
+    - 922
     controlValues:
       enableEmptyFilter: false
     defaultDataMask:
@@ -106,6 +108,7 @@ metadata:
     - TAB-pOd4znTAV
     - TAB-7PGDduCA7
     - TAB-CLiLC4zxo
+    - TAB-eE0OQxuju
     targets:
     - {}
     type: NATIVE_FILTER
@@ -269,7 +272,7 @@ metadata:
     - TAB-pOd4znTAV
     targets:
     - column:
-        name: problem_name
+        name: problem_name_with_location
       datasetUuid: 008e2907-fc6b-45ef-bf85-73a04c5791ff
     type: NATIVE_FILTER
   - cascadeParentIds:
@@ -300,7 +303,7 @@ metadata:
     - TAB-CLiLC4zxo
     targets:
     - column:
-        name: video_name
+        name: video_name_with_location
       datasetUuid: 417b2035-8fa1-4c60-a405-4b1947c3c966
     type: NATIVE_FILTER
   refresh_frequency: 0

diff --git a/tutoraspects/templates/openedx-assets/assets/datasets/dim_course_problems.yaml b/tutoraspects/templates/openedx-assets/assets/datasets/dim_course_problems.yaml
@@ -1,6 +1,18 @@
 _file_name: dim_course_problems.yaml
 cache_timeout: null
 columns:
+- advanced_data_type: null
+  column_name: problem_name_with_location
+  description: null
+  expression: null
+  extra: null
+  filterable: true
+  groupby: true
+  is_active: true
+  is_dttm: false
+  python_date_format: null
+  type: String
+  verbose_name: null
 - advanced_data_type: null
   column_name: problem_name
   description: null

diff --git a/tutoraspects/templates/openedx-assets/assets/datasets/dim_course_videos.yaml b/tutoraspects/templates/openedx-assets/assets/datasets/dim_course_videos.yaml
@@ -1,6 +1,18 @@
 _file_name: dim_course_videos.yaml
 cache_timeout: null
 columns:
+- advanced_data_type: null
+  column_name: video_name_with_location
+  description: null
+  expression: null
+  extra: null
+  filterable: true
+  groupby: true
+  is_active: true
+  is_dttm: false
+  python_date_format: null
+  type: String
+  verbose_name: null
 - advanced_data_type: null
   column_name: course_name
   description: null

diff --git a/...aspects/templates/openedx-assets/assets/datasets/fact_learner_problem_course_summary.yaml b/...aspects/templates/openedx-assets/assets/datasets/fact_learner_problem_course_summary.yaml
@@ -49,6 +49,18 @@ columns:
   python_date_format: null
   type: Bool
   verbose_name: null
+- advanced_data_type: null
+  column_name: problem_name_with_location
+  description: null
+  expression: null
+  extra: null
+  filterable: true
+  groupby: true
+  is_active: true
+  is_dttm: false
+  python_date_format: null
+  type: String
+  verbose_name: null
 - advanced_data_type: null
   column_name: problem_name
   description: null

diff --git a/tutoraspects/templates/openedx-assets/assets/datasets/fact_learner_problem_summary.yaml b/tutoraspects/templates/openedx-assets/assets/datasets/fact_learner_problem_summary.yaml
@@ -49,6 +49,18 @@ columns:
   python_date_format: null
   type: Bool
   verbose_name: null
+- advanced_data_type: null
+  column_name: problem_name_with_location
+  description: null
+  expression: null
+  extra: null
+  filterable: true
+  groupby: true
+  is_active: true
+  is_dttm: false
+  python_date_format: null
+  type: String
+  verbose_name: null
 - advanced_data_type: null
   column_name: problem_name
   description: null

diff --git a/tutoraspects/templates/openedx-assets/assets/datasets/fact_problem_responses.yaml b/tutoraspects/templates/openedx-assets/assets/datasets/fact_problem_responses.yaml
@@ -37,6 +37,18 @@ columns:
   python_date_format: null
   type: DateTime
   verbose_name: null
+- advanced_data_type: null
+  column_name: problem_name_with_location
+  description: null
+  expression: null
+  extra: null
+  filterable: true
+  groupby: true
+  is_active: true
+  is_dttm: false
+  python_date_format: null
+  type: String
+  verbose_name: null
 - advanced_data_type: null
   column_name: problem_name
   description: null

diff --git a/tutoraspects/templates/openedx-assets/assets/datasets/fact_transcript_usage.yaml b/tutoraspects/templates/openedx-assets/assets/datasets/fact_transcript_usage.yaml
@@ -13,6 +13,18 @@ columns:
   python_date_format: null
   type: DateTime
   verbose_name: null
+- advanced_data_type: null
+  column_name: video_name_with_location
+  description: null
+  expression: null
+  extra: {}
+  filterable: true
+  groupby: true
+  is_active: true
+  is_dttm: false
+  python_date_format: null
+  type: String
+  verbose_name: null
 - advanced_data_type: null
   column_name: actor_id
   description: null

diff --git a/tutoraspects/templates/openedx-assets/assets/datasets/fact_video_plays.yaml b/tutoraspects/templates/openedx-assets/assets/datasets/fact_video_plays.yaml
@@ -13,6 +13,18 @@ columns:
   python_date_format: null
   type: DateTime
   verbose_name: null
+- advanced_data_type: null
+  column_name: video_name_with_location
+  description: null
+  expression: null
+  extra: {}
+  filterable: true
+  groupby: true
+  is_active: true
+  is_dttm: false
+  python_date_format: null
+  type: String
+  verbose_name: null
 - advanced_data_type: null
   column_name: actor_id
   description: null

diff --git a/tutoraspects/templates/openedx-assets/assets/datasets/fact_watched_video_segments.yaml b/tutoraspects/templates/openedx-assets/assets/datasets/fact_watched_video_segments.yaml
@@ -25,6 +25,18 @@ columns:
   python_date_format: null
   type: DateTime
   verbose_name: null
+- advanced_data_type: null
+  column_name: video_name_with_location
+  description: null
+  expression: null
+  extra: {}
+  filterable: true
+  groupby: true
+  is_active: true
+  is_dttm: false
+  python_date_format: null
+  type: String
+  verbose_name: null
 - advanced_data_type: null
   column_name: actor_id
   description: null

diff --git a/tutoraspects/templates/openedx-assets/assets/datasets/hints_per_success.yaml b/tutoraspects/templates/openedx-assets/assets/datasets/hints_per_success.yaml
@@ -13,6 +13,18 @@ columns:
   python_date_format: null
   type: UInt64
   verbose_name: null
+- advanced_data_type: null
+  column_name: problem_name_with_location
+  description: null
+  expression: null
+  extra: null
+  filterable: true
+  groupby: true
+  is_active: true
+  is_dttm: false
+  python_date_format: null
+  type: String
+  verbose_name: null
 - advanced_data_type: null
   column_name: problem_name
   description: null

diff --git a/tutoraspects/templates/openedx-assets/queries/dim_course_problems.sql b/tutoraspects/templates/openedx-assets/queries/dim_course_problems.sql
@@ -4,7 +4,8 @@ select
     course_key,
     course_run,
     block_id as problem_id,
-    block_name as problem_name
+    block_name as problem_name,
+    display_name_with_location as problem_name_with_location
 from
     {{ DBT_PROFILE_TARGET_DATABASE }}.dim_course_blocks
 where
@@ -13,7 +14,7 @@ where
     {% if filter_values('org') != [] %}
     and org in {{ filter_values('org') | where_in }}
     {% endif %}
-    {% if filter_values('problem_name') != [] %}
-    and problem_name in {{ filter_values('problem_name') | where_in }}
+    {% if filter_values('problem_name_with_location') != [] %}
+    and problem_name_with_location in {{ filter_values('problem_name_with_location') | where_in }}
     {% endif %}
 {%- endraw %}
diff --git a/tutoraspects/templates/openedx-assets/queries/dim_course_videos.sql b/tutoraspects/templates/openedx-assets/queries/dim_course_videos.sql
@@ -4,7 +4,8 @@ select
     course_key,
     course_run,
     block_id as video_id,
-    block_name as video_name
+    block_name as video_name,
+    display_name_with_location as video_name_with_location
 from
     {{ DBT_PROFILE_TARGET_DATABASE }}.dim_course_blocks
 where
@@ -13,7 +14,7 @@ where
     {% if filter_values('org') != [] %}
     and org in {{ filter_values('org') | where_in }}
     {% endif %}
-    {% if filter_values('video_name') != [] %}
-    and video_name in {{ filter_values('video_name') | where_in }}
+    {% if filter_values('video_name_with_location') != [] %}
+    and video_name_with_location in {{ filter_values('video_name_with_location') | where_in }}
     {% endif %}
 {%- endraw %}
diff --git a/tutoraspects/templates/openedx-assets/queries/fact_learner_problem_course_summary.sql b/tutoraspects/templates/openedx-assets/queries/fact_learner_problem_course_summary.sql
@@ -63,6 +63,7 @@ WITH problem_responses AS (
         course_run,
         problem_id,
         problem_name,
+        problem_name_with_location,
         actor_id,
         responses,
         success,
@@ -76,6 +77,7 @@ WITH problem_responses AS (
         course_name,
         course_run,
         problem_name,
+        problem_name_with_location,
         actor_id,
         success,
         attempts,
@@ -98,6 +100,7 @@ WITH problem_responses AS (
         course_name,
         course_run,
         problem_name,
+        problem_name_with_location,
         actor_id,
         NULL AS success,
         NULL AS attempts,
@@ -122,6 +125,7 @@ SELECT
     course_name,
     course_run,
     problem_name,
+    problem_name_with_location,
     actor_id,
     coalesce(any(success), false) AS success,
     coalesce(any(attempts), 0) AS attempts,
@@ -142,4 +146,5 @@ GROUP BY
     course_name,
     course_run,
     problem_name,
+    problem_name_with_location,
     actor_id
diff --git a/tutoraspects/templates/openedx-assets/queries/fact_learner_problem_summary.sql b/tutoraspects/templates/openedx-assets/queries/fact_learner_problem_summary.sql
@@ -63,6 +63,7 @@ WITH problem_responses AS (
         course_run,
         problem_id,
         problem_name,
+        problem_name_with_location,
         actor_id,
         responses,
         success,
@@ -76,6 +77,7 @@ WITH problem_responses AS (
         course_name,
         course_run,
         problem_name,
+        problem_name_with_location,
         actor_id,
         success,
         attempts,
@@ -89,6 +91,7 @@ WITH problem_responses AS (
         course_name,
         course_run,
         problem_name,
+        problem_name_with_location,
         actor_id,
         NULL AS success,
         NULL AS attempts,
@@ -106,6 +109,7 @@ SELECT
     course_name,
     course_run,
     problem_name,
+    problem_name_with_location,
     actor_id,
     coalesce(any(success), false) AS success,
     coalesce(any(attempts), 0) AS attempts,
@@ -114,8 +118,8 @@ SELECT
 FROM summary
 where
     {% raw %}
-    {% if filter_values('problem_name') != [] %}
-    problem_name in {{ filter_values('problem_name') | where_in }}
+    {% if filter_values('problem_name_with_location') != [] %}
+    problem_name_with_location in {{ filter_values('problem_name_with_location') | where_in }}
     {% else %}
     1=0
     {% endif %}
@@ -126,4 +130,5 @@ GROUP BY
     course_name,
     course_run,
     problem_name,
+    problem_name_with_location,
     actor_id