us_core_test_kit 0.11.5 → 1.0.0

data/lib/us_core_test_kit/generator/must_support_metadata_extractor_us_core_8.rb

@@ -0,0 +1,71 @@
+module USCoreTestKit
+  class Generator
+    class MustSupportMetadataExtractorUsCore8
+      attr_accessor :profile, :must_supports
+
+      def initialize(profile, must_supports)
+        self.profile = profile
+        self.must_supports = must_supports
+      end
+
+      def us_core_6_extractor
+        @us_core_6_extractor ||= MustSupportMetadataExtractorUsCore6.new(profile, must_supports)
+      end
+
+      def us_core_7_extractor
+        @us_core_7_extractor ||= MustSupportMetadataExtractorUsCore7.new(profile, must_supports)
+      end
+
+      def remove_patient_and_encounter_interpreter_extension
+        return unless ['Patient', 'Encounter'].include?(profile.type)
+
+        must_supports[:extensions].delete_if { |extension| extension[:url].end_with?('us-core-interpreter-needed') }
+      end
+
+      def handle_special_cases
+        us_core_6_extractor.add_patient_uscdi_elements
+        add_must_support_choices
+        us_core_6_extractor.remove_practitioner_address
+        remove_patient_and_encounter_interpreter_extension
+        apply_condition_sdoh_guidance
+      end
+
+      def add_must_support_choices
+        us_core_7_extractor.add_must_support_choices
+
+        more_choices = []
+
+        case profile.id
+        when 'us-core-observation-screening-assessment', 'us-core-simple-observation'
+          more_choices << {
+            target_profiles: [
+              'http://hl7.org/fhir/us/core/StructureDefinition/us-core-patient',
+              'http://hl7.org/fhir/us/core/StructureDefinition/us-core-practitioner'
+            ]
+          }
+        when 'us-core-specimen'
+          more_choices << { paths: ['identifier', 'accessionIdentifier'] }
+        end
+
+        return unless more_choices.any?
+
+        must_supports[:choices] ||= []
+        must_supports[:choices].concat(more_choices)
+      end
+
+      # US Core v8 Condition Problems and Health Concerns Implementation Guidance:
+      # The category of "problem-list-item" or "health-concern" is required, and, at a minimum,
+      # Certifying Systems SHALL support, a category of "sdoh"
+      def apply_condition_sdoh_guidance
+        return unless profile.url == 'http://hl7.org/fhir/us/core/StructureDefinition/us-core-condition-problems-health-concerns'
+
+        target_slice = must_supports[:slices].find do |slice|
+          slice[:slice_id] == 'Condition.category:screening-assessment'
+        end
+        return unless target_slice
+
+        target_slice[:discriminator][:values].delete_if { |value| value[:code] != 'sdoh' }
+      end
+    end
+  end
+end

data/lib/us_core_test_kit/generator/must_support_test_generator.rb

@@ -89,14 +89,32 @@ module USCoreTestKit
           .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 choice.key?(:elements)
+            choice[:elements].each { |element| element_names.delete("#{resource_type}.#{element[:path]}") }
+            combined << choice[:elements].map { |element|
+              "#{resource_type}.#{element[:path]}:#{element[:fixed_value]}"
+            }.join(' or ')
+          end
+
+          choice_names << combined.join(' or ') if combined.any?
+        end || []
+
+        (slice_names + element_names + extension_names + choice_names)
           .uniq
           .sort
           .map { |name| "#{' ' * 8}* #{name}" }
@@ -105,7 +123,7 @@ module USCoreTestKit
 
       def generate
         FileUtils.mkdir_p(output_file_directory)
-        File.open(output_file_name, 'w') { |f| f.write(output) }
+        File.write(output_file_name, output)
 
         group_metadata.add_test(
           id: test_id,

data/lib/us_core_test_kit/generator/naming.rb

@@ -33,12 +33,13 @@ module USCoreTestKit
         'v4.0.0' => 'http://hl7.org/fhir/us/core/STU4',
         'v5.0.1' => 'http://hl7.org/fhir/us/core/STU5.0.1',
         'v6.1.0' => 'http://hl7.org/fhir/us/core/STU6.1',
-        'v7.0.0' => 'http://hl7.org/fhir/us/core/STU7'
+        'v7.0.0' => 'http://hl7.org/fhir/us/core/STU7',
+        'v8.0.0' => 'http://hl7.org/fhir/us/core/STU8'
       }.freeze
 
       class << self
         def resources_with_multiple_profiles
