Fix problem with values from patternCoding

Ref: #13
heathfrankel · Feb 23, 2024 · 712606c · 712606c
1 parent ad40041
commit 712606c
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 7 deletions.
diff --git a/lib/au_core_test_kit/generated/v0.3.0/metadata.yml b/lib/au_core_test_kit/generated/v0.3.0/metadata.yml
diff --git a/lib/au_core_test_kit/generated/v0.3.0/sexassignedatbirth/metadata.yml b/lib/au_core_test_kit/generated/v0.3.0/sexassignedatbirth/metadata.yml
diff --git a/lib/au_core_test_kit/generator/search_definition_metadata_extractor.rb b/lib/au_core_test_kit/generator/search_definition_metadata_extractor.rb
@@ -178,8 +178,11 @@ def multiple_or_expectation
       end
 
       def values
-        values_from_must_supports(profile_element).presence ||
-        value_extractor.values_from_fixed_codes(profile_element, type).presence ||
+        values_from_fixed_codes = value_extractor.values_from_fixed_codes(profile_element, type).presence
+        values_from_pattern_coding = value_extractor.values_from_pattern_coding(profile_element, type).presence
+        merged_values = Array(values_from_fixed_codes) + Array(values_from_pattern_coding)
+
+        values_from_must_supports(profile_element).presence || merged_values.presence ||
         #value_extractor.values_from_required_binding(profile_element).presence ||
         value_extractor.values_from_value_set_binding(profile_element).presence ||
         values_from_resource_metadata(paths).presence ||

diff --git a/lib/au_core_test_kit/reference_resolution_test.rb b/lib/au_core_test_kit/reference_resolution_test.rb
@@ -80,9 +80,6 @@ def unresolved_references(resources = [])
         must_support_references_with_target_profile.select do |reference_path_profile_pair|
           path = reference_path_profile_pair[:path]
           target_profile = reference_path_profile_pair[:target_profile]
-          puts "reference_path_profile_pair #{reference_path_profile_pair}"
-          puts "path #{path}"
-          puts "target_profile #{target_profile}"
 
           found_one_reference = false