update existing files.itemid to questionnaire_response_file.id

Author: srobotta

classes/responsetype/file.php

@@ -135,7 +135,7 @@ public function insert_response($responsedata) {
             $record->question_id = $this->question->id;
             $record->fileid = intval(clean_text($response->answers[$this->question->id][0]->value));
 
-            // When saving the draft file, the itemid was the same as the draftfileid. This must now be
+            // When saving the draft file, the itemid was the same as the draftitemid. This must now be
             // corrected to the primary key that is questionaire_response_file.id to have a correct reference.
             $recordid = $DB->insert_record(static::response_table(), $record);
             if ($recordid) {
@@ -146,7 +146,7 @@ public function insert_response($responsedata) {
                 $siblings = $DB->get_records('files',
                     ['component' => 'mod_questionnaire', 'itemid' => $olditem->itemid]);
                 foreach ($siblings as $sibling) {
-                    if (!$this->fix_file_itemid($recordid, $sibling)) {
+                    if (!self::fix_file_itemid($recordid, $sibling)) {
                         return false;
                     }
                 }
@@ -164,8 +164,11 @@ public function insert_response($responsedata) {
      * @return bool
      * @throws \dml_exception
      */
-    protected function fix_file_itemid(int $recordid, \stdClass $filerecord): bool {
+    public static function fix_file_itemid(int $recordid, \stdClass $filerecord): bool {
         global $DB;
+        if ((int)$filerecord->itemid === $recordid) {
+            return true; // Reference is already good, nothing to do.
+        }
         $fs = get_file_storage();
         $file = $fs->get_file_instance($filerecord);
         $newhash = $fs->get_pathname_hash($filerecord->contextid, $filerecord->component,

db/upgrade.php

@@ -1035,6 +1035,20 @@ function xmldb_questionnaire_upgrade($oldversion=0) {
         upgrade_mod_savepoint(true, 2023101500, 'questionnaire');
     }
 
+    if ($oldversion < 2023101501) {
+        // Upgrade files.itemid with questionnaire_response_file.id
+        $filesresponses = $DB->get_records('questionnaire_response_file', [], '', 'id,fileid');
+        $idmap = [];
+        foreach ($filesresponses as $fileresponse) {
+            $idmap[(int)$fileresponse->fileid] = (int)$fileresponse->id;
+        }
+        $filerecords = $DB->get_records_list('files', 'id', array_keys($idmap), 'id desc');
+        foreach ($filerecords as $filerecord) {
+            \mod_questionnaire\responsetype\file::fix_file_itemid($idmap[(int)$filerecord->id], $filerecord);
+        }
+        upgrade_mod_savepoint(true, 2023101501, 'questionnaire');
+    }
+
     return true;
 }
 

version.php

@@ -25,10 +25,10 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$plugin->version = 2023101500;  // The current module version (Date: YYYYMMDDXX).
+$plugin->version = 2023101501;  // The current module version (Date: YYYYMMDDXX).
 $plugin->requires = 2022112800.00; // Moodle version (4.1.0).
 
 $plugin->component = 'mod_questionnaire';
 
-$plugin->release = '4.1.1 (Build - 2023101500)';
+$plugin->release = '4.1.1 (Build - 2023101501)';
 $plugin->maturity = MATURITY_STABLE;