-          ['Condition', 'DiagnosticReport', 'Observation']
+          ['Condition', 'DiagnosticReport', 'Observation', 'DocumentReference']
         end
 
         def resource_has_multiple_profiles?(resource)
@@ -56,6 +57,7 @@ module USCoreTestKit
           group_metadata.name
             .delete_prefix('us_core_')
             .gsub('diagnosticreport', 'diagnostic_report')
+            .gsub('documentreference', 'document_reference')
             .underscore
         end
 

data/lib/us_core_test_kit/generator/special_cases.rb

@@ -1,12 +1,14 @@
 module USCoreTestKit
   class Generator
     module SpecialCases
+      # These resources are excluded from US Core Test Suite
       RESOURCES_TO_EXCLUDE = {
         'Location' => ['v311', 'v400', 'v501', 'v610'],
-        'Medication' => ['v311', 'v400', 'v501', 'v610', 'v700'],
+        'Medication' => ['v311', 'v400', 'v501', 'v610', 'v700', 'v800'],
         'PractitionerRole' => ['v311', 'v400']
       }.freeze
 
+      # These profiles are excluded from US Core Test Suite
       PROFILES_TO_EXCLUDE = [
         'http://hl7.org/fhir/us/core/StructureDefinition/us-core-observation-survey',
         'http://hl7.org/fhir/us/core/StructureDefinition/us-core-vital-signs'
@@ -21,18 +23,20 @@ module USCoreTestKit
         'http://hl7.org/fhir/us/core/StructureDefinition/us-core-simple-observation' => ['v610', 'v700']
       }.freeze
 
+      # These resources relies on references from other resources and do not have search tests.
+      # Test groups for these resources are placed at the bottom of US Core test group.
       NON_USCDI_RESOURCES = {
         'Encounter' => ['v311', 'v400'],
-        'Location' => ['v311', 'v400', 'v501', 'v610'],
-        'Organization' => ['v311', 'v400', 'v501', 'v610', 'v700'],
-        'Practitioner' => ['v311', 'v400', 'v501', 'v610', 'v700'],
-        'PractitionerRole' => ['v311', 'v400', 'v501', 'v610', 'v700'],
-        'Provenance' => ['v311', 'v400', 'v501', 'v610', 'v700'],
-        'RelatedPerson' => ['v501', 'v610', 'v700']
+        'Organization' => ['v311', 'v400', 'v501', 'v610', 'v700', 'v800'],
+        'Practitioner' => ['v311', 'v400', 'v501', 'v610', 'v700', 'v800'],
+        'PractitionerRole' => ['v311', 'v400', 'v501', 'v610', 'v700', 'v800'],
+        'Provenance' => ['v311', 'v400', 'v501', 'v610', 'v700', 'v800'],
+        'RelatedPerson' => ['v501', 'v610', 'v700', 'v800']
       }.freeze
 
+      # These resources relies on references from other resources but they also have mandatory search tests.
       SEARCHABLE_DELAYED_RESOURCES = {
-        'Location' => ['v700']
+        'Location' => ['v700', 'v800']
       }.freeze
 
       ALL_VERSION_CATEGORY_FIRST_PROFILES = [
@@ -51,8 +55,10 @@ module USCoreTestKit
       ].freeze
 
       VERSION_SPECIFIC_CATEGORY_FIRST_PROFILES = {
-        'http://hl7.org/fhir/us/core/StructureDefinition/us-core-condition-encounter-diagnosis' => ['v610', 'v700'],
-        'http://hl7.org/fhir/us/core/StructureDefinition/us-core-condition-problems-health-concerns' => ['v610', 'v700']
+        'http://hl7.org/fhir/us/core/StructureDefinition/us-core-condition-encounter-diagnosis' => ['v610', 'v700',
+                                                                                                    'v800'],
+        'http://hl7.org/fhir/us/core/StructureDefinition/us-core-condition-problems-health-concerns' => ['v610',
+                                                                                                         'v700', 'v800']
       }.freeze
 
       class << self

