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

Merge branch 'MDL-63626-master' of git://github.com/rezaies/moodle

Browse Source
This commit is contained in:
Andrew Nicols 2018-10-30 10:57:42 +08:00
commit e538fc1549
2 changed files with 57 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
mod/quiz/classes/privacy/provider.php
View File

@ -133,6 +133,30 @@ class provider implements
* @return contextlist $contextlist The contextlist containing the list of contexts used in this plugin. * @return contextlist $contextlist The contextlist containing the list of contexts used in this plugin.
*/ */
public static function get_contexts_for_userid(int $userid) : contextlist { public static function get_contexts_for_userid(int $userid) : contextlist {
$resultset = new contextlist();
// Users who attempted the quiz.
$sql = "SELECT c.id
FROM {context} c
JOIN {course_modules} cm ON cm.id = c.instanceid AND c.contextlevel = :contextlevel
JOIN {modules} m ON m.id = cm.module AND m.name = :modname
JOIN {quiz} q ON q.id = cm.instance
JOIN {quiz_attempts} qa ON qa.quiz = q.id
WHERE qa.userid = :userid AND qa.preview = 0";
$params = ['contextlevel' => CONTEXT_MODULE, 'modname' => 'quiz', 'userid' => $userid];
$resultset->add_from_sql($sql, $params);
// Users with quiz overrides.
$sql = "SELECT c.id
FROM {context} c
JOIN {course_modules} cm ON cm.id = c.instanceid AND c.contextlevel = :contextlevel
JOIN {modules} m ON m.id = cm.module AND m.name = :modname
JOIN {quiz} q ON q.id = cm.instance
JOIN {quiz_overrides} qo ON qo.quiz = q.id
WHERE qo.userid = :userid";
$params = ['contextlevel' => CONTEXT_MODULE, 'modname' => 'quiz', 'userid' => $userid];
$resultset->add_from_sql($sql, $params);
// Get the SQL used to link indirect question usages for the user. // Get the SQL used to link indirect question usages for the user.
// This includes where a user is the manual marker on a question attempt. // This includes where a user is the manual marker on a question attempt.
$qubaid = \core_question\privacy\provider::get_related_question_usages_for_user('rel', 'mod_quiz', 'qa.uniqueid', $userid); $qubaid = \core_question\privacy\provider::get_related_question_usages_for_user('rel', 'mod_quiz', 'qa.uniqueid', $userid);
@ -144,33 +168,16 @@ class provider implements
JOIN {modules} m ON m.id = cm.module AND m.name = :modname JOIN {modules} m ON m.id = cm.module AND m.name = :modname
JOIN {quiz} q ON q.id = cm.instance JOIN {quiz} q ON q.id = cm.instance
JOIN {quiz_attempts} qa ON qa.quiz = q.id JOIN {quiz_attempts} qa ON qa.quiz = q.id
LEFT JOIN {quiz_overrides} qo ON qo.quiz = q.id AND qo.userid = :qouserid
" . $qubaid->from . " " . $qubaid->from . "
WHERE ( WHERE " . $qubaid->where() . " AND qa.preview = 0";
qa.userid = :qauserid OR $params = ['contextlevel' => CONTEXT_MODULE, 'modname' => 'quiz'] + $qubaid->from_where_params();
" . $qubaid->where() . " OR
qo.id IS NOT NULL
) AND qa.preview = 0
";
$params = array_merge(
[
'contextlevel' => CONTEXT_MODULE,
'modname' => 'quiz',
'qauserid' => $userid,
'qouserid' => $userid,
],
$qubaid->from_where_params()
);
$resultset = new contextlist();
$resultset->add_from_sql($sql, $params); $resultset->add_from_sql($sql, $params);
return $resultset; return $resultset;
} }
/** /**
* Delete all data for all users in the specified context. * Export all user data for the specified user, in the specified contexts.
* *
* @param approved_contextlist $contextlist The approved contexts to export information for. * @param approved_contextlist $contextlist The approved contexts to export information for.
*/ */

30
mod/quiz/tests/privacy_provider_test.php
View File

@ -56,6 +56,36 @@ class mod_quiz_privacy_provider_testcase extends \core_privacy\tests\provider_te
$this->assertEmpty($contextlist); $this->assertEmpty($contextlist);
} }
/**
* Test for provider::get_contexts_for_userid() when there is no quiz attempt at all.
*/
public function test_get_contexts_for_userid_no_attempt_with_override() {
global $DB;
$this->resetAfterTest(true);
$course = $this->getDataGenerator()->create_course();
$user = $this->getDataGenerator()->create_user();
// Make a quiz with an override.
$this->setUser();
$quiz = $this->create_test_quiz($course);
$DB->insert_record('quiz_overrides', [
'quiz' => $quiz->id,
'userid' => $user->id,
'timeclose' => 1300,
'timelimit' => null,
]);
$cm = get_coursemodule_from_instance('quiz', $quiz->id);
$context = \context_module::instance($cm->id);
// Fetch the contexts - only one context should be returned.
$this->setUser();
$contextlist = provider::get_contexts_for_userid($user->id);
$this->assertCount(1, $contextlist);
$this->assertEquals($context, $contextlist->current());
}
/** /**
* The export function should handle an empty contextlist properly. * The export function should handle an empty contextlist properly.
*/ */