MDL-46455 events: added more mapping

Also fixed a few bugs.

admin/tool/langimport/classes/event/langpack_imported.php

@@ -112,4 +112,9 @@ protected function validate_data() {
             throw new \coding_exception('The \'langcode\' value must be set to a valid language code');
         }
     }
+
+    public static function get_other_mapping() {
+        // No mapping required for this event because this event is not backed up.
+        return false;
+    }
 }

admin/tool/langimport/classes/event/langpack_removed.php

@@ -113,4 +113,9 @@ protected function validate_data() {
             throw new \coding_exception('The \'langcode\' value must be set to a valid language code');
         }
     }
+
+    public static function get_other_mapping() {
+        // No mapping required for this event because this event is not backed up.
+        return false;
+    }
 }

admin/tool/langimport/classes/event/langpack_updated.php

@@ -112,4 +112,9 @@ protected function validate_data() {
             throw new \coding_exception('The \'langcode\' value must be set to a valid language code');
         }
     }
+
+    public static function get_other_mapping() {
+        // No mapping required for this event because this event is not backed up.
+        return false;
+    }
 }

lib/classes/event/badge_awarded.php

@@ -98,4 +98,11 @@ protected function validate_data() {
     public static function get_objectid_mapping() {
         return array('db' => 'badge', 'restore' => 'badge');
     }
+
+    public static function get_other_mapping() {
+        $othermapped = array();
+        $othermapped['badgeissuedid'] = array('db' => 'badge_issued', 'restore' => base::NOT_MAPPED);
+
+        return $othermapped;
+    }
 }

lib/classes/event/blog_entries_viewed.php

@@ -109,6 +109,8 @@ protected function get_legacy_logdata() {
 
     public static function get_other_mapping() {
         $othermapped = array();
+        $othermapped['entryid'] = array('db' => 'post', 'restore' => base::NOT_MAPPED);
+        $othermapped['tagid'] = array('db' => 'tag', 'restore' => base::NOT_MAPPED);
         $othermapped['userid'] = array('db' => 'user', 'restore' => 'user');
         $othermapped['modid'] = array('db' => 'course_modules', 'restore' => 'course_module');
         $othermapped['groupid'] = array('db' => 'groups', 'restore' => 'group');

lib/classes/event/comment_created.php

@@ -102,11 +102,13 @@ protected function validate_data() {
     }
 
     public static function get_objectid_mapping() {
-        return array('db' => 'comment', 'restore' => 'comment');
+        return array('db' => 'comments', 'restore' => 'comment');
     }
 
     public static function get_other_mapping() {
         // We cannot map fields that do not have a 1:1 mapping.
-        return false;
+        $othermapped = array();
+        $othermapped['itemid'] = base::NOT_MAPPED;
+        return $othermapped;
     }
 }

lib/classes/event/comment_deleted.php

@@ -102,11 +102,13 @@ protected function validate_data() {
     }
 
     public static function get_objectid_mapping() {
-        return array('db' => 'comment', 'restore' => 'comment');
+        return array('db' => 'comments', 'restore' => 'comment');
     }
 
     public static function get_other_mapping() {
         // We cannot map fields that do not have a 1:1 mapping.
-        return false;
+        $othermapped = array();
+        $othermapped['itemid'] = base::NOT_MAPPED;
+        return $othermapped;
     }
 }

lib/classes/event/course_category_deleted.php

@@ -141,4 +141,9 @@ public static function get_objectid_mapping() {
         // Categories are not backed up, so no need to map them.
         return false;
     }
+
+    public static function get_other_mapping() {
+        // Categories are not backed up, so no need to map them.
+        return false;
+    }
 }

lib/classes/event/course_completed.php