data/lib/us_core_test_kit/generator/suite_generator.rb

@@ -112,17 +112,21 @@ module USCoreTestKit
 
       def clinical_notes_guidance_file_name
         if ig_metadata.ig_version == 'v3.1.1'
-          "../../custom_groups/#{ig_metadata.ig_version}/clinical_notes_guidance_group"
-        else
+          '../../custom_groups/v3.1.1/clinical_notes_guidance_group'
+        elsif ig_metadata.ig_version[1].to_i < 8
           '../../custom_groups/v4.0.0/clinical_notes_guidance_group'
+        else
+          '../../custom_groups/v8.0.0/clinical_notes_guidance_group'
         end
       end
 
       def clinical_notes_guidance_group_id
         if ig_metadata.reformatted_version == 'v311'
-          "us_core_#{ig_metadata.reformatted_version}_clinical_notes_guidance"
-        else
+          'us_core_v311_clinical_notes_guidance'
+        elsif ig_metadata.ig_version[1].to_i < 8
           'us_core_v400_clinical_notes_guidance'
+        else
+          'us_core_v800_clinical_notes_guidance'
         end
       end
 

data/lib/us_core_test_kit/generator/templates/group.rb.erb

@@ -13,16 +13,18 @@ module USCoreTestKit
       run_as_group<% if optional? %>
       optional
       <% end %>
-      <%-
-        requirement_map = {
-              'QuestionnaireResponseGroup' => '511'
+<%-
+      verifies_requirements = VerifiesRequirements.new
+      verifies_requirements.requirement_lists['USCoreV610'][:map] = {
+              'QuestionnaireResponseGroup' => ['511']
         }
-        if module_name == 'USCoreV610' && requirement_map[class_name]
-      -%>
-      verifies_requirements 'hl7.fhir.us.core_6.1.0@<%= requirement_map[class_name] -%>'
-      <%- elsif module_name == 'USCoreV700' && requirement_map[class_name] -%>
-      verifies_requirements 'hl7.fhir.us.core_7.0.0@<%= requirement_map[class_name] %>'
-      <%- end -%>
+      verifies_requirements.requirement_lists['USCoreV800'][:map] = {
+          'ObservationScreeningAssessmentGroup' => ['820']
+        }
+-%>
+<%- if verifies_requirements.has_requirements?(module_name, class_name) -%>
+<%= verifies_requirements.create_verifies_requirements(module_name, class_name) %>
+<%- end -%>
 
       def self.metadata
         @metadata ||= Generator::GroupMetadata.new(YAML.load_file(File.join(__dir__, '<%= profile_identifier %>', 'metadata.yml'), aliases: true))

data/lib/us_core_test_kit/generator/templates/interpreter_required_extension_test.rb.erb

@@ -0,0 +1,29 @@
+require_relative '../../../interpreter_required_extension_test'
+
+module USCoreTestKit
+  module <%= module_name %>
+    class <%= class_name %> < Inferno::Test
+      include USCoreTestKit::InterpreterRequiredExtensionTest
+
+      title 'Certifying server system supports the US Core Interpreter Needed Extension on either the US Core Patient or US Core Encounter Profiles'
+      description %(
+        Servers can use the US Core Interpreter Needed Extension on the US Core Patient
+        or US Core Encounter Profiles to communicate whether a patient needs an interpreter.
+        Although the extension is marked as an Additional USCDI Requirements on both US Core
+        Patient and US Core Encounter Profiles, the certifying Server system is not required
+        to support the extension on both profiles, but SHALL support the extension on at least
+        one.
+      )
+
+      <%- if module_name == 'USCoreV800' -%>
+      verifies_requirements 'hl7.fhir.us.core_8.0.0@840', 'hl7.fhir.us.core_8.0.0@852'
+      <%- end -%>
+
+      id :<%= test_id %>
+
+      run do
+        verify_interpreter_required_extension_exists
+      end
+    end
+  end
+end

data/lib/us_core_test_kit/generator/templates/must_support.rb.erb

@@ -18,39 +18,35 @@ module USCoreTestKit
 
 <%= uscdi_list_string %><% end %>
       )
