Merge pull request #35218 from openedx/pwnage101/ENT-9213

feat: install and enable new LC enrollment revoked event
openedx · Sep 5, 2024 · dbc1b23 · dbc1b23
2 parents f8bf592 + af20832
commit dbc1b23
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 5 deletions.
diff --git a/lms/envs/common.py b/lms/envs/common.py
@@ -5466,6 +5466,10 @@ def _should_send_learning_badge_events(settings):
         'learning-course-access-role-lifecycle':
             {'event_key_field': 'course_access_role_data.course_key', 'enabled': False},
     },
+    'org.openedx.enterprise.learner_credit_course_enrollment.revoked.v1': {
+        'learner-credit-course-enrollment-lifecycle':
+            {'event_key_field': 'learner_credit_course_enrollment.uuid', 'enabled': False},
+    },
     # CMS events. These have to be copied over here because cms.common adds some derived entries as well,
     # and the derivation fails if the keys are missing. If we ever fully decouple the lms and cms settings,
     # we can remove these.

diff --git a/lms/envs/devstack.py b/lms/envs/devstack.py
@@ -522,6 +522,10 @@ def should_show_debug_toolbar(request):  # lint-amnesty, pylint: disable=missing
 ]
 course_access_role_removed_event_setting['learning-course-access-role-lifecycle']['enabled'] = True
 
+lc_enrollment_revoked_setting = \
+    EVENT_BUS_PRODUCER_CONFIG['org.openedx.enterprise.learner_credit_course_enrollment.revoked.v1']
+lc_enrollment_revoked_setting['learner-credit-course-enrollment-lifecycle']['enabled'] = True
+
 # API access management
 API_ACCESS_MANAGER_EMAIL = '[email protected]'
 API_ACCESS_FROM_EMAIL = '[email protected]'

diff --git a/requirements/constraints.txt b/requirements/constraints.txt
@@ -26,7 +26,7 @@ celery>=5.2.2,<6.0.0
 # The team that owns this package will manually bump this package rather than having it pulled in automatically.
 # This is to allow them to better control its deployment and to do it in a process that works better
 # for them.
-edx-enterprise==4.24.0
+edx-enterprise==4.25.0
 
 # Stay on LTS version, remove once this is added to common constraint
 Django<5.0

diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt
@@ -467,7 +467,7 @@ edx-drf-extensions==10.3.0
     #   edx-when
     #   edxval
     #   openedx-learning
-edx-enterprise==4.24.0
+edx-enterprise==4.25.0
     # via
     #   -c requirements/edx/../constraints.txt
     #   -r requirements/edx/kernel.in
@@ -814,6 +814,7 @@ openedx-django-wiki==2.1.0
 openedx-events==9.12.0
     # via
     #   -r requirements/edx/kernel.in
+    #   edx-enterprise
     #   edx-event-bus-kafka
     #   edx-event-bus-redis
     #   event-tracking

diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt
@@ -741,7 +741,7 @@ edx-drf-extensions==10.3.0
     #   edx-when
     #   edxval
     #   openedx-learning
-edx-enterprise==4.24.0
+edx-enterprise==4.25.0
     # via
     #   -c requirements/edx/../constraints.txt
     #   -r requirements/edx/doc.txt
@@ -1362,6 +1362,7 @@ openedx-events==9.12.0
     # via
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
+    #   edx-enterprise
     #   edx-event-bus-kafka
     #   edx-event-bus-redis
     #   event-tracking

diff --git a/requirements/edx/doc.txt b/requirements/edx/doc.txt
@@ -547,7 +547,7 @@ edx-drf-extensions==10.3.0
     #   edx-when
     #   edxval
     #   openedx-learning
-edx-enterprise==4.24.0
+edx-enterprise==4.25.0
     # via
     #   -c requirements/edx/../constraints.txt
     #   -r requirements/edx/base.txt
@@ -973,6 +973,7 @@ openedx-django-wiki==2.1.0
 openedx-events==9.12.0
     # via
     #   -r requirements/edx/base.txt
+    #   edx-enterprise
     #   edx-event-bus-kafka
     #   edx-event-bus-redis
     #   event-tracking

diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt
@@ -571,7 +571,7 @@ edx-drf-extensions==10.3.0
     #   edx-when
     #   edxval
     #   openedx-learning
-edx-enterprise==4.24.0
+edx-enterprise==4.25.0
     # via
     #   -c requirements/edx/../constraints.txt
     #   -r requirements/edx/base.txt
@@ -1024,6 +1024,7 @@ openedx-django-wiki==2.1.0
 openedx-events==9.12.0
     # via
     #   -r requirements/edx/base.txt
+    #   edx-enterprise
     #   edx-event-bus-kafka
     #   edx-event-bus-redis
     #   event-tracking