feat: add site_id parameter to enrollment batch processing

Author: BryanttV

lms/djangoapps/instructor/views/api.py

@@ -123,6 +123,7 @@
 from openedx.core.djangoapps.course_groups.models import CourseUserGroup
 from openedx.core.djangoapps.django_comment_common.models import CourseDiscussionSettings, Role
 from openedx.core.djangoapps.site_configuration import helpers as configuration_helpers
+from openedx.core.djangoapps.theming.helpers import get_current_site
 from openedx.core.djangoapps.user_api.preferences.api import get_user_preference
 from openedx.core.djangolib.markup import HTML, Text
 from openedx.core.lib.api.authentication import BearerAuthenticationAllowInactiveUser
@@ -779,6 +780,9 @@ def _process_student_enrollment(self, request, course_id, data, secure):  # pyli
 
         course_key = CourseKey.from_string(course_id)
 
+        site = get_current_site()
+        site_id = site.id if site else None
+
         if async_processing:
 
             try:
@@ -791,6 +795,7 @@ def _process_student_enrollment(self, request, course_id, data, secure):  # pyli
                     email_students=email_students,
                     reason=reason,
                     secure=secure,
+                    site_id=site_id,
                 )
 
                 return {

lms/djangoapps/instructor_task/api.py

@@ -622,6 +622,7 @@ def submit_student_enrollment_batch(
     email_students: bool,
     reason: str | None,
     secure: bool,
+    site_id: int | None = None,
 ):
     """
     Request to have student enrollment operations processed as a background task.
@@ -638,6 +639,7 @@ def submit_student_enrollment_batch(
         email_students (bool): Whether to send enrollment emails
         reason (str | None): Optional reason for enrollment change
         secure (bool): Whether the request is secure (HTTPS)
+        site_id (int | None): Optional site ID for notification emails
 
     Returns:
         InstructorTask object representing the submitted background task
@@ -655,6 +657,7 @@ def submit_student_enrollment_batch(
         "email_students": email_students,
         "reason": reason,
         "secure": secure,
+        "site_id": site_id,
     }
 
     task_key_stub = f"{course_key}_{action}_{json.dumps(sorted(identifiers))}"

lms/djangoapps/instructor_task/notifications.py

@@ -27,13 +27,23 @@
 TASK_LOG = logging.getLogger("edx.celery.task")
 
 
-def _get_current_site() -> Site | None:
+def _get_current_site(site_id: int | None = None) -> Site | None:
     """
     Get the current Django Site instance with fallback logic.
 
+    Args:
+        site_id (int | None): Optional site ID to retrieve. If provided, attempts
+            to get this specific site first before falling back.
+
     Returns:
         Site | None: The current Site object or None if unavailable
     """
+    if site_id:
+        try:
+            return Site.objects.get(id=site_id)
+        except Site.DoesNotExist:
+            pass
+
     # Try to get current site if method exists
     if hasattr(Site.objects, "get_current"):
         site = Site.objects.get_current()
@@ -46,7 +56,6 @@ def _get_current_site() -> Site | None:
     except Site.DoesNotExist:
         pass
 
-    # Last resort: get first site
     try:
         return Site.objects.first()
     except Exception:  # pylint: disable=broad-except
@@ -144,11 +153,12 @@ def send_enrollment_task_completion_email(
             - failed: Number of failed operations
     """
     requester = instructor_task.requester
-    site = _get_current_site()
     task_input = _parse_task_input(instructor_task)
+
+    site_id = task_input.get("site_id")
+    site = _get_current_site(site_id)
     user_language = get_user_preference(requester, LANGUAGE_KEY)
 
-    # Build email context
     user_context = _build_enrollment_email_context(
         course_key=course_key,
         requester=requester,
@@ -158,7 +168,6 @@ def send_enrollment_task_completion_email(
         task_input=task_input,
     )
 
-    # Create and send message
     message = BatchEnrollment().personalize(
         recipient=Recipient(lms_user_id=requester.id, email_address=requester.email),
         language=user_language,

lms/djangoapps/instructor_task/tasks_helper/enrollments.py

@@ -148,6 +148,7 @@ def process_student_enrollment_batch(
             - email_students: boolean to send enrollment emails
             - reason: optional reason for enrollment change
             - secure: boolean indicating if request was secure (HTTPS)
+            - site_id: optional site ID for notification emails
         action_name: Name of the action being performed
 
     Returns: