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

Merge branch 'MDL-85369_main' of https://github.com/agaranin/moodle into main

Browse Source
This commit is contained in:
Mihail Geshoski
2025-06-05 10:59:14 +07:00
committed by Huong Nguyen
parent 84338a4746 18f7b44510
commit 8ec70a7a14
2 changed files with 60 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
question/classes/question_reference_manager.php
+2 -1
View File
@@ -104,7 +104,8 @@ class question_reference_manager {
// Get the names of the tags in the condition. Find or create corresponding tags,
// and set their ids in the new condition.
$oldtags = array_map(fn($oldtag) => explode(',', $oldtag)[1], $filtercondition['tags']);
$newtags = \core_tag_tag::create_if_missing(1, $oldtags);
$questiontagcollid = \core_tag_area::get_collection('core_question', 'question');
$newtags = \core_tag_tag::create_if_missing($questiontagcollid, $oldtags);
$newtagids = array_map(fn($newtag) => $newtag->id, $newtags);
$filtercondition['filter']['qtagids'] = [
question/tests/legacy_question_set_conversion_test.php
+58
View File
@@ -75,4 +75,62 @@ final class legacy_question_set_conversion_test extends \advanced_testcase {
}
/**
* Verifies that a legacy tag filter re-uses an existing tag that
* lives in the default collection and does not create a duplicate.
*
* @covers \core_question\question_reference_manager::convert_legacy_set_reference_filter_condition
* @return void
*/
public function test_tag_conversion_uses_existing_tag_in_default_collection(): void {
$this->resetAfterTest();
// Prepare a tag that already exists in the default collection.
$defaultcollectionid = \core_tag_collection::get_default();
// Create a tag inside that collection.
$tag = \core_tag_tag::create_if_missing($defaultcollectionid, ['legacytag'])['legacytag'];
// Legacy random-question filter – tag specified as "id,rawname".
$legacyfilter = ['tags' => ["{$tag->id},legacytag"]];
$converted = question_reference_manager::convert_legacy_set_reference_filter_condition($legacyfilter);
$this->assertEquals(
[$tag->id],
$converted['filter']['qtagids']['values'],
'Converter should preserve the existing tag ID and avoid duplicates.'
);
}
/**
* Verifies that a legacy tag filter respects a custom collection after
* the *question* tag-area has been moved there.
*
* @covers \core_question\question_reference_manager::convert_legacy_set_reference_filter_condition
* @return void
*/
public function test_tag_conversion_respects_custom_collection(): void {
$this->resetAfterTest();
// Create a custom collection and move the question tag-area to it.
$customcollection = \core_tag_collection::create((object) [
'name' => 'Questions',
'component' => 'core_question',
'searchable' => 0,
]);
$questionarea = \core_tag_area::get_areas()['question']['core_question'];
\core_tag_area::update($questionarea, ['tagcollid' => $customcollection->id]);
// Create a tag inside that collection.
$tag = \core_tag_tag::create_if_missing($customcollection->id, ['legacytag'])['legacytag'];
$legacyfilter = ['tags' => ["{$tag->id},legacytag"]];
$converted = question_reference_manager::convert_legacy_set_reference_filter_condition($legacyfilter);
$this->assertEquals(
[$tag->id],
$converted['filter']['qtagids']['values'],
'Converter should use the tag ID from the custom collection.'
);
}
}