Drop Discovery, drop mailings, fix pipeline

CHANGELOG.md

@@ -1,3 +1,10 @@
+## Unreleased
+
+* [Bug fix] Complete the removal of (not-ever-working) support for the Ecommerce service, by also removing references to that service from the `openedx-lms-common-settings` patch.
+* [Bug fix] Remove references to the mailing API (which in turn was removed from the LMS in Ironwood).
+* [Bug fix] Remove references to the (not-ever-working) Discovery service.
+* [Bug fix] Run the retirement pipeline for course enrollments prior to that for forum posts.
+
 ## Version 3.3.1 (2024-07-03)
 
 * [Bug fix] Drop support for retiring users in the [Open edX E-Commerce Service](https://github.com/openedx/ecommerce).

README.md

@@ -31,9 +31,10 @@ appropriate one:
 Limitations
 ------------
 
-This plugin cannot be used for retiring accounts in the [Open edX E-Commerce Service](https://github.com/openedx/ecommerce).[^ecom]
+This plugin cannot be used for retiring accounts in the [Open edX E-Commerce Service](https://github.com/openedx/ecommerce),[^ecom] nor the [Course Discovery Service](https://github.com/openedx/course-discovery).[^discovery].
 
-[^ecom]: See [Issue #36](https://github.com/hastexo/tutor-contrib-retirement/issues/36) in this repository for a related discussion of missing functionality in E-Commerce account retirement.
+[^ecom]: See [Issue #36](https://github.com/hastexo/tutor-contrib-retirement/issues/36) for background.
+[^discovery]: See [Issue #39](https://github.com/hastexo/tutor-contrib-retirement/issues/39) for background.
 
 
 Installation

tutorretirement/patches/openedx-lms-common-settings

@@ -6,9 +6,6 @@ RETIREMENT_STATES = [
     'LOCKING_ACCOUNT',
     'LOCKING_COMPLETE',
 
-    'RETIRING_EMAIL_LISTS',
-    'EMAIL_LISTS_COMPLETE',
-
     'RETIRING_ENROLLMENTS',
     'ENROLLMENTS_COMPLETE',
 
@@ -17,16 +14,6 @@ RETIREMENT_STATES = [
     'FORUMS_COMPLETE',
     {% endif %}
 
-    {% if ECOMMERCE_HOST is defined %}
-    'RETIRING_ECOMMERCE',
-    'ECOMMERCE_COMPLETE',
-    {% endif %}
-
-    {% if DISCOVERY_HOST is defined %}
-    'RETIRING_DISCOVERY',
-    'DISCOVERY_COMPLETE',
-    {% endif %}
-
     {% if NOTES_HOST is defined %}
     'RETIRING_NOTES',
     'NOTES_COMPLETE',

tutorretirement/templates/retirement/build/retirement/pipeline_config/config.yml

@@ -3,14 +3,11 @@ client_secret: {{ RETIREMENT_EDX_OAUTH2_CLIENT_SECRET }}
 
 base_urls:
     lms: {{ "https" if ENABLE_HTTPS else "http" }}://{{ LMS_HOST }}
-    {% if DISCOVERY_HOST is defined %}discovery: {{ "https" if ENABLE_HTTPS else "http" }}://{{ DISCOVERY_HOST }}{% endif %}
     {% if NOTES_HOST is defined %}notes: {{ "https" if ENABLE_HTTPS else "http" }}://{{ NOTES_HOST }}{% endif %}
 
 retirement_pipeline:
+    - [ 'RETIRING_ENROLLMENTS', 'ENROLLMENTS_COMPLETE', 'LMS', 'retirement_unenroll' ]
     {% if FORUM_VERSION is defined %}- [ 'RETIRING_FORUMS', 'FORUMS_COMPLETE', 'LMS', 'retirement_retire_forum' ]{% endif %}
-    {% if DISCOVERY_HOST is defined %}- [ 'RETIRING_DISCOVERY', 'DISCOVERY_COMPLETE', 'DISCOVERY', 'replace_usernames' ]{% endif %}
     {% if NOTES_HOST is defined %}- [ 'RETIRING_NOTES', 'NOTES_COMPLETE', 'LMS', 'retirement_retire_notes' ]{% endif %}
-    - [ 'RETIRING_EMAIL_LISTS', 'EMAIL_LISTS_COMPLETE', 'LMS', 'retirement_retire_mailings' ]
-    - [ 'RETIRING_ENROLLMENTS', 'ENROLLMENTS_COMPLETE', 'LMS', 'retirement_unenroll' ]
     - [ 'RETIRING_LMS_MISC', 'LMS_MISC_COMPLETE', 'LMS', 'retirement_lms_retire_misc' ]
     - [ 'RETIRING_LMS', 'LMS_COMPLETE', 'LMS', 'retirement_lms_retire' ]