-      <%-
-  requirement_map = {
-        'AllergyIntoleranceMustSupportTest' => ['304'],
-        'ConditionEncounterDiagnosisMustSupportTest' => ['325', '326'],
-        'CareTeamMustSupportTest' => ['313'],
-        'DiagnosticReportNoteMustSupportTest' => ['360'],
-        'DocumentReferenceMustSupportTest' => ['368'],
-        'EncounterMustSupportTest' => ['375', '379'],
-        'GoalMustSupportTest' => ['387'],
-        'MedicationRequestMustSupportTest' => ['408'],
-        'ObservationScreeningAssessmentMustSupportTest' => ['439'],
-        'OrganizationMustSupportTest' => ['455']
-  }-%>
-      <%- if module_name == 'USCoreV610' -%>
-      verifies_requirements 'hl7.fhir.us.core_6.1.0@1', 'hl7.fhir.us.core_6.1.0@13',
-                            'hl7.fhir.us.core_6.1.0@75', 'hl7.fhir.us.core_6.1.0@87',
-                            'hl7.fhir.us.core_6.1.0@88', 'hl7.fhir.us.core_6.1.0@90',
-                            'hl7.fhir.us.core_6.1.0@91', 'hl7.fhir.us.core_6.1.0@111',
-                            'hl7.fhir.us.core_6.1.0@115'<% if requirement_map[class_name] %>,
-                            <%= requirement_map[class_name].map { |id| "'hl7.fhir.us.core_6.1.0@#{id}'" }.join(', ') %>
-        <%- end -%>
-
-      <%- end -%>
-      <%- if module_name == 'USCoreV700' -%>
-      verifies_requirements 'hl7.fhir.us.core_7.0.0@1', 'hl7.fhir.us.core_7.0.0@13',
-                            'hl7.fhir.us.core_7.0.0@75', 'hl7.fhir.us.core_7.0.0@87',
-                            'hl7.fhir.us.core_7.0.0@88', 'hl7.fhir.us.core_7.0.0@90',
-                            'hl7.fhir.us.core_7.0.0@91', 'hl7.fhir.us.core_7.0.0@111',
-                            'hl7.fhir.us.core_7.0.0@115'<% if requirement_map[class_name] %>,
-                            <%= requirement_map[class_name].map { |id| "'hl7.fhir.us.core_7.0.0@#{id}'" }.join(', ') %>
-        <%- end -%>
-
-      <%- end -%>
+<%-
+      verifies_requirements = VerifiesRequirements.new
+      verifies_requirements.requirement_lists['USCoreV610'][:base] = ['1','13','75','87','90','91','93','94','97','99','111','115']
+      verifies_requirements.requirement_lists['USCoreV610'][:map] = {
+              'AllergyIntoleranceMustSupportTest' => ['587', '588'],
+              'ConditionEncounterDiagnosisMustSupportTest' => ['325', '326'],
+              'DiagnosticReportNoteMustSupportTest' => ['360'],
+              'DocumentReferenceMustSupportTest' => ['368'],
+              'EncounterMustSupportTest' => ['375', '379'],
+              'GoalMustSupportTest' => ['387'],
+              'MedicationRequestMustSupportTest' => ['405', '408'],
+              'OrganizationMustSupportTest' => ['455']
+        }
+      verifies_requirements.requirement_lists['USCoreV700'][:map] = {
+          'MedicationRequestMustSupportTest' => ['406', '411'],
+          'ProcedureMustSupportTest' => ['482', '484'],
+          'ServiceRequestMustSupportTest' => ['516', '518']
+        }
+      verifies_requirements.requirement_lists['USCoreV800'][:base] = ['801', '802', '803', '804', '805', '812', '814', '872']
+      verifies_requirements.requirement_lists['USCoreV800'][:map] = {
+              'SimpleObservationMustSupportTest' => ['822'],
+              'ObservationScreeningAssessmentMustSupportTest' => ['823', '845'],
+              'ConditionProblemsHealthConcernsMustSupportTest' => ['824', '831', '832'],
+        }
+      verifies_requirements.requirement_lists['USCoreV800'][:remove] = ['325', '326']
+-%>
+<%- if verifies_requirements.has_requirements?(module_name, class_name) -%>
+<%= verifies_requirements.create_verifies_requirements(module_name, class_name) %>
+<%- end -%>
 
       id :<%= test_id %>
 

