L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MDL-40081 completion: clean up criteria records for deleted courses.

Browse Source
This commit is contained in:
Paul Holden
2020-04-06 12:21:57 +01:00
parent 255b396328
commit 63cf950324
4 changed files with 60 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/completionlib.php
+10 -1
View File
@@ -498,7 +498,16 @@ class completion_info {
*/
public function clear_criteria() {
global $DB;
$DB->delete_records('course_completion_criteria', array('course' => $this->course_id));
// Remove completion criteria records for the course itself, and any records that refer to the course.
$select = 'course = :course OR (criteriatype = :type AND courseinstance = :courseinstance)';
$params = [
'course' => $this->course_id,
'type' => COMPLETION_CRITERIA_TYPE_COURSE,
'courseinstance' => $this->course_id,
];
$DB->delete_records_select('course_completion_criteria', $select, $params);
$DB->delete_records('course_completion_aggr_methd', array('course' => $this->course_id));
$this->delete_course_completion_data();
lib/db/upgrade.php
+11
View File
@@ -3848,5 +3848,16 @@ function xmldb_main_upgrade($oldversion) {
upgrade_main_savepoint(true, 2019111801.05);
}
if ($oldversion < 2019111802.05) {
// Clean up completion criteria records referring to courses that no longer exist.
$select = 'criteriatype = :type AND courseinstance NOT IN (SELECT id FROM {course})';
$params = ['type' => 8]; // COMPLETION_CRITERIA_TYPE_COURSE.
$DB->delete_records_select('course_completion_criteria', $select, $params);
// Main savepoint reached.
upgrade_main_savepoint(true, 2019111802.05);
}
return true;
}
lib/tests/completionlib_test.php
+38
View File
@@ -875,6 +875,44 @@ class core_completionlib_testcase extends advanced_testcase {
$this->assertFalse($c2->has_activities());
}
/**
* Test that data is cleaned up when we delete courses that are set as completion criteria for other courses
*
* @return void
*/
public function test_course_delete_prerequisite() {
global $DB;
$this->setup_data();
$courseprerequisite = $this->getDataGenerator()->create_course(['enablecompletion' => true]);
$criteriadata = (object) [
'id' => $this->course->id,
'criteria_course' => [$courseprerequisite->id],
];
/** @var completion_criteria_course $criteria */
$criteria = completion_criteria::factory(['criteriatype' => COMPLETION_CRITERIA_TYPE_COURSE]);
$criteria->update_config($criteriadata);
// Sanity test.
$this->assertTrue($DB->record_exists('course_completion_criteria', [
'course' => $this->course->id,
'criteriatype' => COMPLETION_CRITERIA_TYPE_COURSE,
'courseinstance' => $courseprerequisite->id,
]));
// Deleting the prerequisite course should remove the completion criteria.
delete_course($courseprerequisite, false);
$this->assertFalse($DB->record_exists('course_completion_criteria', [
'course' => $this->course->id,
'criteriatype' => COMPLETION_CRITERIA_TYPE_COURSE,
'courseinstance' => $courseprerequisite->id,
]));
}
/**
* Test course module completion update event.
*/
version.php
+1 -1
View File
@@ -29,7 +29,7 @@
defined('MOODLE_INTERNAL') || die();
$version = 2019111802.04; // 20191118 = branching date YYYYMMDD - do not modify!
$version = 2019111802.05; // 20191118 = branching date YYYYMMDD - do not modify!
// RR = release increments - 00 in DEV branches.
// .XX = incremental changes.
$release = '3.8.2+ (Build: 20200402)'; // Human-friendly version name