L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MDL-82620 completion: Make enrol duration comp happen at the right time

Browse Source
This commit is contained in:
Eric Merrill
2024-07-26 14:11:21 -04:00
parent fd487cd3f2
commit 57393beec9
2 changed files with 38 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
completion/criteria/completion_criteria_duration.php
+2 -2
View File
@@ -241,8 +241,8 @@ class completion_criteria_duration extends completion_criteria {
AND cc.id IS NULL
AND
(
ue.timestart > 0 AND ue.timestart + cr.enrolperiod < ?
OR ue.timecreated > 0 AND ue.timecreated + cr.enrolperiod < ?
(ue.timestart > 0 AND (ue.timestart + cr.enrolperiod) < ?)
OR (ue.timestart = 0 AND ue.timecreated > 0 AND (ue.timecreated + cr.enrolperiod) < ?)
)
';
completion/tests/completion_criteria_test.php
+36
View File
@@ -31,6 +31,7 @@ class completion_criteria_test extends \advanced_testcase {
*/
public function setUp(): void {
global $CFG;
require_once($CFG->dirroot.'/completion/criteria/completion_criteria.php');
require_once($CFG->dirroot.'/completion/criteria/completion_criteria_course.php');
require_once($CFG->dirroot.'/completion/criteria/completion_criteria_activity.php');
require_once($CFG->dirroot.'/completion/criteria/completion_criteria_duration.php');
@@ -113,6 +114,41 @@ class completion_criteria_test extends \advanced_testcase {
$ccompletion = new \completion_completion(['userid' => $user->id, 'course' => $course->id]);
$this->assertEquals($timestarted + $durationperiod, $ccompletion->timecompleted);
$this->assertTrue($ccompletion->is_complete());
// Now we want to check the scenario where "now" sits in the middle of the timestart + duration
// and timecreated + duration window.
$nowtime = time();
$timestarted = $nowtime - $durationperiod + (2 * DAYSECS);
$timecreated = $nowtime - $durationperiod - (2 * DAYSECS);
// Using a new user for this.
$user = $this->getDataGenerator()->create_and_enrol($course, 'student', null, 'manual', $timestarted);
// We need to manually update the enrollment's time created.
$DB->set_field('user_enrolments', 'timecreated', $timecreated, ['userid' => $user->id]);
// Run the completion cron. See MDL-33320.
$task->execute();
sleep(1);
$task->execute();
// We do NOT expect the user to be complete currently.
$ccompletion = new \completion_completion(['userid' => $user->id, 'course' => $course->id]);
$this->assertFalse($ccompletion->is_complete());
// Now, finally, we will move the timestart to be in the past, but still after the timecreated.
$timestarted = $timecreated + DAYSECS;
$DB->set_field('user_enrolments', 'timestart', $timestarted, ['userid' => $user->id]);
// Run the completion cron. See MDL-33320.
$task->execute();
sleep(1);
$task->execute();
// Now they should be complete.
$ccompletion = new \completion_completion(['userid' => $user->id, 'course' => $course->id]);
$this->assertEquals($timestarted + $durationperiod, $ccompletion->timecompleted);
$this->assertTrue($ccompletion->is_complete());
}
/**