Merge pull request #544 from openedx/cag/enable-user-retirement

fix: enable user retirement sink
openedx · Jan 11, 2024 · 5fe95ce · 5fe95ce
2 parents 9eb2385 + 4332e05
commit 5fe95ce
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 9 deletions.
diff --git a/tutoraspects/patches/openedx-common-settings b/tutoraspects/patches/openedx-common-settings
@@ -13,4 +13,4 @@ SUPERSET_CONFIG = {
 	"password": "{{ SUPERSET_LMS_PASSWORD }}",
 	"email": "{{ SUPERSET_LMS_EMAIL }}",
 }
-EVENT_SINK_CLICKHOUSE_PII_MODELS = {{ EVENT_SINK_CLICKHOUSE_PII_MODELS }}
+EVENT_SINK_CLICKHOUSE_PII_MODELS = {{ EVENT_SINK_PII_MODELS }}
diff --git a/tutoraspects/plugin.py b/tutoraspects/plugin.py
@@ -45,10 +45,13 @@
             ],
         ),
         (
-            "EVENT_SINK_CLICKHOUSE_MODELS",
-            ["course_overviews", "user_profile", "external_id"],
+            "EVENT_SINK_MODELS_ENABLED",
+            ["course_overviews"],
+        ),
+        (
+            "EVENT_SINK_PII_MODELS",
+            ["user_profile", "external_id", "auth_user"],
         ),
-        ("EVENT_SINK_CLICKHOUSE_PII_MODELS", ["user_profile", "external_id"]),
         # Turning on this flag will store personally identifiable information
         # in the ClickHouse database. Make sure that you understand the legal
         # consequences of data storage and privacy before turning this on!

diff --git a/tutoraspects/templates/aspects/jobs/init/init-lms.sh b/tutoraspects/templates/aspects/jobs/init/init-lms.sh
@@ -39,11 +39,12 @@ EOF
 ./manage.py lms populate_model -f /tmp/erb_config.json -u tutor-contrib-aspects
 {% endif %}
 
-{% for model in EVENT_SINK_CLICKHOUSE_MODELS %}
-{% if ASPECTS_ENABLE_PII %}
+{% for model in EVENT_SINK_MODELS_ENABLED %}
 (./manage.py lms waffle_flag --list | grep event_sink_clickhouse.{{model}}.enabled) || ./manage.py lms waffle_flag --create event_sink_clickhouse.{{model}}.enabled --everyone
-{% elif model not in EVENT_SINK_CLICKHOUSE_PII_MODELS %}
+{% endfor %}
+
+{% if ASPECTS_ENABLE_PII %}
+  {% for model in EVENT_SINK_PII_MODELS %}
 (./manage.py lms waffle_flag --list | grep event_sink_clickhouse.{{model}}.enabled) || ./manage.py lms waffle_flag --create event_sink_clickhouse.{{model}}.enabled --everyone
+  {% endfor %}
 {% endif %}
-
-{% endfor %}