Merge pull request #981 from openedx/cag/actor-as-email

fix: parse external_id to string instead of actor_id to uuid

tutoraspects/patches/openedx-dev-dockerfile-post-python-requirements

@@ -1,5 +1,5 @@
 RUN --mount=type=cache,target=/openedx/.cache/pip,sharing=shared \
-    pip install "platform-plugin-aspects==v0.11.3"
+    pip install "platform-plugin-aspects==v0.11.4"
 
 RUN --mount=type=cache,target=/openedx/.cache/pip,sharing=shared \
     pip install "edx-event-routing-backends>=9.3.0,<9.4"

tutoraspects/patches/openedx-dockerfile-post-python-requirements

@@ -1,5 +1,5 @@
 RUN --mount=type=cache,target=/openedx/.cache/pip,sharing=shared \
-    pip install "platform-plugin-aspects==v0.11.3"
-    
+    pip install "platform-plugin-aspects==v0.11.4"
+
 RUN --mount=type=cache,target=/openedx/.cache/pip,sharing=shared \
     pip install "edx-event-routing-backends>=9.3.0,<9.4"

tutoraspects/plugin.py

@@ -385,7 +385,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", "v3.33.3"),
+        ("DBT_BRANCH", "v3.33.5"),
         ("DBT_SSH_KEY", ""),
         ("DBT_STATE_DIR", "/app/aspects-dbt/state"),
         ("DBT_PROFILES_DIR", "/app/aspects/dbt/"),

tutoraspects/templates/aspects/apps/aspects/migrations/alembic/versions/0040_user_profile_username.py

@@ -0,0 +1,35 @@
+from alembic import op
+import sqlalchemy as sa
+
+revision = "0040"
+down_revision = "0039"
+branch_labels = None
+depends_on = None
+on_cluster = " ON CLUSTER '{{CLICKHOUSE_CLUSTER_NAME}}' " if "{{CLICKHOUSE_CLUSTER_NAME}}" else ""
+engine = (
+    "ReplicatedReplacingMergeTree"
+    if "{{CLICKHOUSE_CLUSTER_NAME}}"
+    else "ReplacingMergeTree"
+)
+
+
+
+def upgrade():
+    op.execute(
+        f"""
+        ALTER TABLE {{ ASPECTS_EVENT_SINK_DATABASE }}.user_profile
+        {on_cluster}
+        ADD COLUMN IF NOT EXISTS username String DEFAULT ''
+        AFTER name;
+        """
+    )
+
+
+def downgrade():
+    op.execute(
+        f"""
+        ALTER TABLE {{ ASPECTS_EVENT_SINK_DATABASE }}.user_profile
+        {on_cluster}
+        DROP COLUMN IF EXISTS username;
+        """
+    )

tutoraspects/templates/aspects/build/aspects/requirements.txt

@@ -1,5 +1,5 @@
 # alembic packages
 alembic==1.11.1
 clickhouse-sqlalchemy==0.1.9
-git+https://github.com/openedx/[email protected]
+git+https://github.com/openedx/[email protected].1
 pyyaml

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

@@ -26,4 +26,8 @@ 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)

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

@@ -49,5 +49,6 @@ join
     )
 left outer join
     {{ DBT_PROFILE_TARGET_DATABASE }}.dim_user_pii users
-    on toUUID(pv.actor_id) = users.external_user_id
+    on (pv.actor_id like 'mailto:%' and SUBSTRING(pv.actor_id, 8) = users.email)
+    or pv.actor_id = toString(users.external_user_id)
 where 1 = 1 {% include 'openedx-assets/queries/common_filters.sql' %}

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

@@ -50,5 +50,6 @@ join
     )
 left outer join
     {{ DBT_PROFILE_TARGET_DATABASE }}.dim_user_pii users
-    on toUUID(pe.actor_id) = users.external_user_id
+    on (pe.actor_id like 'mailto:%' and SUBSTRING(pe.actor_id, 8) = users.email)
+    or pe.actor_id = toString(users.external_user_id)
 where 1 = 1 {% include 'openedx-assets/queries/common_filters.sql' %}

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

@@ -49,5 +49,6 @@ join
     )
 left outer join
     {{ DBT_PROFILE_TARGET_DATABASE }}.dim_user_pii users
-    on toUUID(ve.actor_id) = users.external_user_id
+    on (ve.actor_id like 'mailto:%' and SUBSTRING(ve.actor_id, 8) = users.email)
+    or ve.actor_id = toString(users.external_user_id)
 where 1 = 1 {% include 'openedx-assets/queries/common_filters.sql' %}

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

@@ -105,5 +105,6 @@ select
 from enriched_segments
 left outer join
     {{ DBT_PROFILE_TARGET_DATABASE }}.dim_user_pii users
-    on toUUID(actor_id) = users.external_user_id
+    on (actor_id like 'mailto:%' and SUBSTRING(actor_id, 8) = users.email)
+    or actor_id = toString(users.external_user_id)
 order by segment_start

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

@@ -87,5 +87,10 @@ 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' %}

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

@@ -121,7 +121,11 @@ 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