MDL-85516 assign: Include all active enrolments in participants

Author: bwalkerl

public/mod/assign/classes/notification_helper.php

@@ -227,7 +227,7 @@ public static function get_users_within_assignment(int $assignmentid, string $ty
         $assignmentobj = self::get_assignment_data($assignmentid);
 
         // Get our assignment users.
-        $users = $assignmentobj->list_participants(0, true, false, true);
+        $users = $assignmentobj->list_participants(0, false, false, true);
 
         // If it's an overdue type and there are no submission plugins, skip the assignment.
         if ($type == self::TYPE_OVERDUE) {
@@ -243,6 +243,12 @@ public static function get_users_within_assignment(int $assignmentid, string $ty
         $completion = new \completion_info($course);
 
         foreach ($users as $key => $user) {
+            // Exclude suspended users.
+            if ($user->suspended || ($user->auth == 'nologin')) {
+                unset($users[$key]);
+                continue;
+            }
+
             // Check if the user has submitted already.
             $submission = $assignmentobj->get_user_submission($user->id, false);
             if ($submission && $submission->status === ASSIGN_SUBMISSION_STATUS_SUBMITTED) {
@@ -333,7 +339,12 @@ public static function get_users_within_assignment(int $assignmentid, string $ty
             }
         }
 
-        return $users;
+        // Only the array key and user id field are required.
+        $userids = [];
+        foreach ($users as $key => $user) {
+            $userids[$key] = (object) ['id' => $user->id];
+        }
+        return $userids;
     }
 
     /**

public/mod/assign/locallib.php

@@ -2402,9 +2402,6 @@ public function list_participants($currentgroup, $idsonly, $tablesort = false, ?
                 }
             }
 
-            // Exclude suspended users from the list of participants.
-            $additionalfilters .= " AND u.suspended = 0 AND u.auth <> 'nologin'";
-
             $sql = "SELECT $fields
                       FROM {user} u
                       JOIN ($esql UNION $ssql) je ON je.id = u.id

public/mod/assign/tests/locallib_test.php

@@ -1005,16 +1005,19 @@ public function test_list_participants_activeenrol(): void {
             $this->getDataGenerator()->create_and_enrol($course, 'student');
         }
 
-        // Create 10 suspended students.
+        // Create 10 students with suspended enrolments.
         for ($i = 0; $i < 10; $i++) {
             $this->getDataGenerator()->create_and_enrol($course, 'student', null, 'manual', 0, 0, ENROL_USER_SUSPENDED);
         }
 
+        // Create a student with an active enrolment and suspended account.
+        $this->getDataGenerator()->create_and_enrol($course, 'student', ['suspended' => 1]);
+
         $this->setUser($teacher);
         set_user_preference('grade_report_showonlyactiveenrol', false);
         $assign = $this->create_instance($course, ['grade' => 100]);
 
-        $this->assertCount(10, $assign->list_participants(null, true));
+        $this->assertCount(11, $assign->list_participants(0, true));
     }
 
     public function test_list_participants_with_group_restriction(): void {