data/lib/us_core_test_kit/generator/templates/provenance_revinclude_search.rb.erb

@@ -16,43 +16,41 @@ module USCoreTestKit
 
       id :<%= test_id %>
   
-      <%-
-        requirement_map = {
-              'AllergyIntoleranceProvenanceRevincludeSearchTest' => '489',
-              'CarePlanProvenanceRevincludeSearchTest' => '490',
-              'CareTeamProvenanceRevincludeSearchTest' => '491',
-              'ConditionEncounterDiagnosisProvenanceRevincludeSearchTest' => '492',
-              'ConditionProblemsHealthConcernsProvenanceRevincludeSearchTest' => '492',
-              'CoverageProvenanceRevincludeSearchTest' => '493',
-              'DeviceProvenanceRevincludeSearchTest' => '494',
-              'DiagnosticReportLabProvenanceRevincludeSearchTest' => '495',
-              'DiagnosticReportNoteProvenanceRevincludeSearchTest' => '495',
-              'DocumentReferenceProvenanceRevincludeSearchTest' => '496',
-              'EncounterProvenanceRevincludeSearchTest' => '497',
-              'GoalProvenanceRevincludeSearchTest' => '498',
-              'ImmunizationProvenanceRevincludeSearchTest' => '499',
-              'MedicationDispenseProvenanceRevincludeSearchTest' => '500',
-              'MedicationRequestProvenanceRevincludeSearchTest' => '501',
-              'ObservationLabProvenanceRevincludeSearchTest' => '502',
-              'ObservationOccupationProvenanceRevincludeSearchTest' => '502',
-              'ObservationPregnancyintentProvenanceRevincludeSearchTest' => '502',
-              'ObservationPregnancystatusProvenanceRevincludeSearchTest' => '502',
-              'ObservationScreeningAssessmentProvenanceRevincludeSearchTest' => '502',
-              'ObservationSexualOrientationProvenanceRevincludeSearchTest' => '502',
-              'PatientProvenanceRevincludeSearchTest' => '503',
-              'ProcedureProvenanceRevincludeSearchTest' => '504',
-              'QuestionnaireResponseProvenanceRevincludeSearchTest' => '505',
-              'RelatedPersonProvenanceRevincludeSearchTest' => '506',
-              'ServiceRequestProvenanceRevincludeSearchTest' => '507'
+<%-
+      verifies_requirements = VerifiesRequirements.new
+      verifies_requirements.requirement_lists['USCoreV610'][:map] = {
+              'AllergyIntoleranceProvenanceRevincludeSearchTest' => ['489'],
+              'CarePlanProvenanceRevincludeSearchTest' => ['490'],
+              'CareTeamProvenanceRevincludeSearchTest' => ['491'],
+              'ConditionEncounterDiagnosisProvenanceRevincludeSearchTest' => ['492'],
+              'ConditionProblemsHealthConcernsProvenanceRevincludeSearchTest' => ['492'],
+              'CoverageProvenanceRevincludeSearchTest' => ['493'],
+              'DeviceProvenanceRevincludeSearchTest' => ['494'],
+              'DiagnosticReportLabProvenanceRevincludeSearchTest' => ['495'],
+              'DiagnosticReportNoteProvenanceRevincludeSearchTest' => ['495'],
+              'DocumentReferenceProvenanceRevincludeSearchTest' => ['496'],
+              'EncounterProvenanceRevincludeSearchTest' => ['497'],
+              'GoalProvenanceRevincludeSearchTest' => ['498'],
+              'ImmunizationProvenanceRevincludeSearchTest' => ['499'],
+              'MedicationDispenseProvenanceRevincludeSearchTest' => ['500'],
+              'MedicationRequestProvenanceRevincludeSearchTest' => ['501'],
+              'ObservationLabProvenanceRevincludeSearchTest' => ['502'],
+              'ObservationOccupationProvenanceRevincludeSearchTest' => ['502'],
+              'ObservationPregnancyintentProvenanceRevincludeSearchTest' => ['502'],
+              'ObservationPregnancystatusProvenanceRevincludeSearchTest' => ['502'],
+              'ObservationScreeningAssessmentProvenanceRevincludeSearchTest' => ['502'],
+              'ObservationSexualOrientationProvenanceRevincludeSearchTest' => ['502'],
+              'PatientProvenanceRevincludeSearchTest' => ['503'],
+              'ProcedureProvenanceRevincludeSearchTest' => ['504'],
+              'QuestionnaireResponseProvenanceRevincludeSearchTest' => ['505'],
+              'RelatedPersonProvenanceRevincludeSearchTest' => ['506'],
+              'ServiceRequestProvenanceRevincludeSearchTest' => ['507']
         }
-        if module_name == 'USCoreV610' && requirement_map[class_name]
-      -%>
-      verifies_requirements 'hl7.fhir.us.core_6.1.0@<%= requirement_map[class_name] %>'
+-%>
+<%- if verifies_requirements.has_requirements?(module_name, class_name) -%>
+<%= verifies_requirements.create_verifies_requirements(module_name, class_name) %>
 
-      <%- elsif module_name == 'USCoreV700' && requirement_map[class_name] -%>
-      verifies_requirements 'hl7.fhir.us.core_7.0.0@<%= requirement_map[class_name] %>'
-
-      <%- end -%>
+<%- end -%>
       <%- if needs_patient_id? -%>
       input :patient_ids,
         title: 'Patient IDs',

data/lib/us_core_test_kit/generator/templates/reference_resolution.rb.erb

@@ -17,11 +17,21 @@ module USCoreTestKit
 
 <%= must_support_reference_list_string %>
       )
