mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-21 16:32:18 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch 'MDL-64357_master' of git://github.com/markn86/moodle

Browse Source
This commit is contained in:
Jake Dallimore 2018-12-11 17:43:59 +08:00
commit 85b0a914f0
2 changed files with 43 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mod/lti/service/gradebookservices/classes/local/service/gradebookservices.php
View File

@ -546,9 +546,7 @@ class gradebookservices extends service_base {
$sql = "DELETE
FROM {ltiservice_gradebookservices}
WHERE gradeitemid NOT IN (SELECT id
FROM {grade_items} gi
WHERE gi.itemtype = 'mod'
AND gi.itemmodule = 'lti')";
FROM {grade_items} gi)";
$DB->execute($sql);
}

42
mod/lti/service/gradebookservices/tests/task_cleanup_test.php
View File

@ -100,4 +100,46 @@ class ltiservice_gradebookservices_cleanup_task_testcase extends advanced_testca
$this->assertEquals($gradeitem2->id, $gradebookserviceitem->gradeitemid);
}
/**
* Test the cleanup task with a manual grade item.
*/
public function test_cleanup_task_with_manual_item() {
global $CFG, $DB;
// This is required when running the unit test in isolation.
require_once($CFG->libdir . '/gradelib.php');
// Create a manual grade item for a course.
$course = $this->getDataGenerator()->create_course();
$params = [
'courseid' => $course->id,
'itemtype' => 'manual'
];
$gradeitem = new grade_item($params);
$gradeitem->insert();
// Insert it into the 'ltiservice_gradebookservices' table.
$data = new stdClass();
$data->gradeitemid = $gradeitem->id;
$data->courseid = $course->id;
$DB->insert_record('ltiservice_gradebookservices', $data);
// Run the task.
$task = new \ltiservice_gradebookservices\task\cleanup_task();
$task->execute();
// Check it still exist.
$this->assertEquals(1, $DB->count_records('ltiservice_gradebookservices'));
// Delete the manual item.
$gradeitem->delete();
// Run the task again.
$task = new \ltiservice_gradebookservices\task\cleanup_task();
$task->execute();
// Check it has been removed.
$this->assertEquals(0, $DB->count_records('ltiservice_gradebookservices'));
}
}