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.

Sign up for GitHub

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

Jump to bottom

feat: modifying license enrollment endpoint to support other subsidies #1709

Merged
merged 1 commit into from
Feb 14, 2023
Merged

feat: modifying license enrollment endpoint to support other subsidies #1709

merged 1 commit into from
Feb 14, 2023

Conversation

alex-sheehan-edx
Copy link
Contributor

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.

@alex-sheehan-edx alex-sheehan-edx force-pushed the asheehan-edx/subsidy-enrollment-improvements branch 5 times, most recently from 3bbb172 to 3855bdd Compare January 27, 2023 17:48
@alex-sheehan-edx alex-sheehan-edx requested a review from a team January 27, 2023 20:59
@alex-sheehan-edx alex-sheehan-edx force-pushed the asheehan-edx/subsidy-enrollment-improvements branch from 3855bdd to 9ac6bf2 Compare January 31, 2023 14:59
iloveagent57
iloveagent57 reviewed Jan 31, 2023
View reviewed changes
enterprise/models.py Outdated Show resolved Hide resolved
@alex-sheehan-edx alex-sheehan-edx force-pushed the asheehan-edx/subsidy-enrollment-improvements branch 5 times, most recently from 731d9de to a9f915a Compare February 6, 2023 18:21
johnnagro
johnnagro approved these changes Feb 6, 2023
View reviewed changes
enterprise/utils.py Outdated Show resolved Hide resolved
tests/test_enterprise/api/test_views.py Outdated Show resolved Hide resolved
@alex-sheehan-edx alex-sheehan-edx force-pushed the asheehan-edx/subsidy-enrollment-improvements branch from a9f915a to c60b1b5 Compare February 6, 2023 20:09
alex-sheehan-edx
alex-sheehan-edx commented Feb 6, 2023
View reviewed changes
enterprise/models.py
)

enterprise_course_enrollment = models.OneToOneField(
EnterpriseCourseEnrollment,
blank=False,
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Validation is done now to ensure either an enrollment or entitlement are present

@alex-sheehan-edx alex-sheehan-edx force-pushed the asheehan-edx/subsidy-enrollment-improvements branch from c60b1b5 to 25ebd3f Compare February 6, 2023 20:12
iloveagent57
iloveagent57 reviewed Feb 6, 2023
View reviewed changes
Copy link
Contributor

@iloveagent57 iloveagent57 left a comment

Choose a reason for hiding this comment

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

a few comments to get started

enterprise/models.py Outdated Show resolved Hide resolved
enterprise/models.py Outdated Show resolved Hide resolved
enterprise/models.py Outdated Show resolved Hide resolved
enterprise/models.py Outdated Show resolved Hide resolved
@alex-sheehan-edx alex-sheehan-edx force-pushed the asheehan-edx/subsidy-enrollment-improvements branch 3 times, most recently from 07444cb to ed42ff1 Compare February 6, 2023 20:36
@alex-sheehan-edx alex-sheehan-edx force-pushed the asheehan-edx/subsidy-enrollment-improvements branch 2 times, most recently from e5f537e to 0074bb1 Compare February 7, 2023 15:55
@alex-sheehan-edx alex-sheehan-edx force-pushed the asheehan-edx/subsidy-enrollment-improvements branch 6 times, most recently from 2b711de to 95d4cad Compare February 9, 2023 17:00
@alex-sheehan-edx alex-sheehan-edx force-pushed the asheehan-edx/subsidy-enrollment-improvements branch from 95d4cad to a101ac8 Compare February 9, 2023 17:21
iloveagent57
iloveagent57 reviewed Feb 9, 2023
View reviewed changes
Copy link
Contributor

@iloveagent57 iloveagent57 left a comment

Choose a reason for hiding this comment

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

Some feedback on the models to get started.

enterprise/models.py Outdated Show resolved Hide resolved
enterprise/models.py Outdated Show resolved Hide resolved
enterprise/models.py Outdated Show resolved Hide resolved
enterprise/models.py Show resolved Hide resolved
@alex-sheehan-edx alex-sheehan-edx force-pushed the asheehan-edx/subsidy-enrollment-improvements branch 6 times, most recently from a5fda34 to d73fccf Compare February 10, 2023 18:41
iloveagent57
iloveagent57 reviewed Feb 10, 2023
View reviewed changes
docs/decisions/0011-enterprise-subsidy-enrollments-and-entitlements.rst Outdated Show resolved Hide resolved
docs/decisions/0011-enterprise-subsidy-enrollments-and-entitlements.rst Outdated Show resolved Hide resolved
docs/decisions/0011-enterprise-subsidy-enrollments-and-entitlements.rst Show resolved Hide resolved
docs/decisions/0011-enterprise-subsidy-enrollments-and-entitlements.rst Outdated Show resolved Hide resolved
docs/decisions/0011-enterprise-subsidy-enrollments-and-entitlements.rst Show resolved Hide resolved
docs/decisions/0011-enterprise-subsidy-enrollments-and-entitlements.rst Outdated Show resolved Hide resolved
docs/decisions/0011-enterprise-subsidy-enrollments-and-entitlements.rst Outdated Show resolved Hide resolved
docs/decisions/0011-enterprise-subsidy-enrollments-and-entitlements.rst Outdated Show resolved Hide resolved
docs/decisions/0011-enterprise-subsidy-enrollments-and-entitlements.rst Show resolved Hide resolved
docs/decisions/0011-enterprise-subsidy-enrollments-and-entitlements.rst Outdated Show resolved Hide resolved
@alex-sheehan-edx alex-sheehan-edx force-pushed the asheehan-edx/subsidy-enrollment-improvements branch 2 times, most recently from 33f3829 to 3907d68 Compare February 13, 2023 15:28
@alex-sheehan-edx alex-sheehan-edx force-pushed the asheehan-edx/subsidy-enrollment-improvements branch 3 times, most recently from fe88f17 to 43120af Compare February 14, 2023 20:15
@alex-sheehan-edx alex-sheehan-edx force-pushed the asheehan-edx/subsidy-enrollment-improvements branch from 43120af to bdb4e16 Compare February 14, 2023 20:25
@alex-sheehan-edx alex-sheehan-edx merged commit 9136d19 into master Feb 14, 2023
@alex-sheehan-edx alex-sheehan-edx deleted the asheehan-edx/subsidy-enrollment-improvements branch February 14, 2023 20:37
This was referenced Feb 14, 2023
Merged
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@johnnagro johnnagro johnnagro approved these changes

@iloveagent57 iloveagent57 iloveagent57 approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@alex-sheehan-edx @johnnagro @iloveagent57