Fix FI-3641

inferno-framework · Jan 9, 2025 · 5b0310d · 5b0310d
1 parent c9728e7
commit 5b0310d
Show file tree

Hide file tree

Showing 9 changed files with 33 additions and 24 deletions.
diff --git a/...d/v5.0.1/condition_encounter_diagnosis/condition_encounter_diagnosis_must_support_test.rb b/...d/v5.0.1/condition_encounter_diagnosis/condition_encounter_diagnosis_must_support_test.rb
diff --git a/...ondition_problems_health_concerns/condition_problems_health_concerns_must_support_test.rb b/...ondition_problems_health_concerns/condition_problems_health_concerns_must_support_test.rb
diff --git a/...d/v6.1.0/condition_encounter_diagnosis/condition_encounter_diagnosis_must_support_test.rb b/...d/v6.1.0/condition_encounter_diagnosis/condition_encounter_diagnosis_must_support_test.rb
diff --git a/...ondition_problems_health_concerns/condition_problems_health_concerns_must_support_test.rb b/...ondition_problems_health_concerns/condition_problems_health_concerns_must_support_test.rb
diff --git a/...d/v7.0.0/condition_encounter_diagnosis/condition_encounter_diagnosis_must_support_test.rb b/...d/v7.0.0/condition_encounter_diagnosis/condition_encounter_diagnosis_must_support_test.rb
diff --git a/...ondition_problems_health_concerns/condition_problems_health_concerns_must_support_test.rb b/...ondition_problems_health_concerns/condition_problems_health_concerns_must_support_test.rb
diff --git a/...d/v8.0.0/condition_encounter_diagnosis/condition_encounter_diagnosis_must_support_test.rb b/...d/v8.0.0/condition_encounter_diagnosis/condition_encounter_diagnosis_must_support_test.rb
diff --git a/...ondition_problems_health_concerns/condition_problems_health_concerns_must_support_test.rb b/...ondition_problems_health_concerns/condition_problems_health_concerns_must_support_test.rb
diff --git a/lib/us_core_test_kit/generator/must_support_test_generator.rb b/lib/us_core_test_kit/generator/must_support_test_generator.rb
@@ -88,14 +88,31 @@ def build_must_support_list_string(uscdi_only)
           .select { |extension| extension[:uscdi_only].presence == uscdi_only.presence }
           .map { |extension| extension[:id] }
 
-        group_metadata.must_supports[:choices]&.each do |choice|
-          next unless choice[:uscdi_only].presence == uscdi_only.presence && choice.key?(:paths)
-
-          choice[:paths].each { |path| element_names.delete("#{resource_type}.#{path}") }
-          element_names << choice[:paths].map { |path| "#{resource_type}.#{path}" }.join(' or ')
-        end
-
-        (slice_names + element_names + extension_names)
+        choice_names = []
+        group_metadata.must_supports[:choices]&.map do |choice|
+          next unless choice[:uscdi_only].presence == uscdi_only.presence
+
+          combined = []
+          if (choice.key?(:paths))
+            choice[:paths].each { |path| element_names.delete("#{resource_type}.#{path}") }
+            combined << choice[:paths].map { |path| "#{resource_type}.#{path}" }.join(' or ')
+          end
+
+          if (choice.key?(:extension_ids))
+            choice[:extension_ids].each { |extesnion_id| extension_names.delete(extesnion_id) }
+            combined << choice[:extension_ids].join(' or ')
+          end
+
+          if combined.any?
+            choice_names << combined.join(' or ')
+          end
+          # choice_paths = choice[:paths]&.map { |path| "#{resource_type}.#{path}" } || []
+          # choice_extensions = choice[:extensions]&.map { |extension| extension[:id] } || []
+
+          # choice_names << (choice_paths + choice_extensions).join(' or ')
+        end || []
+
+        (slice_names + element_names + extension_names + choice_names)
           .uniq
           .sort
           .map { |name| "#{' ' * 8}* #{name}" }