From 73a8110d3a07c793f4f8563d01dab18a306594d7 Mon Sep 17 00:00:00 2001
From: Peter <peter@moodle.com>
Date: Tue, 23 Oct 2018 13:17:43 +0800
Subject: [PATCH] MDL-63145 mod_page: Accept userid param as override

Accept a userid as an override in the lib function instead of
relying on $USER
---
 mod/page/lib.php            | 12 ++++++---
 mod/page/tests/lib_test.php | 49 +++++++++++++++++++++++++++++++++++++
 2 files changed, 58 insertions(+), 3 deletions(-)

diff --git a/mod/page/lib.php b/mod/page/lib.php
index c367786aaa0..7b28d16e418 100644
--- a/mod/page/lib.php
+++ b/mod/page/lib.php
@@ -547,12 +547,18 @@ function page_check_updates_since(cm_info $cm, $from, $filter = array()) {
  * @return \core_calendar\local\event\entities\action_interface|null
  */
 function mod_page_core_calendar_provide_event_action(calendar_event $event,
-                                                      \core_calendar\action_factory $factory) {
-    $cm = get_fast_modinfo($event->courseid)->instances['page'][$event->instance];
+                                                      \core_calendar\action_factory $factory, $userid = 0) {
+    global $USER;
+
+    if (empty($userid)) {
+        $userid = $USER->id;
+    }
+
+    $cm = get_fast_modinfo($event->courseid, $userid)->instances['page'][$event->instance];
 
     $completion = new \completion_info($cm->get_course());
 
-    $completiondata = $completion->get_data($cm, false);
+    $completiondata = $completion->get_data($cm, false, $userid);
 
     if ($completiondata->completionstate != COMPLETION_INCOMPLETE) {
         return null;
diff --git a/mod/page/tests/lib_test.php b/mod/page/tests/lib_test.php
index 809455100b2..e93d723f6c0 100644
--- a/mod/page/tests/lib_test.php
+++ b/mod/page/tests/lib_test.php
@@ -149,6 +149,55 @@ class mod_page_lib_testcase extends advanced_testcase {
         $this->assertNull($actionevent);
     }
 
+    /**
+     * Test mod_page_core_calendar_provide_event_action with user override
+     */
+    public function test_page_core_calendar_provide_event_action_user_override() {
+        global $CFG, $USER;
+
+        $this->resetAfterTest();
+        $this->setAdminUser();
+        $user = $this->getDataGenerator()->create_user();
+        $CFG->enablecompletion = 1;
+
+        // Create the activity.
+        $course = $this->getDataGenerator()->create_course(array('enablecompletion' => 1));
+        $page = $this->getDataGenerator()->create_module('page', array('course' => $course->id),
+            array('completion' => 2, 'completionview' => 1, 'completionexpected' => time() + DAYSECS));
+
+        // Get some additional data.
+        $cm = get_coursemodule_from_instance('page', $page->id);
+
+        // Create a calendar event.
+        $event = $this->create_action_event($course->id, $page->id,
+            \core_completion\api::COMPLETION_EVENT_TYPE_DATE_COMPLETION_EXPECTED);
+
+        // Mark the activity as completed.
+        $completion = new completion_info($course);
+        $completion->set_module_viewed($cm);
+
+        // Create an action factory.
+        $factory = new \core_calendar\action_factory();
+
+        // Decorate action event.
+        $actionevent = mod_page_core_calendar_provide_event_action($event, $factory, $USER->id);
+
+        // Decorate action with a userid override.
+        $actionevent2 = mod_page_core_calendar_provide_event_action($event, $factory, $user->id);
+
+        // Ensure result was null because it has been marked as completed for the associated user.
+        // Logic was brought across from the "_already_completed" function.
+        $this->assertNull($actionevent);
+
+        // Confirm the event was decorated.
+        $this->assertNotNull($actionevent2);
+        $this->assertInstanceOf('\core_calendar\local\event\value_objects\action', $actionevent2);
+        $this->assertEquals(get_string('view'), $actionevent2->get_name());
+        $this->assertInstanceOf('moodle_url', $actionevent2->get_url());
+        $this->assertEquals(1, $actionevent2->get_item_count());
+        $this->assertTrue($actionevent2->is_actionable());
+    }
+
     /**
      * Creates an action event.
      *