moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-04 16:36:37 +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

7
mod/forum/backup/moodle2/restore_forum_stepslib.php
View file

@ -60,6 +60,8 @@ class restore_forum_activity_structure_step extends restore_activity_structure_s
$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->assesstimestart = $this->apply_date_offset($data->assesstimestart);
$data->assesstimefinish = $this->apply_date_offset($data->assesstimefinish);
if ($data->scale < 0) { // scale found, get mapping
@ -83,7 +85,6 @@ class restore_forum_activity_structure_step extends restore_activity_structure_s
$data->course = $this->get_courseid();
$data->forum = $this->get_new_parentid('forum');
$data->timemodified = $this->apply_date_offset($data->timemodified);
$data->timestart = $this->apply_date_offset($data->timestart);
$data->timeend = $this->apply_date_offset($data->timeend);
$data->userid = $this->get_mappingid('user', $data->userid);
@ -101,8 +102,6 @@ class restore_forum_activity_structure_step extends restore_activity_structure_s
$oldid = $data->id;
$data->discussion = $this->get_new_parentid('forum_discussion');
$data->created = $this->apply_date_offset($data->created);
$data->modified = $this->apply_date_offset($data->modified);
$data->userid = $this->get_mappingid('user', $data->userid);
// If post has parent, map it (it has been already restored)
if (!empty($data->parent)) {
@ -148,8 +147,6 @@ class restore_forum_activity_structure_step extends restore_activity_structure_s
}
$data->rating = $data->value;
$data->userid = $this->get_mappingid('user', $data->userid);
$data->timecreated = $this->apply_date_offset($data->timecreated);
$data->timemodified = $this->apply_date_offset($data->timemodified);
// We need to check that component and ratingarea are both set here.
if (empty($data->component)) {

2
mod/forum/lib.php
View file

@ -7117,6 +7117,8 @@ function forum_reset_userdata($data) {
/// updating dates - shift may be negative too
if ($data->timeshift) {
// 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('forum', array('assesstimestart', 'assesstimefinish'), $data->timeshift, $data->courseid);
$status[] = array('component'=>$componentstr, 'item'=>get_string('datechanged'), 'error'=>false);
}

110
mod/forum/tests/restore_date_test.php Normal file
View file

@ -0,0 +1,110 @@
<?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_forum
* @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");
require_once($CFG->dirroot . '/rating/lib.php');
/**
* Restore date tests.
*
* @package mod_forum
* @copyright 2017 onwards Ankit Agarwal <ankit.agrr@gmail.com>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
class mod_forum_restore_date_testcase extends restore_date_testcase {
/**
* Test restore dates.
*/
public function test_restore_dates() {
global $DB, $USER;
$gg = $this->getDataGenerator()->get_plugin_generator('mod_forum');
$record = ['assesstimefinish' => 100, 'assesstimestart' => 100, 'ratingtime' => 1, 'assessed' => 2, 'scale' => 1];
list($course, $forum) = $this->create_course_and_module('forum', $record);
// Forum Discussions/posts/ratings.
$timestamp = 996699;
$diff = $this->get_diff();
$record = new stdClass();
$record->course = $course->id;
$record->userid = $USER->id;
$record->forum = $forum->id;
$record->timestart = $record->timeend = $record->timemodified = $timestamp;
$discussion = $gg->create_discussion($record);
$record = new stdClass();
$record->discussion = $discussion->id;
$record->parent = $discussion->firstpost;
$record->userid = $USER->id;
$record->created = $record->modified = $timestamp;
$post = $gg->create_post($record);
// Time modified is changed internally.
$DB->set_field('forum_discussions', 'timemodified', $timestamp);
// Ratings.
$ratingoptions = new stdClass;
$ratingoptions->context = context_module::instance($forum->cmid);
$ratingoptions->ratingarea = 'post';
$ratingoptions->component = 'mod_forum';
$ratingoptions->itemid = $post->id;
$ratingoptions->scaleid = 2;
$ratingoptions->userid = $USER->id;
$rating = new rating($ratingoptions);
$rating->update_rating(2);
$rating = $DB->get_record('rating', ['itemid' => $post->id]);
// Do backup and restore.
$newcourseid = $this->backup_and_restore($course);
$newforum = $DB->get_record('forum', ['course' => $newcourseid]);
$this->assertFieldsNotRolledForward($forum, $newforum, ['timemodified']);
$props = ['assesstimefinish', 'assesstimestart'];
$this->assertFieldsRolledForward($forum, $newforum, $props);
$newdiscussion = $DB->get_record('forum_discussions', ['forum' => $newforum->id]);
$newposts = $DB->get_records('forum_posts', ['discussion' => $newdiscussion->id]);
$newcm = $DB->get_record('course_modules', ['course' => $newcourseid, 'instance' => $newforum->id]);
// Forum discussion time checks.
$this->assertEquals($timestamp + $diff, $newdiscussion->timestart);
$this->assertEquals($timestamp + $diff, $newdiscussion->timeend);
$this->assertEquals($timestamp, $newdiscussion->timemodified);
// Posts test.
foreach ($newposts as $post) {
$this->assertEquals($timestamp, $post->created);
$this->assertEquals($timestamp, $post->modified);
}
// Rating test.
$newrating = $DB->get_record('rating', ['contextid' => context_module::instance($newcm->id)->id]);
$this->assertEquals($rating->timecreated, $newrating->timecreated);
$this->assertEquals($rating->timemodified, $newrating->timemodified);
}
}