moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-07 18:06:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

MDL-9367 restore: Roll only configuration dates

Browse source 
It was decided to roll only configuration dates and any date related to user content
such as 'timecreated' , 'timemodified' etc should not be rolled forward.
This commit is contained in:
Ankit Agarwal 2017-06-29 13:38:47 +05:30
parent d509f80c48
commit 0d14fcbc60
57 changed files with 1617 additions and 74 deletions
Download patch file Download diff file Expand all files Collapse all files

11
mod/quiz/backup/moodle2/restore_quiz_stepslib.php
View file

@ -101,10 +101,11 @@ class restore_quiz_activity_structure_step extends restore_questions_activity_st
$oldid = $data->id;
$data->course = $this->get_courseid();
// Any changes to the list of dates that needs to be rolled should be same during course restore and course reset.
// See MDL-9367.
$data->timeopen = $this->apply_date_offset($data->timeopen);
$data->timeclose = $this->apply_date_offset($data->timeclose);
$data->timecreated = $this->apply_date_offset($data->timecreated);
$data->timemodified = $this->apply_date_offset($data->timemodified);
if (property_exists($data, 'questions')) {
// Needed by {@link process_quiz_attempt_legacy}, in which case it will be present.
@ -359,8 +360,6 @@ class restore_quiz_activity_structure_step extends restore_questions_activity_st
$data->userid = $this->get_mappingid('user', $data->userid);
$data->grade = $data->gradeval;
$data->timemodified = $this->apply_date_offset($data->timemodified);
$DB->insert_record('quiz_grades', $data);
}
@ -372,10 +371,6 @@ class restore_quiz_activity_structure_step extends restore_questions_activity_st
$data->userid = $this->get_mappingid('user', $data->userid);
$data->timestart = $this->apply_date_offset($data->timestart);
$data->timefinish = $this->apply_date_offset($data->timefinish);
$data->timemodified = $this->apply_date_offset($data->timemodified);
if (!empty($data->timecheckstate)) {
$data->timecheckstate = $this->apply_date_offset($data->timecheckstate);
} else {

2
mod/quiz/lib.php
View file

@ -1556,6 +1556,8 @@ function quiz_reset_userdata($data) {
WHERE quiz IN (SELECT id FROM {quiz} WHERE course = ?)
AND timeclose <> 0", array($data->timeshift, $data->courseid));
// Any changes to the list of dates that needs to be rolled should be same during course restore and course reset.
// See MDL-9367.
shift_course_mod_dates('quiz', array('timeopen', 'timeclose'),
$data->timeshift, $data->courseid);

116
mod/quiz/tests/restore_date_test.php Normal file
View file

@ -0,0 +1,116 @@
<?php
// This file is part of Moodle - http://moodle.org/
//
// Moodle is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// Moodle is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
/**
* Restore date tests.
*
* @package mod_quiz
* @copyright 2017 onwards Ankit Agarwal <ankit.agrr@gmail.com>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
defined('MOODLE_INTERNAL') || die();
global $CFG;
require_once($CFG->libdir . "/phpunit/classes/restore_date_testcase.php");
/**
* Restore date tests.
*
* @package mod_quiz
* @copyright 2017 onwards Ankit Agarwal <ankit.agrr@gmail.com>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
class mod_quiz_restore_date_testcase extends restore_date_testcase
{
/**
* Test restore dates.
*/
public function test_restore_dates() {
global $DB, $USER;
// Create quiz data.
$record = ['timeopen' => 100, 'timeclose' => 100, 'timemodified' => 100, 'tiemcreated' => 100, 'questionsperpage' => 0,
'grade' => 100.0, 'sumgrades' => 2];
list($course, $quiz) = $this->create_course_and_module('quiz', $record);
// Create questions.
$questiongenerator = $this->getDataGenerator()->get_plugin_generator('core_question');
$cat = $questiongenerator->create_question_category();
$saq = $questiongenerator->create_question('shortanswer', null, array('category' => $cat->id));
// Add to the quiz.
quiz_add_quiz_question($saq->id, $quiz);
// Create an attempt.
$timestamp = 100;
$quizobj = quiz::create($quiz->id);
$attempt = quiz_create_attempt($quizobj, 1, false, $timestamp, false);
$quba = question_engine::make_questions_usage_by_activity('mod_quiz', $quizobj->get_context());
$quba->set_preferred_behaviour($quizobj->get_quiz()->preferredbehaviour);
quiz_start_new_attempt($quizobj, $quba, $attempt, 1, $timestamp);
quiz_attempt_save_started($quizobj, $quba, $attempt);
// Quiz grade.
$grade = new stdClass();
$grade->quiz = $quiz->id;
$grade->userid = $USER->id;
$grade->grade = 8.9;
$grade->timemodified = $timestamp;
$grade->id = $DB->insert_record('quiz_grades', $grade);
// User override.
$override = (object)[
'quiz' => $quiz->id,
'groupid' => 0,
'userid' => $USER->id,
'sortorder' => 1,
'timeopen' => 100,
'timeclose' => 200
];
$DB->insert_record('quiz_overrides', $override);
// Set time fields to a constant for easy validation.
$DB->set_field('quiz_attempts', 'timefinish', $timestamp);
// Do backup and restore.
$newcourseid = $this->backup_and_restore($course);
$newquiz = $DB->get_record('quiz', ['course' => $newcourseid]);
$this->assertFieldsNotRolledForward($quiz, $newquiz, ['timecreated', 'timemodified']);
$props = ['timeclose', 'timeopen'];
$this->assertFieldsRolledForward($quiz, $newquiz, $props);
$newattempt = $DB->get_record('quiz_attempts', ['quiz' => $newquiz->id]);
$newoverride = $DB->get_record('quiz_overrides', ['quiz' => $newquiz->id]);
$newgrade = $DB->get_record('quiz_grades', ['quiz' => $newquiz->id]);
// Attempt time checks.
$diff = $this->get_diff();
$this->assertEquals($timestamp, $newattempt->timemodified);
$this->assertEquals($timestamp, $newattempt->timefinish);
$this->assertEquals($timestamp, $newattempt->timestart);
$this->assertEquals($timestamp + $diff, $newattempt->timecheckstate); // Should this be rolled?
// Quiz override time checks.
$diff = $this->get_diff();
$this->assertEquals($override->timeopen + $diff, $newoverride->timeopen);
$this->assertEquals($override->timeclose + $diff, $newoverride->timeclose);
// Quiz grade time checks.
$this->assertEquals($grade->timemodified, $newgrade->timemodified);
}
}