Merge pull request #974 from saraburns1/testing_fixes

fix: fix enrollment count, video count, tag filter

tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/charts/Video_Engagement_5b00f7.yaml

@@ -18,8 +18,8 @@ params:
   groupby:
   - course_name
   - org
-  - video_count
   metrics:
+  - num_videos
   - watched_percent
   - rewatched_percent
   - avg_video_length
@@ -55,8 +55,8 @@ query_context:
     groupby:
     - course_name
     - org
-    - video_count
     metrics:
+    - num_videos
     - watched_percent
     - rewatched_percent
     - avg_video_length
@@ -78,20 +78,20 @@ query_context:
     columns:
     - course_name
     - org
-    - video_count
     custom_form_data: {}
     custom_params: {}
     extras:
       having: ''
       where: ''
     filters: []
     metrics:
+    - num_videos
     - watched_percent
     - rewatched_percent
     - avg_video_length
     order_desc: true
     orderby:
-    - - watched_percent
+    - - num_videos
       - false
     post_processing: []
     row_limit: 50000

tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/charts/Video_Engagement_6b7610.yaml

@@ -18,8 +18,8 @@ params:
   groupby:
   - course_run
   - course_name
-  - video_count
   metrics:
+  - num_videos
   - watched_percent
   - rewatched_percent
   - avg_video_length
@@ -55,8 +55,8 @@ query_context:
     groupby:
     - course_run
     - course_name
-    - video_count
     metrics:
+    - num_videos
     - watched_percent
     - rewatched_percent
     - avg_video_length
@@ -78,20 +78,20 @@ query_context:
     columns:
     - course_run
     - course_name
-    - video_count
     custom_form_data: {}
     custom_params: {}
     extras:
       having: ''
       where: ''
     filters: []
     metrics:
+    - num_videos
     - watched_percent
     - rewatched_percent
     - avg_video_length
     order_desc: true
     orderby:
-    - - watched_percent
+    - - num_videos
       - false
     post_processing: []
     row_limit: 50000

tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/datasets/course_information.yaml

@@ -104,7 +104,7 @@ metrics:
 - currency: null
   d3format: null
   description: null
-  expression: uniq((active_learner,course_run))
+  expression: uniq(active_learner,course_run)
   extra:
     warning_markdown: ''
   metric_name: active_count
@@ -125,7 +125,7 @@ metrics:
 - currency: null
   d3format: null
   description: null
-  expression: uniq((actor_id,course_run))
+  expression: uniq(actor_id,course_run)
   extra:
     warning_markdown: ''
   metric_name: enrollees

tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/datasets/tag_filter.yaml

@@ -38,6 +38,18 @@ columns:
   python_date_format: null
   type: String
   verbose_name: Tag
+- advanced_data_type: null
+  column_name: course_key
+  description: null
+  expression: null
+  extra: {}
+  filterable: true
+  groupby: true
+  is_active: true
+  is_dttm: false
+  python_date_format: null
+  type: String
+  verbose_name: Course Key
 database_uuid: 21174b6c-4d40-4958-8161-d6c3cf5e77b6
 default_endpoint: null
 description: null
@@ -50,7 +62,8 @@ metrics:
   d3format: null
   description: null
   expression: COUNT(*)
-  extra: {}
+  extra:
+    warning_markdown: ''
   metric_name: count
   metric_type: count
   verbose_name: COUNT(*)
@@ -59,7 +72,8 @@ metrics:
   d3format: null
   description: null
   expression: min(rownum)
-  extra: {}
+  extra:
+    warning_markdown: ''
   metric_name: order
   metric_type: null
   verbose_name: order

tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/datasets/watched_video_duration.yaml

@@ -2,19 +2,6 @@ _file_name: watched_video_duration.yaml
 always_filter_main_dttm: false
 cache_timeout: null
 columns:
-- advanced_data_type: null
-  column_name: video_count
-  description: null
-  expression: null
-  extra:
-    warning_markdown: null
-  filterable: true
-  groupby: true
-  is_active: true
-  is_dttm: false
-  python_date_format: null
-  type: UInt64
-  verbose_name: Number of Videos
 - advanced_data_type: null
   column_name: course_name
   description: null
@@ -119,6 +106,18 @@ columns:
   python_date_format: null
   type: String
   verbose_name: Org
+- advanced_data_type: null
+  column_name: video_count
+  description: null
+  expression: null
+  extra: {}
+  filterable: true
+  groupby: true
+  is_active: true
+  is_dttm: false
+  python_date_format: null
+  type: Int32
+  verbose_name: Video Count
 database_uuid: 21174b6c-4d40-4958-8161-d6c3cf5e77b6
 default_endpoint: null
 description: null

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

@@ -1,12 +1,15 @@
-with
-    data as (
+select id, rownum, tag, course_key
+from
+    (
         select
             id,
-            case when parent = 0 then id else cast(parent as int) end as sort_order_1,
-            case when parent = 0 then 0 else 1 end as sort_order_2,
+            multiIf(parent = 0, id, CAST(parent, 'int')) as sort_order_1,
+            multiIf(parent = 0, 0, 1) as sort_order_2,
             concat(repeat('- ', countMatches(lineage, ',')), value) as tag,
-            row_number() over (order by sort_order_1, sort_order_2, value) as rownum
+            row_number() over (
+                order by sort_order_1 ASC, sort_order_2 ASC, value ASC
+            ) as rownum
         from {{ ASPECTS_EVENT_SINK_DATABASE }}.most_recent_tags
-    )
-select id, rownum, tag
-from data
+    ) as t
+left join
+    {{ DBT_PROFILE_TARGET_DATABASE }}.most_recent_course_tags ct on ct.tag_id = t.id