-      <%- if module_name == "USCoreV610" -%>
-      verifies_requirements 'hl7.fhir.us.core_6.1.0@105', 'hl7.fhir.us.core_6.1.0@109'
-      <%- elsif module_name == "USCoreV700" -%>
-      verifies_requirements 'hl7.fhir.us.core_7.0.0@105', 'hl7.fhir.us.core_7.0.0@109'
-      <%- end -%>
+<%-
+      verifies_requirements = VerifiesRequirements.new
+      verifies_requirements.requirement_lists['USCoreV610'][:base] = ['105', '109']
+      verifies_requirements.requirement_lists['USCoreV610'][:map] = {
+        'CareTeamReferenceResolutionTest' => ['313'],
+        'ObservationScreeningAssessmentReferenceResolutionTest' => ['439']
+      }
+      verifies_requirements.requirement_lists['USCoreV800'][:base] = ['808', '809', '810', '811']
+      verifies_requirements.requirement_lists['USCoreV800'][:map] = {
+        'SimpleObservationReferenceResolutionTest' => ['868']
+      }
+-%>
+<%- if verifies_requirements.has_requirements?(module_name, class_name) -%>
+<%= verifies_requirements.create_verifies_requirements(module_name, class_name) %>
+<%- end -%>
 
       id :<%= test_id %>
 

data/lib/us_core_test_kit/generator/templates/search.rb.erb

@@ -10,21 +10,19 @@ module USCoreTestKit
       description %(
 <%= description %>
       )
