mirror of
https://github.com/moodle/moodle.git
synced 2025-08-05 08:56:36 +02:00
MDL-9367 restore: Roll only configuration dates
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:
parent
d509f80c48
commit
0d14fcbc60
57 changed files with 1617 additions and 74 deletions
|
@ -104,7 +104,8 @@ class restore_workshop_activity_structure_step extends restore_activity_structur
|
|||
$oldid = $data->id;
|
||||
$data->course = $this->get_courseid();
|
||||
|
||||
$data->timemodified = $this->apply_date_offset($data->timemodified);
|
||||
// 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->submissionstart = $this->apply_date_offset($data->submissionstart);
|
||||
$data->submissionend = $this->apply_date_offset($data->submissionend);
|
||||
$data->assessmentstart = $this->apply_date_offset($data->assessmentstart);
|
||||
|
@ -125,8 +126,6 @@ class restore_workshop_activity_structure_step extends restore_activity_structur
|
|||
$data->workshopid = $this->get_new_parentid('workshop');
|
||||
$data->example = 1;
|
||||
$data->authorid = $this->task->get_userid();
|
||||
$data->timecreated = $this->apply_date_offset($data->timecreated);
|
||||
$data->timemodified = $this->apply_date_offset($data->timemodified);
|
||||
|
||||
$newitemid = $DB->insert_record('workshop_submissions', $data);
|
||||
$this->set_mapping('workshop_examplesubmission', $oldid, $newitemid, true); // Mapping with files
|
||||
|
@ -140,8 +139,6 @@ class restore_workshop_activity_structure_step extends restore_activity_structur
|
|||
|
||||
$data->submissionid = $this->get_new_parentid('workshop_examplesubmission');
|
||||
$data->reviewerid = $this->task->get_userid();
|
||||
$data->timecreated = $this->apply_date_offset($data->timecreated);
|
||||
$data->timemodified = $this->apply_date_offset($data->timemodified);
|
||||
|
||||
$newitemid = $DB->insert_record('workshop_assessments', $data);
|
||||
$this->set_mapping('workshop_referenceassessment', $oldid, $newitemid, true); // Mapping with files
|
||||
|
@ -155,8 +152,6 @@ class restore_workshop_activity_structure_step extends restore_activity_structur
|
|||
|
||||
$data->submissionid = $this->get_new_parentid('workshop_examplesubmission');
|
||||
$data->reviewerid = $this->get_mappingid('user', $data->reviewerid);
|
||||
$data->timecreated = $this->apply_date_offset($data->timecreated);
|
||||
$data->timemodified = $this->apply_date_offset($data->timemodified);
|
||||
|
||||
$newitemid = $DB->insert_record('workshop_assessments', $data);
|
||||
$this->set_mapping('workshop_exampleassessment', $oldid, $newitemid, true); // Mapping with files
|
||||
|
@ -171,8 +166,6 @@ class restore_workshop_activity_structure_step extends restore_activity_structur
|
|||
$data->workshopid = $this->get_new_parentid('workshop');
|
||||
$data->example = 0;
|
||||
$data->authorid = $this->get_mappingid('user', $data->authorid);
|
||||
$data->timecreated = $this->apply_date_offset($data->timecreated);
|
||||
$data->timemodified = $this->apply_date_offset($data->timemodified);
|
||||
|
||||
$newitemid = $DB->insert_record('workshop_submissions', $data);
|
||||
$this->set_mapping('workshop_submission', $oldid, $newitemid, true); // Mapping with files
|
||||
|
@ -186,8 +179,6 @@ class restore_workshop_activity_structure_step extends restore_activity_structur
|
|||
|
||||
$data->submissionid = $this->get_new_parentid('workshop_submission');
|
||||
$data->reviewerid = $this->get_mappingid('user', $data->reviewerid);
|
||||
$data->timecreated = $this->apply_date_offset($data->timecreated);
|
||||
$data->timemodified = $this->apply_date_offset($data->timemodified);
|
||||
|
||||
$newitemid = $DB->insert_record('workshop_assessments', $data);
|
||||
$this->set_mapping('workshop_assessment', $oldid, $newitemid, true); // Mapping with files
|
||||
|
@ -201,7 +192,6 @@ class restore_workshop_activity_structure_step extends restore_activity_structur
|
|||
|
||||
$data->workshopid = $this->get_new_parentid('workshop');
|
||||
$data->userid = $this->get_mappingid('user', $data->userid);
|
||||
$data->timegraded = $this->apply_date_offset($data->timegraded);
|
||||
|
||||
$newitemid = $DB->insert_record('workshop_aggregations', $data);
|
||||
$this->set_mapping('workshop_aggregation', $oldid, $newitemid, true);
|
||||
|
|
86
mod/workshop/tests/restore_date_test.php
Normal file
86
mod/workshop/tests/restore_date_test.php
Normal file
|
@ -0,0 +1,86 @@
|
|||
<?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_workshop
|
||||
* @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->dirroot . '/mod/workshop/locallib.php');
|
||||
require_once($CFG->dirroot . '/mod/workshop/lib.php');
|
||||
require_once($CFG->libdir . "/phpunit/classes/restore_date_testcase.php");
|
||||
require_once($CFG->dirroot . "/mod/workshop/tests/fixtures/testable.php");
|
||||
|
||||
/**
|
||||
* Restore date tests.
|
||||
*
|
||||
* @package mod_workshop
|
||||
* @copyright 2017 onwards Ankit Agarwal <ankit.agrr@gmail.com>
|
||||
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
|
||||
*/
|
||||
class mod_workshop_restore_date_testcase extends restore_date_testcase {
|
||||
|
||||
/**
|
||||
* Test restore dates.
|
||||
*/
|
||||
public function test_restore_dates() {
|
||||
global $DB, $USER;
|
||||
|
||||
// Create workshop data.
|
||||
$record = ['submissionstart' => 100, 'submissionend' => 100, 'assessmentend' => 100, 'assessmentstart' => 100];
|
||||
list($course, $workshop) = $this->create_course_and_module('workshop', $record);
|
||||
$workshopgenerator = $this->getDataGenerator()->get_plugin_generator('mod_workshop');
|
||||
$subid = $workshopgenerator->create_submission($workshop->id, $USER->id);
|
||||
$exsubid = $workshopgenerator->create_submission($workshop->id, $USER->id, ['example' => 1]);
|
||||
$workshopgenerator->create_assessment($subid, $USER->id);
|
||||
$workshopgenerator->create_assessment($exsubid, $USER->id, ['weight' => 0]);
|
||||
$workshopgenerator->create_assessment($exsubid, $USER->id);
|
||||
|
||||
// Set time fields to a constant for easy validation.
|
||||
$timestamp = 100;
|
||||
$DB->set_field('workshop_submissions', 'timecreated', $timestamp);
|
||||
$DB->set_field('workshop_submissions', 'timemodified', $timestamp);
|
||||
$DB->set_field('workshop_assessments', 'timecreated', $timestamp);
|
||||
$DB->set_field('workshop_assessments', 'timemodified', $timestamp);
|
||||
|
||||
// Do backup and restore.
|
||||
$newcourseid = $this->backup_and_restore($course);
|
||||
$newworkshop = $DB->get_record('workshop', ['course' => $newcourseid]);
|
||||
|
||||
$this->assertFieldsNotRolledForward($workshop, $newworkshop, ['timemodified']);
|
||||
$props = ['submissionstart', 'submissionend', 'assessmentend', 'assessmentstart'];
|
||||
$this->assertFieldsRolledForward($workshop, $newworkshop, $props);
|
||||
|
||||
$submissions = $DB->get_records('workshop_submissions', ['workshopid' => $newworkshop->id]);
|
||||
// Workshop submission time checks.
|
||||
foreach ($submissions as $submission) {
|
||||
$this->assertEquals($timestamp, $submission->timecreated);
|
||||
$this->assertEquals($timestamp, $submission->timemodified);
|
||||
$assessments = $DB->get_records('workshop_assessments', ['submissionid' => $submission->id]);
|
||||
// Workshop assessment time checks.
|
||||
foreach ($assessments as $assessment) {
|
||||
$this->assertEquals($timestamp, $assessment->timecreated);
|
||||
$this->assertEquals($timestamp, $assessment->timemodified);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
Loading…
Add table
Add a link
Reference in a new issue