@@ -137,7 +137,7 @@ protected function validate_data() {
 
     public static function get_objectid_mapping() {
         // Sorry - there is no mapping available for completion records.
-        return false;
+        return array('db' => 'course_completions', 'restore' => base::NOT_MAPPED);
     }
 
     public static function get_other_mapping() {

lib/classes/event/course_created.php

@@ -123,4 +123,9 @@ protected function validate_data() {
     public static function get_objectid_mapping() {
         return array('db' => 'course', 'restore' => 'course');
     }
+
+    public static function get_other_mapping() {
+        // Nothing to map.
+        return false;
+    }
 }

lib/classes/event/course_deleted.php

@@ -118,4 +118,9 @@ protected function validate_data() {
     public static function get_objectid_mapping() {
         return array('db' => 'course', 'restore' => 'course');
     }
+
+    public static function get_other_mapping() {
+        // Nothing to map.
+        return false;
+    }
 }

lib/classes/event/course_module_completion_updated.php

@@ -29,6 +29,12 @@
 /**
  * Course module completion event class.
  *
+ * @property-read array $other {
+ *      Extra information about event.
+ *
+ *      - int relateduserid: (optional) the related user id.
+ * }
+ *
  * @package    core
  * @since      Moodle 2.6
  * @copyright  2013 Rajesh Taneja <[email protected]>
@@ -110,6 +116,13 @@ protected function validate_data() {
 
     public static function get_objectid_mapping() {
         // Sorry mapping info is not available for course modules completion records.
-        return false;
+        return array('db' => 'course_modules_completions', 'restore' => base::NOT_MAPPED);
+    }
+
+    public static function get_other_mapping() {
+        $othermapped = array();
+        $othermapped['relateduserid'] = array('db' => 'user', 'restore' => 'user');
+
+        return $othermapped;
     }
 }

lib/classes/event/course_module_created.php

@@ -171,7 +171,10 @@ public static function get_objectid_mapping() {
     }
 
     public static function get_other_mapping() {
-        return false;
+        $othermapped = array();
+        $othermapped['instanceid'] = base::NOT_MAPPED;
+
+        return $othermapped;
     }
 }
 

lib/classes/event/course_module_deleted.php

@@ -123,5 +123,12 @@ protected function validate_data() {
     public static function get_objectid_mapping() {
         return array('db' => 'course_modules', 'restore' => 'course_module');
     }
+
+    public static function get_other_mapping() {
+        $othermapped = array();
+        $othermapped['instanceid'] = base::NOT_MAPPED;
+
+        return $othermapped;
+    }
 }
 

lib/classes/event/course_module_updated.php

@@ -169,7 +169,10 @@ public static function get_objectid_mapping() {
     }
 
     public static function get_other_mapping() {
-        return false;
+        $othermapping = array();
+        $othermapping['instanceid'] = base::NOT_MAPPED;
+
+        return $othermapping;
     }
 }
 

lib/classes/event/course_restored.php

@@ -141,4 +141,9 @@ protected function validate_data() {
     public static function get_objectid_mapping() {
         return array('db' => 'course', 'restore' => 'course');
     }
+
+    public static function get_other_mapping() {
+        // No need to map anything.
+        return false;
+    }
 }

lib/classes/event/course_section_updated.php

@@ -108,4 +108,9 @@ protected function validate_data() {
     public static function get_objectid_mapping() {
         return array('db' => 'course_sections', 'restore' => 'course_section');
     }
+
+    public static function get_other_mapping() {
+        // Nothing to map.
+        return false;
+    }
 }

lib/classes/event/course_updated.php

@@ -121,4 +121,9 @@ protected function get_legacy_logdata() {
     public static function get_objectid_mapping() {
         return array('db' => 'course', 'restore' => 'course');
     }
+
+    public static function get_other_mapping() {
+        // Nothing to map.
+        return false;
+    }
 }

lib/classes/event/course_user_report_viewed.php

@@ -114,4 +114,9 @@ protected function validate_data() {
             throw new \coding_exception('The \'mode\' value must be set in other.');
         }
     }
+
+    public static function get_other_mapping() {
+        // Nothing to map.
+        return false;
+    }
 }

lib/classes/event/email_failed.php

@@ -30,6 +30,14 @@
 /**
  * Email failed event class.
  *
+ * @property-read array $other {
+ *      Extra information about event.
+ *
+ *      - string subject: the message subject.
+ *      - string message: the message text.
+ *      - string errorinfo: the error info.
+ * }
+ *
  * @package    core
  * @since      Moodle 2.7
  * @copyright  2013 Mark Nelson <[email protected]>

lib/classes/event/enrol_instance_created.php

@@ -106,4 +106,13 @@ protected function validate_data() {
             throw new \coding_exception('The \'enrol\' value must be set in other.');
         }
     }
+
+    public static function get_objectid_mapping() {
+        return array('db' => 'enrol', 'restore' => 'enrol');
+    }
+
+    public static function get_other_mapping() {
+        // Nothing to map.
+        return false;
+    }
 }

lib/classes/event/enrol_instance_deleted.php

@@ -107,4 +107,13 @@ protected function validate_data() {
             throw new \coding_exception('The \'enrol\' value must be set in other.');
         }
     }
+
+    public static function get_objectid_mapping() {
+        return array('db' => 'enrol', 'restore' => 'enrol');
+    }
+
+    public static function get_other_mapping() {
+        // Nothing to map.
+        return false;
+    }
 }

lib/classes/event/enrol_instance_updated.php

@@ -107,4 +107,13 @@ protected function validate_data() {
             throw new \coding_exception('The \'enrol\' value must be set in other.');
         }
     }
+
+    public static function get_objectid_mapping() {
+        return array('db' => 'enrol', 'restore' => 'enrol');
+    }
+
+    public static function get_other_mapping() {
+        // Nothing to map.
+        return false;
+    }
 }

lib/classes/event/grade_deleted.php

@@ -135,4 +135,11 @@ protected function validate_data() {
     public static function get_objectid_mapping() {
         return array('db' => 'grade_grades', 'restore' => 'grade_grades');
     }
+
+    public static function get_other_mapping() {
+        $othermapped = array();
+        $othermapped['itemid'] = array('db' => 'grade_items', 'restore' => 'grade_item');
+
+        return $othermapped;
+    }
 }

lib/classes/event/group_member_added.php

@@ -131,7 +131,9 @@ public static function get_objectid_mapping() {
     }
 
     public static function get_other_mapping() {
-        // Nothing to map.
-        return false;
+        $othermapped = array();
+        $othermapped['itemid'] = base::NOT_MAPPED;
+
+        return $othermapped;
     }
 }

lib/classes/event/notes_viewed.php

@@ -86,14 +86,4 @@ protected function get_legacy_logdata() {
         return array($this->courseid, 'notes', 'view', 'index.php?course=' . $this->courseid.'&user=' . $this->relateduserid,
             'view notes');
     }
-
-    public static function get_objectid_mapping() {
-        // Notes are not backed up, so no need to map.
-        return false;
-    }
-
-    public static function get_other_mapping() {
-        // Notes are not backed up, so no need to map.
-        return false;
-    }
 }

lib/classes/event/role_assigned.php

@@ -137,7 +137,10 @@ public static function get_objectid_mapping() {
     }
 
     public static function get_other_mapping() {
-        // Nothing mappable.
-        return false;
+        $othermapped = array();
+        $othermapped['id'] = array('db' => 'role_assignments', 'restore' => base::NOT_MAPPED);
+        $othermapped['itemid'] = base::NOT_MAPPED;
+
+        return $othermapped;
     }
 }

lib/classes/event/role_deleted.php

@@ -106,4 +106,9 @@ protected function validate_data() {
     public static function get_objectid_mapping() {
         return array('db' => 'role', 'restore' => 'role');
     }
+
+    public static function get_other_mapping() {
+        // Nothing to map.
+        return false;
+    }
 }

lib/classes/event/role_unassigned.php

@@ -134,6 +134,10 @@ public static function get_objectid_mapping() {
     }
 
     public static function get_other_mapping() {
-        return false;
+        $othermapped = array();
+        $othermapped['id'] = array('db' => 'role_assignments', 'restore' => base::NOT_MAPPED);
+        $othermapped['itemid'] = base::NOT_MAPPED;
+
+        return $othermapped;
     }
 }

lib/classes/event/tag_added.php

@@ -119,12 +119,15 @@ protected function validate_data() {
     }
 
     public static function get_objectid_mapping() {
-        // Tags cannot be mapped by id.
-        return false;
+        // Tags cannot be mapped.
+        return array('db' => 'tag_instance', 'restore' => base::NOT_MAPPED);
     }
 
     public static function get_other_mapping() {
-        return false;
-    }
+        $othermapped = array();
+        $othermapped['tagid'] = array('db' => 'tag', 'restore' => base::NOT_MAPPED);
+        $othermapped['itemid'] = base::NOT_MAPPED;
 
+        return $othermapped;
+    }
 }

lib/classes/event/tag_created.php

@@ -89,8 +89,8 @@ protected function validate_data() {
     }
 
     public static function get_objectid_mapping() {
-        // Tags cannot be mapped by id.
-        return false;
+        // Tags cannot be mapped.
+        return array('db' => 'tag', 'restore' => base::NOT_MAPPED);
     }
 
     public static function get_other_mapping() {

lib/classes/event/tag_deleted.php

@@ -89,8 +89,8 @@ protected function validate_data() {
     }
 
     public static function get_objectid_mapping() {
-        // Tags cannot be mapped by id.
-        return false;
+        // Tags cannot be mapped.
+        return array('db' => 'tag', 'restore' => base::NOT_MAPPED);
     }
 
     public static function get_other_mapping() {