-      <%- if module_name == "USCoreV610" && !optional? && test_medication_inclusion? -%>
-      verifies_requirements 'hl7.fhir.us.core_6.1.0@51', 'hl7.fhir.us.core_6.1.0@52',
-                            'hl7.fhir.us.core_6.1.0@55', 'hl7.fhir.us.core_6.1.0@58',
-                            'hl7.fhir.us.core_6.1.0@250'
-      <%- elsif module_name == "USCoreV700" && !optional? && test_medication_inclusion? -%>
-      verifies_requirements 'hl7.fhir.us.core_7.0.0@51', 'hl7.fhir.us.core_7.0.0@52',
-                            'hl7.fhir.us.core_7.0.0@55', 'hl7.fhir.us.core_7.0.0@58',
-                            'hl7.fhir.us.core_7.0.0@250'
-      <%- elsif module_name == "USCoreV610" && !optional? -%>
-      verifies_requirements 'hl7.fhir.us.core_6.1.0@51', 'hl7.fhir.us.core_6.1.0@52',
-                            'hl7.fhir.us.core_6.1.0@55', 'hl7.fhir.us.core_6.1.0@58'
-      <%- elsif module_name == "USCoreV700" && !optional? -%>
-      verifies_requirements 'hl7.fhir.us.core_7.0.0@51', 'hl7.fhir.us.core_7.0.0@52',
-                            'hl7.fhir.us.core_7.0.0@55', 'hl7.fhir.us.core_7.0.0@58'
-      <%- end -%>
+<%-
+      verifies_requirements = VerifiesRequirements.new
+      test_medication_inclusion_requirement_ids = ['250']
+      verifies_requirements.requirement_lists['USCoreV610'][:base] = ['51', '52', '55', '58', '61', '62']
+
+      all_ids = verifies_requirements.get_ids(module_name, class_name)
+      if all_ids && test_medication_inclusion?
+        all_ids += test_medication_inclusion_requirement_ids
+      end
+-%>
+<%- if all_ids && all_ids.any? && !optional? -%>
+<%= verifies_requirements.create_verifies_requirements_from_ids(module_name, all_ids) %>
+<%- end -%>
 
       id :<%= test_id %><% if optional? %>
       optional

data/lib/us_core_test_kit/generator/templates/suite.rb.erb

@@ -78,14 +78,26 @@ module USCoreTestKit
           actor: 'Server'
         }
       )
-      <%- end -%>
+      <%- elsif module_name == 'USCoreV800'-%>
+
+      requirement_sets(
+        {
+          identifier: 'hl7.fhir.us.core_8.0.0',
+          title: 'US Core Implementation Guide',
+          actor: 'Server'
+        }
+      )
+<%- end -%>
       <%- if module_name == 'USCoreV610'-%>
 
       verifies_requirements 'hl7.fhir.us.core_6.1.0@535'
       <%- elsif module_name == 'USCoreV700'-%>
 
       verifies_requirements 'hl7.fhir.us.core_7.0.0@535'
-      <%- end -%>
+      <%- elsif module_name == 'USCoreV800'-%>
+
+      verifies_requirements 'hl7.fhir.us.core_8.0.0@535'
+<%- end -%>
 
       fhir_resource_validator do
         igs '<%= ig_identifier %>'
@@ -160,6 +172,9 @@ module USCoreTestKit
         <%- elsif module_name == 'USCoreV700'-%>
         group from: :<%= clinical_notes_guidance_group_id %>,
               verifies_requirements: ['hl7.fhir.us.core_7.0.0@206', 'hl7.fhir.us.core_7.0.0@207', 'hl7.fhir.us.core_7.0.0@208', 'hl7.fhir.us.core_7.0.0@209', 'hl7.fhir.us.core_7.0.0@210', 'hl7.fhir.us.core_7.0.0@211', 'hl7.fhir.us.core_7.0.0@212', 'hl7.fhir.us.core_7.0.0@213', 'hl7.fhir.us.core_7.0.0@214', 'hl7.fhir.us.core_7.0.0@215', 'hl7.fhir.us.core_7.0.0@216', 'hl7.fhir.us.core_7.0.0@220', 'hl7.fhir.us.core_7.0.0@221', 'hl7.fhir.us.core_7.0.0@223', 'hl7.fhir.us.core_7.0.0@224', 'hl7.fhir.us.core_7.0.0@231']
+        <%- elsif module_name == 'USCoreV800'-%>
+        group from: :<%= clinical_notes_guidance_group_id %>,
+              verifies_requirements: ['hl7.fhir.us.core_8.0.0@206', 'hl7.fhir.us.core_8.0.0@207', 'hl7.fhir.us.core_8.0.0@208', 'hl7.fhir.us.core_8.0.0@209', 'hl7.fhir.us.core_8.0.0@210', 'hl7.fhir.us.core_8.0.0@211', 'hl7.fhir.us.core_8.0.0@212', 'hl7.fhir.us.core_8.0.0@213', 'hl7.fhir.us.core_8.0.0@214', 'hl7.fhir.us.core_8.0.0@215', 'hl7.fhir.us.core_8.0.0@216', 'hl7.fhir.us.core_8.0.0@220', 'hl7.fhir.us.core_8.0.0@221', 'hl7.fhir.us.core_8.0.0@223', 'hl7.fhir.us.core_8.0.0@224', 'hl7.fhir.us.core_8.0.0@231']
         <%- else -%>
         group from: :<%= clinical_notes_guidance_group_id %>
         <%- end -%>
