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

feat: cherry-pick edx-enterprise customizations to Quince [BB-8368] #13

Merged

Commits on Dec 30, 2023

  1. feat: allow enrollment api admin to see all enrollments

    Co-authored-by: Maxim Beder <[email protected]>
    
    test: EnterpriseCourseEnrollmentFilterBackend
    
    Co-authored-by: Maxim Beder <[email protected]>
    
    feat: add additional fields to EnterpriseCourseEnrollmentViewSet
    
    Created new manager and serializer for EnterpriseCourseEnrollment model,
    which add additional fields to the model, which allow to reduce the
    number of requests to the API by providing the necessary data in the
    feilds along side the model.
    
    Use the new manager and serializer in EnterpriseCourseEnrollmentViewSet.
    
    Co-authored-by: Maxim Beder <[email protected]>
    
    perf: order enterprise course enrollments by id
    
    perf: strip annotations for paginator's count
    
    perf: use read replica or default
    0x29a committed Dec 30, 2023
    Configuration menu
    Copy the full SHA
    9f8a686 View commit details
    Browse the repository at this point in the history
  2. feat: create CourseEnrollmentAllowed entries for pending enrollments

    When creating pending enrollments for non-existant users, we also check
    to see if the course is "invite_only". If the course is invite only,
    then we create corresponding CourseEnrollmentAllowed objects. This fixes
    the issue when the enterprise creates pending enrollment, but the user
    cannot enroll to the course as platform rejects the enrollment request
    due to missing CEA for the user.
    
    (cherry picked from commit 2d8c2d4)
    tecoholic authored and 0x29a committed Dec 30, 2023
    Configuration menu
    Copy the full SHA
    447cc3b View commit details
    Browse the repository at this point in the history
  3. feat: adds attribute to hide course prices when zero

    This adds a new attribute `hide_course_price_when_zero` to the
    EnterpriseCustomer model, which will hide the pricing information
    from the enrollment page when the final price of a premium course
    mode is Zero.
    
    fix: removed unused variable from template context
    
    fix: quality issue and add the new attribute to test
    
    fix: update the help text in the db migration
    
    feat: adds final price to logging
    
    fix: change the attribute in the utils test causing test failure
    
    refactor: renamed the migration file
    
    chore: rebase on master and update db migration
    
    fix: remove empty lines causing linting failure
    
    fix: remove the empty line in tests file
    
    -------------------------
    
    Additionally includes this fix:
    https://tasks.opencraft.com/browse/BB-7541?focusedCommentId=282910&page=com.atlassian.jira.plugin.system.issuetabpanels%3Acomment-tabpanel#comment-282910
    tecoholic authored and 0x29a committed Dec 30, 2023
    Configuration menu
    Copy the full SHA
    fa66def View commit details
    Browse the repository at this point in the history
  4. temp: add utility function to add CEA objects

    feat: adds allow invite only enrollment flag
    
    feat: adds allow invite only enrollment flag
    
    feat: create cea only when customer has invite-only enrollments enabled
    
    fix: simplify the cea creation logic, update tests
    
    fix: remove a stray empty line
    
    feat: adds the invite-only flag to customer admin
    
    fix: typo in the fuction docstring
    
    Co-authored-by: Piotr Surowiec <[email protected]>
    
    refactor: convert the user consent flow handler method to static
    
    fix: move migrations to avoid conflicts
    
    feat: add typing to the ensure cea utility method
    
    Revert "feat: add typing to the ensure cea utility method"
    
    This reverts commit b6b2f25.
    
    refactor: rename the migration with a custom name instead of the auto one
    
    fix: remove typing that breaks causes import failures
    
    chore: move the DB migration to latest version
    
    -----------------------
    
    Additionally includes this fix:
    https://tasks.opencraft.com/browse/BB-7619?focusedCommentId=282911&page=com.atlassian.jira.plugin.system.issuetabpanels%3Acomment-tabpanel#comment-282911
    tecoholic authored and 0x29a committed Dec 30, 2023
    Configuration menu
    Copy the full SHA
    0069d2c View commit details
    Browse the repository at this point in the history
  5. feat: per-user secured Algolia API keys

    (cherry picked from commit 6247ed4)
    0x29a committed Dec 30, 2023
    Configuration menu
    Copy the full SHA
    db8659f View commit details
    Browse the repository at this point in the history
  6. fix: renamed migrations

    This commit contains renamed migrations that were extracted from other
    pull requests. We do this because upstream PRs depend on migrations that
    don't exist in v4.6.0
    
    IMPORTANT: if you've previously had `opencraft-release/palm.1`
    installed, you'll have to fake `0194_hide_course_price_when_zero` and `0195_allow_enrollment_in_invite_only_courses`
    migrations from this commit, as changes are most likely already applied to your DB.
    
    See this and further comments for details: https://tasks.opencraft.com/browse/BB-7619?focusedCommentId=274168&page=com.atlassian.jira.plugin.system.issuetabpanels%3Acomment-tabpanel#comment-274168
    
    Also see the similar commit for nutmeg: 9840c0b
    0x29a committed Dec 30, 2023
    Configuration menu
    Copy the full SHA
    8b48b11 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    724cdc1 View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    ff5da2d View commit details
    Browse the repository at this point in the history