feat: replace enterprise support enrollment imports with filter call - #39083
Draft
brobro10000 wants to merge 1 commit into
Draft
brobro10000 wants to merge 1 commit into
brobro10000 wants to merge 1 commit into
Conversation
This was referenced Sep 8, 2026
brobro10000
force-pushed
the
brobro10000/ENT-11574-enrollment
branch
7 times, most recently
from
September 14, 2026 16:22
6794569 to
53a965c
Compare
brobro10000
force-pushed
the
brobro10000/ENT-11574-enrollment
branch
from
September 16, 2026 12:41
53a965c to
9d44e13
Compare
Removes the direct openedx.features.enterprise_support imports and the _enterprise_course_enrollments_by_course_id helper from EnrollmentSupportListView, replacing them with a call to the SupportEnrollmentDataRequested openedx-filter. Bumps openedx-filters to 3.13.0 and edx-enterprise to 8.13.0, now that both are released and contain the enrollments_data shape correction this call site relies on. ENT-11574
brobro10000
force-pushed
the
brobro10000/ENT-11574-enrollment
branch
from
September 17, 2026 12:27
9d44e13 to
f37a741
Compare
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
ENT-11574
Companion PR to the already-open support-contact-tag PR set (openedx-filters#390,
edx-enterprise#2688, openedx-platform#39076, edx-platform#455) — this one covers the
other half of ENT-11574's acceptance criteria: enterprise enrollment data for the support
enrollment view.
Removes the direct
openedx.features.enterprise_supportimports and the_enterprise_course_enrollments_by_course_idhelper fromEnrollmentSupportListView,replacing them with a call to the new
SupportEnrollmentDataRequestedopenedx-filter. Nosettings changes in this PR:
OPEN_EDX_FILTERS_CONFIGregistration for the pipeline steplives entirely in edx-enterprise's own
plugin_settings()(enterprise/settings/common.py),per the
ENT-11830ownership handoff — already merged in this repo (#38634) well before thisbranch existed.
lms/djangoapps/support/views/contact_us.pyis untouched — this PR is scoped to theenrollment filter only.
Shape corrected
Code review flagged that passing an empty placeholder dict to the filter (and zipping the
results back onto
enrollmentsvia a for-loop in the call site) left a non-enterprisepipeline-step implementer nothing real to augment, and that the resulting for-loop should be
deleted by having the filter make in-place changes to
enrollmentsinstead(comment,
comment). Since
openedx-filters#393andedx-enterprise#2690were already merged/released, the fix landedas new PRs:
Update: this PR's call site is now updated ahead of those two merging/releasing, on the
assumption they'll land as designed. The call site now reads
enrollments, _ = SupportEnrollmentDataRequested.run_filter(enrollments=enrollments, user=user)with thezip-back for-loop deleted entirely — zero "enterprise" mentions remain in
enrollments.py. See the CI note below for the resulting interim test failure.Related PRs
openedx-platform#39076, edx-platform#455 (support-contact-tag)
Merge order (per the enterprise plugin ticket runbook)
This PR merges LAST, only after:
confirmed working.
CI note
test_get_enrollmentsinlms/djangoapps/support/tests/test_views.pyis expected to failuntil
openedx-filters#396andedx-enterprise#2693are merged and released: it exercises thereal (unmocked) filter pipeline, and the currently-released
edx-enterprise8.12.0'sSupportEnterpriseEnrollmentDataInjector.run_filterstill has the old(enrollment_data, user)signature, so calling it with the newenrollments=kwarg raisesTypeError. Same situation as the sibling contact-tag PR (openedx-platform#39076) previouslyhit while waiting on its own dependency release. This self-resolves once both companion PRs
release and this repo's
requirements/edx/base.txtpins are bumped to match (follow-upcommit, tracked separately). Do not merge this PR until that follow-up lands and CI is
green.
Testing
New:
SupportEnrollmentDataRequested.run_filteris mocked at the call site inlms/djangoapps/support/tests/test_views.py— the pipeline-step behavior itself is coveredby edx-enterprise's own test suite.
Local devstack integration testing (with the openedx-filters, edx-enterprise, and edx-platform
branches checked out together) is required before any of these PRs merge.