Merge branch 'master' into jci/issue#35245

lms/djangoapps/bulk_email/models.py

@@ -146,7 +146,7 @@ def get_users(self, course_id, user_id=None):
                 User.objects.filter(
                     models.Q(courseenrollment__mode=self.coursemodetarget.track.mode_slug)
                     & enrollment_query
-                )
+                ).exclude(id__in=staff_instructor_qset)
             )
         else:
             raise ValueError(f"Unrecognized target type {self.target_type}")

lms/djangoapps/bulk_email/tests/test_models.py

@@ -15,7 +15,7 @@
 from pytz import UTC
 
 from common.djangoapps.course_modes.models import CourseMode
-from common.djangoapps.student.tests.factories import CourseEnrollmentFactory, UserFactory
+from common.djangoapps.student.tests.factories import CourseEnrollmentFactory, UserFactory, StaffFactory
 from lms.djangoapps.bulk_email.api import is_bulk_email_feature_enabled
 from lms.djangoapps.bulk_email.models import (
     SEND_TO_COHORT,
@@ -25,8 +25,10 @@
     CourseAuthorization,
     CourseEmail,
     CourseEmailTemplate,
+    CourseModeTarget,
     DisabledCourse,
-    Optout
+    Optout,
+    Target,
 )
 from lms.djangoapps.bulk_email.models_api import is_bulk_email_disabled_for_course
 from lms.djangoapps.bulk_email.tests.factories import TargetFactory
@@ -366,6 +368,7 @@ def setUp(self):
             course_id=self.course.id,
             user=self.user3
         )
+        self.staff_user = StaffFactory.create(course_key=self.course.id)
         self.target = TargetFactory()
 
     @override_settings(BULK_COURSE_EMAIL_LAST_LOGIN_ELIGIBILITY_PERIOD=None)
@@ -391,3 +394,40 @@ def test_target_last_login_eligibility_set(self):
 
         assert result.count() == 1
         assert result.filter(id=self.user1.id).exists()
+
+    def test_filtering_of_recipients_target_for_audit_track(self):
+        """
+        Verifies the default behavior.
+
+        This test ensures that when the `BULK_COURSE_EMAIL_LAST_LOGIN_ELIGIBILITY_PERIOD`
+        setting is not defined, all users enrolled in the course are included in the results.
+        """
+        target = Target.objects.create(target_type=SEND_TO_TRACK)
+        course_mode = CourseMode.objects.create(
+            mode_slug=CourseMode.AUDIT,
+            mode_display_name=CourseMode.AUDIT.capitalize(),
+            course_id=self.course.id,
+        )
+        course_mode_target = CourseModeTarget.objects.create(track=course_mode)
+        target.coursemodetarget = course_mode_target
+        result = target.get_users(self.course.id)
+
+        assert result.count() == 1
+        assert result.filter(id=self.user2.id).exists()
+
+        # Ensure staff user is not included
+        assert not result.filter(id=self.staff_user.id).exists()
+
+    def test_filtering_of_recipients_target_for_staff(self):
+        """
+        Test filtering of recipients for a target of type SEND_TO_STAFF.
+
+        This test verifies that only staff users are returned for the given target.
+        It creates a target of type SEND_TO_STAFF and ensures that the correct users
+        are retrieved.
+        """
+        self.target = TargetFactory(target_type=SEND_TO_STAFF)
+        result = self.target.get_users(self.course.id)
+
+        assert result.count() == 1
+        assert result.filter(id=self.staff_user.id).exists()

lms/djangoapps/course_goals/management/commands/goal_reminder_email.py

@@ -119,7 +119,11 @@ def send_ace_message(goal, session_id):
 
     with emulate_http_request(site, user):
         try:
+            start_time = datetime.now()
             ace.send(msg)
+            end_time = datetime.now()
+            log.info(f"Goal Reminder for {user.id} for course {goal.course_key} sent in {end_time - start_time} "
+                     f"using {'SES' if is_ses_enabled else 'others'}")
         except Exception as exc:  # pylint: disable=broad-except
             log.error(f"Goal Reminder for {user.id} for course {goal.course_key} could not send: {exc}")
             tracker.emit(