fix: parse external_id to string instead of actor_id to uuid

openedx · Oct 31, 2024 · bdf4058 · bdf4058
1 parent 6b792d1
commit bdf4058
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/tutoraspects/templates/openedx-assets/queries/fact_enrollment_pii.sql b/tutoraspects/templates/openedx-assets/queries/fact_enrollment_pii.sql
@@ -26,4 +26,5 @@ select
 from enrollments
 inner join
     {{ DBT_PROFILE_TARGET_DATABASE }}.dim_user_pii as users
-    on enrollments.actor_id = users.external_user_id::String
+    on (enrollments.actor_id like 'mailto:%' and SUBSTRING(enrollments.actor_id, 8) = users.email)
+    or enrollments.actor_id = toString(users.external_user_id)
diff --git a/tutoraspects/templates/openedx-assets/queries/int_problem_results.sql b/tutoraspects/templates/openedx-assets/queries/int_problem_results.sql
@@ -87,5 +87,7 @@ join
     )
 left outer join
     {{ ASPECTS_EVENT_SINK_DATABASE }}.user_pii users
-    on full_responses.actor_id = users.external_user_id::String
+    on (full_responses.actor_id like 'mailto:%' and SUBSTRING(full_responses.actor_id, 8) = users.email)
+    or full_responses.actor_id = toString(users.external_user_id)
+
 where 1 = 1 {% include 'openedx-assets/queries/common_filters.sql' %}
diff --git a/tutoraspects/templates/openedx-assets/queries/problem_coursewide_avg.sql b/tutoraspects/templates/openedx-assets/queries/problem_coursewide_avg.sql
@@ -121,7 +121,8 @@ join
     )
 left outer join
     {{ ASPECTS_EVENT_SINK_DATABASE }}.user_pii users
-    on full_responses.actor_id = users.external_user_id::String
+    on (full_responses.actor_id like 'mailto:%' and SUBSTRING(full_responses.actor_id, 8) = users.email)
+    or full_responses.actor_id = toString(users.external_user_id)
 join
     coursewide_attempts
     on full_responses.org = coursewide_attempts.org