@@ -172,6 +187,9 @@ module USCoreTestKit
         <%- elsif module_name == 'USCoreV700'-%>
         group from: :us_core_311_data_absent_reason,
               verifies_requirements: ['hl7.fhir.us.core_7.0.0@41', 'hl7.fhir.us.core_7.0.0@45']
+        <%- elsif module_name == 'USCoreV800'-%>
+        group from: :us_core_311_data_absent_reason,
+              verifies_requirements: ['hl7.fhir.us.core_8.0.0@41', 'hl7.fhir.us.core_8.0.0@45']
         <%- else -%>
         group from: :us_core_311_data_absent_reason
         <%- end -%>

data/lib/us_core_test_kit/generator/templates/validation.rb.erb

@@ -10,29 +10,27 @@ module USCoreTestKit
       description %(
 <%= description %>
       )
-      <%-
-  requirement_map = {
-        'DiagnosticReportLabValidationTest' => ['356', '357'],
-        'ObservationClinicalResultValidationTest' => ['427'],
-        'AverageBloodPressureValidationTest' => ['421']
-  }-%>
-      <%-if module_name == 'USCoreV610' -%>
-      verifies_requirements 'hl7.fhir.us.core_6.1.0@18', 'hl7.fhir.us.core_6.1.0@19',
-                            'hl7.fhir.us.core_6.1.0@20', 'hl7.fhir.us.core_6.1.0@21',
-                            'hl7.fhir.us.core_6.1.0@23', 'hl7.fhir.us.core_6.1.0@27',
-                            'hl7.fhir.us.core_6.1.0@40', 'hl7.fhir.us.core_6.1.0@74'<% if requirement_map[class_name] %>,
-                            <%= requirement_map[class_name].map { |id| "'hl7.fhir.us.core_6.1.0@#{id}'" }.join(', ') %>
-        <%- end -%>
-
-      <%- elsif module_name == 'USCoreV700' -%>
-      verifies_requirements 'hl7.fhir.us.core_7.0.0@18', 'hl7.fhir.us.core_7.0.0@19',
-                            'hl7.fhir.us.core_7.0.0@20', 'hl7.fhir.us.core_7.0.0@21',
-                            'hl7.fhir.us.core_7.0.0@23', 'hl7.fhir.us.core_7.0.0@27',
-                            'hl7.fhir.us.core_7.0.0@40', 'hl7.fhir.us.core_7.0.0@74'<% if requirement_map[class_name] %>,
-                            <%= requirement_map[class_name].map { |id| "'hl7.fhir.us.core_7.0.0@#{id}'" }.join(', ') %>
-        <%- end -%>
-
-      <%- end -%>
+<%-
+      verifies_requirements = VerifiesRequirements.new
+      verifies_requirements.requirement_lists['USCoreV610'][:base] = ['18', '19', '20', '21', '23', '27', '40', '74']
+      verifies_requirements.requirement_lists['USCoreV610'][:map] = {
+            'DiagnosticReportLabValidationTest' => ['356', '357'],
+            'ImmunizationValidationTest' => ['391'],
+            'AverageBloodPressureValidationTest' => ['421'],
+            'ObservationClinicalResultValidationTest' => ['427']
+        }
+      verifies_requirements.requirement_lists['USCoreV700'][:map] = {
+        'MedicationRequestValidationTest' => ['414'],
+        'ProcedureValidationTest' => ['486'],
+        'ServiceRequestValidationTest' => ['520']
+        }
+      verifies_requirements.requirement_lists['USCoreV800'][:map] = {
+            'ProcedureValidationTest' => ['856']
+        }
+-%>
+<%- if verifies_requirements.has_requirements?(module_name, class_name) -%>
+<%= verifies_requirements.create_verifies_requirements(module_name, class_name) %>
+<%- end -%>
       output :dar_code_found, :dar_extension_found
 
       def resource_type