chore: only filter datasets on dashboard

openedx · Mar 18, 2024 · cbf3bf9 · cbf3bf9
1 parent 05ef907
commit cbf3bf9
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 8 deletions.
diff --git a/tutoraspects/templates/openedx-assets/queries/fact_course_grades.sql b/tutoraspects/templates/openedx-assets/queries/fact_course_grades.sql
@@ -3,7 +3,8 @@ with grades as (
     from {{ DBT_PROFILE_TARGET_DATABASE }}.fact_grades
     where grade_type = 'course'
     {% raw %}
-    {% if get_filters('course_name', remove_filter=True) != [] and filter_values('course_name') != [] %}
+    {% if get_filters('course_name', remove_filter=True) == [] %}
+    {% elif filter_values('course_name') != [] %}
     and entity_name in {{ filter_values('course_name', remove_filter=True) | where_in }}
     {% else %}
     and 1=0

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
@@ -134,7 +134,8 @@ SELECT
 FROM summary
 WHERE
     {% raw %}
-    {% if get_filters('course_name', remove_filter=True) != [] and filter_values('course_name') != [] %}
+    {% if get_filters('course_name', remove_filter=True) == [] %}
+    {% elif filter_values('course_name') != [] %}
     course_name in {{ filter_values('course_name') | where_in }}
     {% else %}
     1=0

diff --git a/tutoraspects/templates/openedx-assets/queries/fact_learner_problem_summary.sql b/tutoraspects/templates/openedx-assets/queries/fact_learner_problem_summary.sql
@@ -118,7 +118,8 @@ SELECT
 FROM summary
 where
     {% raw %}
-    {% if get_filters('problem_name_with_location', remove_filter=True) != [] and filter_values('problem_name_with_location') != [] %}
+    {% if get_filters('problem_name_with_location', remove_filter=True) == [] %}
+    {% elif filter_values('problem_name_with_location') != [] %}
     problem_name_with_location in {{ filter_values('problem_name_with_location') | where_in }}
     {% else %}
     1=0

diff --git a/tutoraspects/templates/openedx-assets/queries/fact_problem_grades.sql b/tutoraspects/templates/openedx-assets/queries/fact_problem_grades.sql
@@ -5,7 +5,8 @@ with grades as (
         grade_type = 'problem'
 
         {% raw %}
-        {% if get_filters('problem_name_with_location', remove_filter=True) != [] and filter_values('problem_name_with_location') != [] %}
+        {% if get_filters('problem_name_with_location', remove_filter=True) != [] %}
+        {% elif filter_values('problem_name_with_location') != [] %}
         and entity_name_with_location in {{ filter_values('problem_name_with_location', remove_filter=True) | where_in }}
         {% else %}
         and 1=0

diff --git a/tutoraspects/templates/openedx-assets/queries/fact_problem_responses.sql b/tutoraspects/templates/openedx-assets/queries/fact_problem_responses.sql
@@ -25,7 +25,8 @@ from
     problem_responses
 where
     {% raw %}
-    {% if get_filters('problem_name_with_location', remove_filter=True) != [] and filter_values('problem_name_with_location') != [] %}
+    {% if get_filters('problem_name_with_location', remove_filter=True) == [] %}
+    {% elif filter_values('problem_name_with_location') != [] %}
     problem_name_with_location in {{ filter_values('problem_name_with_location') | where_in }}
     {% else %}
     1=0

diff --git a/tutoraspects/templates/openedx-assets/queries/fact_transcript_usage.sql b/tutoraspects/templates/openedx-assets/queries/fact_transcript_usage.sql
@@ -3,7 +3,8 @@ select *
 from {{ DBT_PROFILE_TARGET_DATABASE }}.fact_transcript_usage
 where
     {% raw %}
-    {% if get_filters('course_name', remove_filter=True) != [] and filter_values('course_name') != [] %}
+    {% if get_filters('course_name', remove_filter=True) == [] %}
+    {% elif filter_values('course_name') != [] %}
     course_name in {{ filter_values('course_name') | where_in }}
     {% else %}
     1=0

diff --git a/tutoraspects/templates/openedx-assets/queries/fact_video_plays.sql b/tutoraspects/templates/openedx-assets/queries/fact_video_plays.sql
@@ -3,7 +3,8 @@ select *
 from {{ DBT_PROFILE_TARGET_DATABASE }}.fact_video_plays
 where
     {% raw %}
-    {% if get_filters('course_name', remove_filter=True) != [] and filter_values('course_name') != [] %}
+    {% if get_filters('course_name', remove_filter=True) == [] %}
+    {% elif filter_values('course_name') != [] %}
     course_name in {{ filter_values('course_name') | where_in }}
     {% else %}
     1=0

diff --git a/tutoraspects/templates/openedx-assets/queries/fact_watched_video_segments.sql b/tutoraspects/templates/openedx-assets/queries/fact_watched_video_segments.sql
@@ -75,7 +75,8 @@ select
 from enriched_segments
 where
     {% raw %}
-    {% if get_filters('video_name_with_location', remove_filter=True) != [] and filter_values('video_name_with_location') != [] %}
+    {% if get_filters('video_name_with_location', remove_filter=True) == [] %}
+    {% elif filter_values('video_name_with_location') != [] %}
     video_name_with_location in {{ filter_values('video_name_with_location') | where_in }}
     {% else %}
     1=0