Merge branch 'release-candidate' into release

Author: odlbot

RELEASE.rst

@@ -1,6 +1,12 @@
 Release Notes
 =============
 
+Version 0.112.4 (Released March 05, 2025)
+---------------
+
+- making downgrade not send email (#2558)
+- No emails for downgrading enrollment (#2556)
+
 Version 0.112.3 (Released March 03, 2025)
 ---------------
 

courses/api.py

@@ -105,7 +105,9 @@ def create_run_enrollments(  # noqa: C901
 ):
     """
     Creates local records of a user's enrollment in course runs, and attempts to enroll them
-    in edX via API
+    in edX via API.
+    Updates the enrollment mode and change_status if the user is already enrolled in the course run
+    and now is changing the enrollment mode, (e.g. pays or re-enrolls again or getting deferred)
 
     Args:
         user (User): The user to enroll
@@ -168,6 +170,7 @@ def _enroll_learner_into_associated_programs():
     else:
         edx_request_success = True
 
+    is_enrollment_downgraded = False
     for run in runs:
         try:
             enrollment, created = CourseRunEnrollment.all_objects.get_or_create(
@@ -189,8 +192,16 @@ def _enroll_learner_into_associated_programs():
                     enrollment.change_status = change_status
                     enrollment.save_and_log(None)
                 # Case (Upgrade): When user was enrolled in free mode and now enrolls in paid mode (e.g. Verified)
+                # Case (Downgrade): When user was enrolled in paid mode and downgrades to a free mode in case
+                # of deferral(e.g. Audit)
                 # So, User has an active enrollment and the only changing thing is going to be enrollment mode
                 if enrollment.active and enrollment_mode_changed:
+                    if (
+                        mode == EDX_ENROLLMENT_AUDIT_MODE
+                        and enrollment.enrollment_mode == EDX_ENROLLMENT_VERIFIED_MODE
+                    ):
+                        # Downgrade the enrollment
+                        is_enrollment_downgraded = True
                     enrollment.update_mode_and_save(mode=mode)
 
                 elif not enrollment.active:
@@ -207,7 +218,8 @@ def _enroll_learner_into_associated_programs():
             )
         else:
             successful_enrollments.append(enrollment)
-            if enrollment.edx_enrolled:
+            if enrollment.edx_enrolled and not is_enrollment_downgraded:
+                # Do not send enrollment email if the user was downgraded.
                 mail_api.send_course_run_enrollment_email(enrollment)
     return successful_enrollments, edx_request_success
 

main/settings.py

@@ -29,7 +29,7 @@
 from main.celery_utils import OffsettingSchedule
 from main.sentry import init_sentry
 
-VERSION = "0.112.3"
+VERSION = "0.112.4"
 
 log = logging.getLogger()