Issue #66: Debug search result

Author: TomoTsuyuki

classes/search/cmsfield.php

@@ -167,7 +167,7 @@ public function get_document($record, $options = []) {
     public function check_access($id) {
         try {
             $data = $this->get_data($id);
-            $cminfo = $this->get_cm('cms', $data->instanceid, $data->courseid);
+            $cminfo = $this->get_cm('cms', $data->id, $data->courseid);
             $context = \context_module::instance($cminfo->id);
         } catch (\dml_missing_record_exception $ex) {
             return \core_search\manager::ACCESS_DELETED;
@@ -220,10 +220,9 @@ public function get_context_url(\core_search\document $doc) {
     protected function get_data($id) {
         global $DB;
         if (empty($this->cmsdata[$id])) {
-            $sql = "SELECT mcd.*, mc.id AS cmsid, mc.course AS courseid
-                      FROM {customfield_data} mcd
-                      JOIN {cms} mc ON mc.id = mcd.instanceid
-                     WHERE mcd.id = :id";
+            $sql = "SELECT mc.id, mc.course AS courseid
+                      FROM {cms} mc
+                     WHERE mc.id = :id";
             $this->cmsdata[$id] = $DB->get_record_sql($sql, ['id' => $id], MUST_EXIST);
         }
         return $this->cmsdata[$id];

tests/search/search_test.php

@@ -106,6 +106,7 @@ public function setUp(): void {
      * Test search enabled.
      *
      * @return void
+     * @covers \core_search\manager::get_search_area
      */
     public function test_search_enabled(): void {
         $searcharea = \core_search\manager::get_search_area($this->cmsareaid);
@@ -125,6 +126,8 @@ public function test_search_enabled(): void {
      * Indexing mod cms contents.
      *
      * @return void
+     * @covers ::get_document_recordset
+     * @covers ::get_document
      */
     public function test_get_document_recordset(): void {
         global $DB;
@@ -210,6 +213,8 @@ public function test_get_document_recordset(): void {
      * Test default value from cms content type
      *
      * @return void
+     * @covers ::get_document_recordset
+     * @covers ::get_document
      */
     public function test_default_content(): void {
         global $DB;
@@ -273,6 +278,7 @@ public function test_default_content(): void {
      * Test check_access.
      *
      * @return void
+     * @covers ::check_access
      */
     public function test_check_access(): void {
         global $DB;
@@ -286,25 +292,23 @@ public function test_check_access(): void {
 
         $this->getDataGenerator()->enrol_user($user1->id, $course->id, 'student');
 
-        // Name for cms is coming from "title_mustache" in cms_type.
         $generator = self::getDataGenerator()->get_plugin_generator('mod_cms');
         $record = new \stdClass();
         $record->course = $course->id;
         $record->customfield_overview = 'Test overview text 1';
         $record->typeid = $this->cmstype->get('id');
-        $generator->create_instance_with_data($record);
+        $cms = $generator->create_instance_with_data($record);
 
         $records = $DB->get_records('customfield_data', ['fieldid' => $this->field->get('id')]);
         $this->assertCount(1, $records);
-        $data = current($records);
 
         $this->setAdminUser();
-        $this->assertEquals(\core_search\manager::ACCESS_GRANTED, $searcharea->check_access($data->id));
+        $this->assertEquals(\core_search\manager::ACCESS_GRANTED, $searcharea->check_access($cms->id));
 
         $this->setUser($user1);
-        $this->assertEquals(\core_search\manager::ACCESS_GRANTED, $searcharea->check_access($data->id));
+        $this->assertEquals(\core_search\manager::ACCESS_GRANTED, $searcharea->check_access($cms->id));
 
         $this->setUser($user2);
-        $this->assertEquals(\core_search\manager::ACCESS_DENIED, $searcharea->check_access($data->id));
+        $this->assertEquals(\core_search\manager::ACCESS_DENIED, $searcharea->check_access($cms->id));
     }
 }