MDL-86493 mod_quiz: Integration review changes

Author: Fragonite

public/mod/quiz/classes/cache/quiz_overrides_cache.php

@@ -34,29 +34,21 @@ class quiz_overrides_cache implements data_source_interface {
     /** @var ?quiz_overrides_cache Singleton instance. */
     private static $instance = null;
 
-    /**
-     * {@inheritdoc}
-     *
-     * @param definition $definition
-     * @return object
-     */
+    #[\Override]
     public static function get_instance_for_cache(definition $definition): quiz_overrides_cache {
         return self::$instance ??= new quiz_overrides_cache();
     }
 
-    /**
-     * {@inheritdoc}
-     *
-     * @param string|int $key The key to load in the format "{quizid}_{userid}".
-     * @return mixed An array of override records (empty array when none) or false for invalidation.
-     */
+    #[\Override]
     public function load_for_cache($key) {
         global $DB;
 
+        // Core cache invalidation asks datasources for this internal key.
         if ($key === 'lastinvalidation') {
             return false;
         }
 
+        // All regular keys use the "{quizid}_{userid}" format.
         [$quizid, $userid] = self::split_cache_key((string) $key);
 
         $subquery = "SELECT g.id
@@ -69,22 +61,15 @@ public function load_for_cache($key) {
                   FROM {quiz_overrides}
                  WHERE quiz = :quizid AND (userid = :userid OR groupid IN ($subquery))";
 
-        $records = $DB->get_records_sql($sql, [
+        return $DB->get_records_sql($sql, [
             'quizid' => $quizid,
             'userid' => $userid,
             'subqueryquizid' => $quizid,
             'subqueryuserid' => $userid,
         ]);
-
-        return $records ?: [];
     }
 
-    /**
-     * {@inheritdoc}
-     *
-     * @param array $keys An array of keys each of which will be string|int.
-     * @return array An array of matching data items.
-     */
+    #[\Override]
     public function load_many_for_cache(array $keys) {
         $results = [];
         foreach ($keys as $key) {

public/mod/quiz/classes/local/override_manager.php

@@ -616,7 +616,7 @@ private function clear_unused_values(array $formdata): array {
      * @param int $userid The user ID.
      * @return array Array with optional keys 'timeopen' and 'timeclose'.
      */
-    public static function get_time_overrides(int $quizid, int $userid): array {
+    public static function get_effective_open_close_times(int $quizid, int $userid): array {
         $overrides = quiz_overrides_cache_manager::get_overrides($quizid, $userid);
 
         if (empty($overrides)) {

public/mod/quiz/classes/local/quiz_overrides_cache_manager.php

@@ -20,6 +20,7 @@
 
 /**
  * Manages cache operations for quiz overrides.
+ *
  * Please do not use this class directly. Instead, use methods from \mod_quiz\local\override_manager.
  *
  * @package     mod_quiz
@@ -94,9 +95,9 @@ public static function purge_for_groups(int $quizid, array $groupids): void {
         $sql = "SELECT DISTINCT userid
                            FROM {groups_members}
                           WHERE groupid {$insql}";
-        $userids = $DB->get_records_sql($sql, $params);
+        $userids = $DB->get_fieldset_sql($sql, $params);
         if (!empty($userids)) {
-            self::purge_for_users($quizid, array_keys($userids));
+            self::purge_for_users($quizid, $userids);
         }
     }
 
@@ -109,9 +110,16 @@ public static function purge_for_groups(int $quizid, array $groupids): void {
     public static function purge_for_group_members(int $groupid, array $userids): void {
         global $DB;
 
-        $records = $DB->get_records('quiz_overrides', ['groupid' => $groupid], '', 'id,quiz');
-        foreach (array_unique(array_column($records, 'quiz')) as $quizid) {
-            self::purge_for_users($quizid, $userids);
+        if (empty($userids)) {
+            return;
+        }
+
+        $sql = "SELECT DISTINCT quiz
+                  FROM {quiz_overrides}
+                 WHERE groupid = :groupid";
+        $quizids = $DB->get_fieldset_sql($sql, ['groupid' => $groupid]);
+        foreach ($quizids as $quizid) {
+            self::purge_for_users((int) $quizid, $userids);
         }
     }
 
@@ -135,11 +143,11 @@ public static function purge_for_overrides(array $overrides): void {
         }
 
         foreach ($useridsbyquiz as $quizid => $userids) {
-            self::purge_for_users($quizid, array_values(array_unique($userids)));
+            self::purge_for_users($quizid, array_unique($userids));
         }
 
         foreach ($groupidsbyquiz as $quizid => $groupids) {
-            self::purge_for_groups($quizid, array_values(array_unique($groupids)));
+            self::purge_for_groups($quizid, array_unique($groupids));
         }
     }
 

public/mod/quiz/lang/en/deprecated.txt

@@ -7,3 +7,4 @@ randomcoursewithsubcat,mod_quiz
 randomsystemwithsubcat,mod_quiz
 selectquestionbank,mod_quiz
 gobacktoquiz,mod_quiz
+cachedef_overrides,mod_quiz

public/mod/quiz/lang/en/quiz.php

@@ -1169,3 +1169,4 @@
 // Deprecated since Moodle 5.2.
 $string['gobacktoquiz'] = 'Go back';
 $string['selectquestionbank'] = 'Select question bank';
+$string['cachedef_overrides'] = 'User and group override information';

public/mod/quiz/lib.php

@@ -1150,12 +1150,17 @@ function quiz_after_add_or_update($quiz) {
         $feedback->mingrade = $quiz->feedbackboundaries[$i];
         $feedback->maxgrade = $quiz->feedbackboundaries[$i - 1];
         $feedback->id = $DB->insert_record('quiz_feedback', $feedback);
-        $feedbacktext = file_save_draft_area_files((int)$quiz->feedbacktext[$i]['itemid'],
-                $context->id, 'mod_quiz', 'feedback', $feedback->id,
-                ['subdirs' => false, 'maxfiles' => -1, 'maxbytes' => 0],
-                $quiz->feedbacktext[$i]['text']);
+        $feedbacktext = file_save_draft_area_files(
+            (int) $quiz->feedbacktext[$i]['itemid'],
+            $context->id,
+            'mod_quiz',
+            'feedback',
+            $feedback->id,
+            ['subdirs' => false, 'maxfiles' => -1, 'maxbytes' => 0],
+            $quiz->feedbacktext[$i]['text']
+        );
         $DB->set_field('quiz_feedback', 'feedbacktext', $feedbacktext,
-                ['id' => $feedback->id]);
+            ['id' => $feedback->id]);
     }
 
     // Store any settings belonging to the access rules.
@@ -2219,7 +2224,7 @@ function quiz_get_coursemodule_info($coursemodule) {
  */
 function mod_quiz_cm_info_dynamic(cm_info $cm) {
     global $USER;
-    foreach (override_manager::get_time_overrides($cm->instance, $USER->id) as $key => $value) {
+    foreach (override_manager::get_effective_open_close_times($cm->instance, $USER->id) as $key => $value) {
         $cm->override_customdata($key, $value);
     }
 }