feat: replace enterprise support enrollment imports with filter call - #39083
Merged
brobro10000 merged 1 commit intoSep 21, 2026
Merged
brobro10000 merged 1 commit into
brobro10000 merged 1 commit into
Conversation
Copy link
Copy Markdown
Member
Sorry, something went wrong.
This was referenced Sep 8, 2026
brobro10000
force-pushed
the
brobro10000/ENT-11574-enrollment
branch
7 times, most recently
from
6794569 to
53a965c
Compare
September 14, 2026 16:22
brobro10000
force-pushed
the
brobro10000/ENT-11574-enrollment
branch
7 times, most recently
from
3300ecb to
beeeb6c
Compare
September 17, 2026 16:42
brobro10000
marked this pull request as ready for review
September 17, 2026 16:47
brobro10000
force-pushed
the
brobro10000/ENT-11574-enrollment
branch
from
beeeb6c to
2619904
Compare
September 18, 2026 11:38
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. ENT-11574
brobro10000
force-pushed
the
brobro10000/ENT-11574-enrollment
branch
from
2619904 to
091d95e
Compare
September 18, 2026 11:44
pwnage101
approved these changes
Sep 21, 2026
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_support imports and the
_enterprise_course_enrollments_by_course_id helper from EnrollmentSupportListView,
replacing them with a call to the new SupportEnrollmentDataRequested openedx-filter. No
settings changes in this PR: OPEN_EDX_FILTERS_CONFIG registration for the pipeline step
lives entirely in edx-enterprise's own plugin_settings() (enterprise/settings/common.py),
per the ENT-11830 ownership handoff — already merged in this repo (#38634) well before this
branch existed.
lms/djangoapps/support/views/contact_us.py is untouched — this PR is scoped to the
enrollment filter only.
Shape corrected
Code review flagged that passing an empty placeholder dict to the filter (and zipping the
results back onto enrollments via a for-loop in the call site) left a non-enterprise
pipeline-step implementer nothing real to augment, and that the resulting for-loop should be
deleted by having the filter make in-place changes to enrollments instead
(comment,
comment). Since
openedx-filters#393 and edx-enterprise#2690 were already merged/released, the fix landed
as new PRs, which have since merged and released:
Follow-up review also asked for the argument to keep its _data suffix
(enrollments_data, not enrollments) and for a documented example payload — both addressed
in the same two PRs above before they merged.
The call site here reads enrollments, _ = SupportEnrollmentDataRequested.run_filter(enrollments_data=enrollments, user=user) with the
zip-back for-loop deleted entirely — zero "enterprise" mentions remain in enrollments.py.
Dependency pins updated
Now that both companion PRs are released, this PR's openedx-filters/edx-enterprise pins are
bumped to match (3.13.0 / 8.13.0) in pyproject.toml, uv.lock, and the compiled requirements
files — verified locally against the real released packages that
SupportEnrollmentDataRequested.run_filter(enrollments_data=..., user=...) returns the
expected (enrollments, user) tuple.
Stale test assertion removed
With the real released packages installed, CI surfaced a genuine bug: test_get_enrollments
(which exercises the real, unmocked filter — no pipeline step configured in this repo's test
settings) asserted data[0]['enterprise_course_enrollments'] == []. That key is only ever added
by a configured pipeline step; with none configured here, run_pipeline is a no-op and the key
is never added at all — the assertion raised KeyError, not a failed equality check. Removed the
stale assertion; test_get_enrollments_with_enterprise_filter (which mocks the pipeline step)
already covers the case where the key is actually populated.
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.
Testing
New: SupportEnrollmentDataRequested.run_filter is mocked at the call site in
lms/djangoapps/support/tests/test_views.py — the pipeline-step behavior itself is covered
by 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 — see
devstack-validate-ENT-11574-enrollment-filter.md.