MDL-87259 course: Correct content item user cache key

Author: x-iy

public/course/classes/local/repository/caching_content_item_readonly_repository.php

@@ -63,9 +63,8 @@ public function __construct(\cache $cachestore, content_item_readonly_repository
      * @return array the array of content items.
      */
     public function find_all_for_course(\stdClass $course, \stdClass $user): array {
-        global $USER;
         // Try to find this data in the cache first.
-        $key = $USER->id . '_' . $course->id;
+        $key = $user->id . '_' . $course->id;
         $contentitems = $this->cachestore->get($key);
         if ($contentitems !== false) {
             return $contentitems;

public/course/tests/caching_content_item_readonly_repository_test.php

@@ -78,4 +78,60 @@ public function test_find_all_for_course(): void {
         $this->assertEquals($module->name, $cacheditemsfiltered[0]->get_name());
         $this->assertEmpty($itemsfiltered);
     }
+
+    /**
+     * Test verifying that cached content items are returned from the cache as the correct user.
+     *
+     * @covers \core_course\local\repository\caching_content_item_readonly_repository::find_all_for_course
+     */
+    public function test_find_all_for_course_user_cache(): void {
+        global $DB, $CFG;
+        require_once($CFG->dirroot . '/mod/lti/locallib.php');
+
+        $this->resetAfterTest();
+        $admin = get_admin();
+
+        $course = $this->getDataGenerator()->create_course();
+        $editingteacher = $this->getDataGenerator()->create_and_enrol($course, 'editingteacher');
+        $teacher = $this->getDataGenerator()->create_and_enrol($course, 'teacher');
+        $cir = new content_item_readonly_repository();
+        $ccir = new caching_content_item_readonly_repository(\cache::make('core', 'user_course_content_items'), $cir);
+
+        // Create lti that is only available to editingteacher.
+        $type = new \stdClass();
+        $type->course = SITEID;
+        $type->name = 'Editing Teacher Only LTI Tool';
+        $type->baseurl = 'https://example.com/lti/launch';
+        $type->tooldomain = 'example.com';
+        $type->state = LTI_TOOL_STATE_CONFIGURED;
+        $type->coursevisible = LTI_COURSEVISIBLE_ACTIVITYCHOOSER;
+        $type->createdby = $admin->id;
+        $type->timecreated = time();
+        $type->timemodified = time();
+
+        $typeid = $DB->insert_record('lti_types', $type);
+
+        // Ensure we are working as editingteacher.
+        $this->setUser($editingteacher);
+
+        // Get cached content items for each user.
+        // We run this twice, first to build the cache, second to query cache.
+        $temp = $ccir->find_all_for_course($course, $editingteacher);
+        $cachededitingteacheritems = $ccir->find_all_for_course($course, $editingteacher);
+
+        $temp = $ccir->find_all_for_course($course, $teacher);
+        $cachedteacheritems = $ccir->find_all_for_course($course, $teacher);
+
+        // The lti will only appear for editingteacher.
+        $cachededitingteacheritemsfiltered = array_values(array_filter($cachededitingteacheritems, function ($item) {
+            return $item->get_title()->get_value() == 'Editing Teacher Only LTI Tool';
+        }));
+        $this->assertCount(1, $cachededitingteacheritemsfiltered);
+
+        // The lti will not appear for teacher.
+        $cachedteacheritemsfiltered = array_values(array_filter($cachedteacheritems, function ($item) {
+            return $item->get_title()->get_value() == 'Editing Teacher Only LTI Tool';
+        }));
+        $this->assertEmpty($cachedteacheritemsfiltered);
+    }
 }