mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-18 05:58:34 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'MDL-80930-main' of https://github.com/raortegar/moodle

Browse Source
This commit is contained in:
Sara Arjona 2024-03-05 15:24:45 +01:00
commit debcea9cbc
No known key found for this signature in database
2 changed files with 47 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
course/classes/task/course_delete_modules.php
View File

@ -61,13 +61,39 @@ class course_delete_modules extends \core\task\adhoc_task {
}
$cms = $this->get_custom_data()->cms;
foreach ($cms as $cm) {
$exceptions = [];
$cmsfailed = [];
foreach ($cms as $key => $cm) {
try {
course_delete_module($cm->id);
} catch (\Exception $e) {
throw new \coding_exception("The course module {$cm->id} could not be deleted. "
. "{$e->getMessage()}: {$e->getFile()}({$e->getLine()}) {$e->getTraceAsString()}");
// Keep the information instead of throw an exception and continue with next cms.
$exceptions[] = ("The course module {$cm->id} could not be deleted. "
. "{$e->getMessage()}: {$e->getFile()}({$e->getLine()}) {$e->getTraceAsString()}");
// Save the cms that has failed to set the data only with this values.
$cmsfailed[$key] = $cm;
continue;
}
}
// Throw the existing exceptions if there is any.
if (!empty($exceptions)) {
// Save the failed CMS.
$customdata = $this->get_custom_data();
$customdata->cms = $cmsfailed;
$this->set_custom_data($customdata);
throw new \coding_exception("The following course modules could not be deleted:\n " .
implode('\n', $exceptions));
}
}
/**
* Sets attemptsavailable to false.
*
* @return boolean
*/
public function retry_until_success(): bool {
return false;
}
}

24
course/tests/course_delete_modules_test.php
View File

@ -56,7 +56,7 @@ class course_delete_modules_test extends \advanced_testcase {
$data = [
'cms' => [$assigncm],
'userid' => $user->id,
'realuserid' => $user->id
'realuserid' => $user->id,
];
$removaltask->set_custom_data($data);
$removaltask->execute();
@ -64,13 +64,14 @@ class course_delete_modules_test extends \advanced_testcase {
// The module has deleted from the course.
$coursedmodules = get_course_mods($course->id);
$this->assertCount(0, $coursedmodules);
}
/**
* Test to have a message in the exception.
* Test with failed and successful cms
*
* @covers ::course_delete_modules
*/
public function test_delete_module_exception() {
public function test_delete_module_exception(): void {
global $DB;
$this->resetAfterTest();
@ -86,12 +87,19 @@ class course_delete_modules_test extends \advanced_testcase {
$module->name = 'TestModuleToDelete';
$DB->update_record('modules', $module);
// Generate successful test data.
$quiz1 = $generator->create_module('quiz', ['course' => $course]);
$quizcm1 = get_coursemodule_from_id('quiz', $quiz1->cmid);
$quiz2 = $generator->create_module('quiz', ['course' => $course]);
$quizcm2 = get_coursemodule_from_id('quiz', $quiz2->cmid);
// Execute the task.
$removaltask = new \core_course\task\course_delete_modules();
$data = [
'cms' => [$assigncm],
'cms' => [$quizcm1, $assigncm, $quizcm2],
'userid' => $user->id,
'realuserid' => $user->id
'realuserid' => $user->id,
];
$removaltask->set_custom_data($data);
try {
@ -113,5 +121,9 @@ class course_delete_modules_test extends \advanced_testcase {
// Assert the error message has correct line number.
$this->assertMatchesRegularExpression($regex, $errormsg);
}
// The success modules have been deleted from the course, and only the failed module is in the course.
$coursedmodules = get_course_mods($course->id);
$this->assertCount(1, $coursedmodules);
}
}