Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: upgrade course_enrollment from audit to verified #1786

Merged
merged 1 commit into from
Jul 17, 2023

Conversation

emrosarioa
Copy link
Contributor

Description

If an enterprise learner has enrolled in the audit course mode, we would like to support an automatic upgrade to the paid (verified) enrollment track.
In edx-platform, the lms_enroll_user_in_course function is updated to lms_update_or_create_enrollmentto allow for an update to the course_mode.
This PR updates the name of the function and any related comments.

Merge checklist:

  • Any new requirements are in the right place (do not manually modify the requirements/*.txt files)
    • base.in if needed in production but edx-platform doesn't install it
    • test-master.in if edx-platform pins it, with a matching version
    • make upgrade && make requirements have been run to regenerate requirements
  • make static has been run to update webpack bundling if any static content was updated
  • ./manage.py makemigrations has been run
    • Checkout the Database Migration Confluence page for helpful tips on creating migrations.
    • Note: This must be run if you modified any models.
      • It may or may not make a migration depending on exactly what you modified, but it should still be run.
    • This should be run from either a venv with all the lms/edx-enterprise requirements installed or if you checked out edx-enterprise into the src directory used by lms, you can run this command through an lms shell.
      • It would be ./manage.py lms makemigrations in the shell.
  • Version bumped
  • Changelog record added
  • Translations updated (see docs/internationalization.rst but also this isn't blocking for merge atm)

Post merge:

  • Tag pushed and a new version released
    • Note: Assets will be added automatically. You just need to provide a tag (should match your version number) and title and description.
  • After versioned build finishes in GitHub Actions, verify version has been pushed to PyPI
    • Each step in the release build has a condition flag that checks if the rest of the steps are done and if so will deploy to PyPi.
      (so basically once your build finishes, after maybe a minute you should see the new version in PyPi automatically (on refresh))
  • PR created in edx-platform to upgrade dependencies (including edx-enterprise)
    • This must be done after the version is visible in PyPi as make upgrade in edx-platform will look for the latest version in PyPi.
    • Note: the edx-enterprise constraint in edx-platform must also be bumped to the latest version in PyPi.

@emrosarioa emrosarioa marked this pull request as ready for review June 29, 2023 16:12
@emrosarioa emrosarioa force-pushed the ea/ent-7031 branch 3 times, most recently from 16ef915 to b16820a Compare July 5, 2023 18:50
enterprise/utils.py Outdated Show resolved Hide resolved
user.username,
course_id,
course_mode,
True,
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: I wonder if it may be slightly more readable to include the kwarg property key when passing True so that the code is more self-descriptive/documented (e.g., is_active=True below).

tests/test_enterprise/api/test_views.py Outdated Show resolved Hide resolved
Comment on lines 101 to 102
@override_settings(ENABLE_ENTERPRISE_BACKEND_EMET_AUTO_UPGRADE_ENROLLMENT_MODE=True)
@mock.patch('enterprise.utils.lms_update_or_create_enrollment')
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[suggestion] Similar to the previous comment, I wonder if we should have test cases covering both the feature flag being enabled and disabled to assert on both code baths while both still exist.

@emrosarioa emrosarioa merged commit 5b6906b into master Jul 17, 2023
6 checks passed
@emrosarioa emrosarioa deleted the ea/ent-7031 branch July 17, 2023 15:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants