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

fix: follow-up / updates related to ENT-9579 #2269

Merged
merged 2 commits into from
Oct 24, 2024
Merged

fix: follow-up / updates related to ENT-9579 #2269

merged 2 commits into from
Oct 24, 2024

Conversation

adamstankiewicz
Copy link
Member

@adamstankiewicz adamstankiewicz commented Oct 22, 2024 •
edited
Loading

[context] Contribution to related PR #2264

  • Updates Django Admin fields for models.DefaultEnterpriseEnrollmentIntention
  • Ensures DefaultEnterpriseEnrollmentIntentionAdmin uses SoftDeletableModel's all_objects model manager to be able to view/restore soft-deleted instances.
  • Adds help text in Django Admin for SoftDeletableModel's is_removed boolean field.
  • Alters content_type model field to allow blank/null.
  • Adds unique constraint for enterprise_customer and content_key to prevent duplicates.
  • Remove current_* prefixes on computed properties since a configured content_key might not be the current course run.
  • Updates models.DefaultEnterpriseEnrollmentIntention clean method to check for soft-deleted duplicates to raise ValidationError.
  • Ensures self.content_type is already updated on save, even if already set (e.g., if content_key changes to a different content type).
  • Updates related tests.

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)
    • Trigger the 'Upgrade one Python dependency' action against master in edx-platform with new version number to generate version bump PR
    • 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.

adamstankiewicz
adamstankiewicz commented Oct 22, 2024
View reviewed changes
enterprise/admin/__init__.py
"""
Return a QuerySet of all model instances.
"""
return self.model.all_objects.get_queryset()
Copy link
Member Author

Choose a reason for hiding this comment

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

Ensures soft-deleted instances are still discoverable in Django Admin.

@adamstankiewicz
fix: updates to ENT-9579
19f5833 
* Updates Django Admin fields for models.DefaultEnterpriseEnrollmentIntention
* Ensures DefaultEnterpriseEnrollmentIntentionAdmin uses SoftDeletableModel's all_objects model manager to be able to view/restore soft-deleted instances.
* Adds help text in Django Admin for SoftDeletableModel's is_removed boolean field.
* Alters content_type model field to allow blank/null.
* Adds unique constraint for enterprise_customer and content_key to prevent duplicates.
* Remove `current_*` prefixes on computed properties since a configured content_key might not be the *current* course run.
* Updates models.DefaultEnterpriseEnrollmentIntention `clean` method to check for soft-deleted duplicates to raise ValidationError.
* Ensures `self.content_type` is already updated on save, even if already set (e.g., if content_key changes to a different content type).
* Updates related tests.
@adamstankiewicz adamstankiewicz changed the title fix: updates to ENT-9579 fix: follow-up / updates related to ENT-9579 Oct 22, 2024
iloveagent57
iloveagent57 approved these changes Oct 24, 2024
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.

nice

enterprise/models.py Show resolved Hide resolved
enterprise/models.py Show resolved Hide resolved
brobro10000
brobro10000 approved these changes Oct 24, 2024
View reviewed changes
Copy link
Member

@brobro10000 brobro10000 left a comment

Choose a reason for hiding this comment

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

Great cleanup with super minor nits 👍🏽

enterprise/models.py Outdated Show resolved Hide resolved
enterprise/models.py Outdated Show resolved Hide resolved
@adamstankiewicz adamstankiewicz merged commit 64cfbce into hu/ent-9579 Oct 24, 2024
3 of 4 checks passed
@adamstankiewicz adamstankiewicz deleted the ags/ent-9579 branch October 24, 2024 13:47
brobro10000 pushed a commit that referenced this pull request Oct 24, 2024
@adamstankiewicz @brobro10000
fix: follow-up / updates related to ENT-9579 (#2269)
474b277 
* fix: updates to ENT-9579

* Updates Django Admin fields for models.DefaultEnterpriseEnrollmentIntention
* Ensures DefaultEnterpriseEnrollmentIntentionAdmin uses SoftDeletableModel's all_objects model manager to be able to view/restore soft-deleted instances.
* Adds help text in Django Admin for SoftDeletableModel's is_removed boolean field.
* Alters content_type model field to allow blank/null.
* Adds unique constraint for enterprise_customer and content_key to prevent duplicates.
* Remove `current_*` prefixes on computed properties since a configured content_key might not be the *current* course run.
* Updates models.DefaultEnterpriseEnrollmentIntention `clean` method to check for soft-deleted duplicates to raise ValidationError.
* Ensures `self.content_type` is already updated on save, even if already set (e.g., if content_key changes to a different content type).
* Updates related tests.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@brobro10000 brobro10000 brobro10000 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
@adamstankiewicz @iloveagent57 @brobro10000