fixup! MDL-70854 core: Add trait for tasks to use when their progress…

… should be stored. Add the new trait to delete_unconfirmed_users_task fixup! fixup! MDL-70854 core: Add trait for tasks to use when their progress should be stored.
marxjohnson · May 10, 2024 · c8e66aa · c8e66aa
1 parent 999c905
commit c8e66aa
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 6 deletions.
diff --git a/lib/classes/task/delete_unconfirmed_users_task.php b/lib/classes/task/delete_unconfirmed_users_task.php
@@ -27,6 +27,7 @@
  * Simple task to delete user accounts for users who have not confirmed in time.
  */
 class delete_unconfirmed_users_task extends scheduled_task {
+    use stored_progress_task_trait;
 
     /**
      * Get a descriptive name for this task (shown to admins).
@@ -48,14 +49,23 @@ public function execute() {
 
         // Delete users who haven't confirmed within required period.
         if (!empty($CFG->deleteunconfirmed)) {
+            $this->start_stored_progress();
             $cuttime = $timenow - ($CFG->deleteunconfirmed * 3600);
-            $rs = $DB->get_recordset_sql ("SELECT *
-                                             FROM {user}
-                                            WHERE confirmed = 0 AND timecreated > 0
-                                                  AND timecreated < ? AND deleted = 0", array($cuttime));
+            $selectcount = "SELECT COUNT(*)";
+            $select = "SELECT *";
+            $sql = "
+                  FROM {user}
+                 WHERE confirmed = 0 AND timecreated > 0
+                       AND timecreated < ? AND deleted = 0";
+            $params = [$cuttime];
+            $count = $DB->count_records_sql($selectcount . $sql, $params);
+            $rs = $DB->get_recordset_sql($select . $sql, $params);
+            $processed = 0;
             foreach ($rs as $user) {
                 delete_user($user);
-                mtrace(" Deleted unconfirmed user ".fullname($user, true)." ($user->id)");
+                $message = " Deleted unconfirmed user ".fullname($user, true)." ($user->id)";
+                $processed++;
+                $this->progress->update($processed, $count, $message);
             }
             $rs->close();
         }

diff --git a/lib/classes/task/stored_progress_task_trait.php b/lib/classes/task/stored_progress_task_trait.php
@@ -26,7 +26,7 @@
  */
 trait stored_progress_task_trait {
 
-    /** @var stored_progress_bar|null $progress */
+    /** @var \core\stored_progress_bar|null $progress */
     protected $progress = null;
 
     /**