us_core_test_kit 0.11.6 → 1.1.0

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

data/lib/us_core_test_kit/generator/value_extractor.rb

@@ -44,7 +44,27 @@ module USCoreTestKit
       end
 
       def value_set(the_element)
-        ig_resources.value_set_by_url(value_set_binding(the_element)&.valueSet)
+        binding = value_set_binding(the_element)
+        target_valueset = binding&.valueSet
+
+        additional_binding_ext = binding&.extension&.find do |ext|
+          ext.url == 'http://hl7.org/fhir/tools/StructureDefinition/additional-binding' &&
+          ext.extension.any? { |sub_ext| sub_ext.url == 'purpose' && sub_ext.valueCode == 'minimum' }
+        end
+
+        min_valueset_ext = binding&.extension&.find do |ext|
+          ext.url == 'http://hl7.org/fhir/StructureDefinition/elementdefinition-minValueSet'
+        end
+
+        if additional_binding_ext.present?
+          min_valueset = additional_binding_ext.extension.find { |ext| ext.url == 'valueSet' }
+
+          target_valueset = min_valueset.valueCanonical if min_valueset.present?
+        elsif min_valueset_ext.present?
+          target_valueset = min_valueset_ext.valueCanonical
+        end
+
+        ig_resources.value_set_by_url(target_valueset)
       end
 
       def bound_systems(the_element)

data/lib/us_core_test_kit/generator/verifies_requirements.rb

@@ -0,0 +1,99 @@
+module USCoreTestKit
+  class Generator
+    class VerifiesRequirements
+
+      attr_accessor :requirement_lists
+      
+      V610 = 'USCoreV610'
+      V700 = 'USCoreV700'
+      V800 = 'USCoreV800'
+
+      MIN_VERSION = V610
+
+      MODULE_NAMESPACE_MAP = {
+        V610 => 'hl7.fhir.us.core_6.1.0',
+        V700 => 'hl7.fhir.us.core_7.0.0',
+        V800 => 'hl7.fhir.us.core_8.0.0'
+      }.freeze
+
+      def initialize
+        @requirement_lists = {
+          V610 => {
+            :base => [],
+            :map => {},
+            :remove => []
+          },
+          V700 => {
+            :base => [],
+            :map => {},
+            :remove => []
+          },
+          V800 => {
+            :base => [],
+            :map => {},
+            :remove => []
+          }
+        }
+      end
+
+      def get_ids(module_name, class_name)
+        if module_name < MIN_VERSION
+          return
+        end
+
+        all_ids = []
+
+        if module_name >= V610
+          all_ids += @requirement_lists[V610][:base]
+          all_ids += @requirement_lists[V610][:map][class_name] if @requirement_lists[V610][:map][class_name]
+          all_ids -= @requirement_lists[V610][:remove]
+        end
+
+        if module_name >= V700
+          all_ids += @requirement_lists[V700][:base]
+          all_ids += @requirement_lists[V700][:map][class_name] if @requirement_lists[V700][:map][class_name]
+          all_ids -= @requirement_lists[V700][:remove]
+        end
+
+        if module_name >= V800
+          all_ids += @requirement_lists[V800][:base]
+          all_ids += @requirement_lists[V800][:map][class_name] if @requirement_lists[V800][:map][class_name]
+          all_ids -= @requirement_lists[V800][:remove]
+        end
+
+        all_ids
+      end
+
+      def create_verifies_requirements(module_name, class_name, indent_spaces = 6)
+        if module_name < MIN_VERSION
+          return
+        end
+
+        ids = get_ids(module_name, class_name)
+        create_verifies_requirements_from_ids(module_name, ids, indent_spaces) if ids.any?
+      end
+
+      def create_verifies_requirements_from_ids(module_name, ids, indent_spaces = 6)
+        if module_name < MIN_VERSION
+          return
+        end
+
+        namespace = MODULE_NAMESPACE_MAP[module_name]
+        verifies_requirements = ' ' * indent_spaces + "verifies_requirements "
+        indent_spaces = verifies_requirements.length
+        verifies_requirements += ids.map.with_index do |id, i|
+          "'#{namespace}@#{id}'" + (i < ids.size - 1 ? ',' : '')
+        end.join("\n" + ' ' * indent_spaces)
+
+        verifies_requirements
+      end
+
+      def has_requirements?(module_name, class_name)
+        return false if module_name < V610
+
+        ids = get_ids(module_name, class_name)
+        ids && ids.any?
+      end
+    end
+  end
+end

data/lib/us_core_test_kit/generator.rb

@@ -17,6 +17,7 @@ require_relative 'generator/suite_generator'
 require_relative 'generator/validation_test_generator'
 require_relative 'generator/practitioner_address_test_generator'
 require_relative 'generator/interpreter_required_extension_test_generator'
+require_relative 'generator/verifies_requirements'
 
 module USCoreTestKit
   class Generator

data/lib/us_core_test_kit/granular_scope_search_test.rb

@@ -33,24 +33,26 @@ module USCoreTestKit
           end
 
         mismatched_ids = mismatched_resource_ids(found_resources)
-
         assert mismatched_ids.empty?,
                'Resources with the following ids were received even though they do not match the ' \
                "granted granular scopes: #{mismatched_ids.join(', ')}"
 
-        found_ids = found_resources.map(&:id)
-        previous_ids = expected_resource_ids(all_previous_resources)
-        missing_ids = previous_ids - found_ids
+        # if the query is in scope or resource were returned, we must check missing and unexpected
+        if query_in_scope?(resource_type, params) || found_resources.present?
 
-        assert missing_ids.empty?,
-               'Resources with the following ids were received when using resource-level scopes, ' \
-               "but not when using granular scopes: #{missing_ids.join(', ')}"
+          found_ids = found_resources.map(&:id)
+          previous_ids = expected_resource_ids(all_previous_resources)
 
-        unexpected_ids = found_ids - previous_ids
+          missing_ids = previous_ids - found_ids
+          assert missing_ids.empty?,
+                 'Resources with the following ids were received when using resource-level scopes, ' \
+                 "but not when using granular scopes: #{missing_ids.join(', ')}"
 
-        assert unexpected_ids.empty?,
-               'Resources with the following ids were received when using granular scopes, ' \
-               "but not when using resource-level scopes: #{unexpected_ids.join(', ')}"
+          unexpected_ids = found_ids - previous_ids
+          assert unexpected_ids.empty?,
+                 'Resources with the following ids were received when using granular scopes, ' \
+                 "but not when using resource-level scopes: #{unexpected_ids.join(', ')}"
+        end
       end
     end
 
@@ -63,6 +65,29 @@ module USCoreTestKit
           .sort_by { |request| request.index }
     end
 
+    def query_in_scope?(resource_type, params)
+      received_scopes.split(' ').each do |scope|
+        parsed_scope = URI.parse(scope)
+        
+        # check for resource type, search scope, and matched params
+        next unless parsed_scope.path =~ /\/#{resource_type}\./ &&
+                    parsed_scope.path.split('.')[1].include?('s') &&
+                    granular_params_present?(parsed_scope.query, params)
+      
+        return true
+      end
+
+      false
+    end
+
+    def granular_params_present?(granular_params, search_params)
+      CGI.parse(granular_params).each do |param_name, value|
+        return false unless search_params.key?(param_name) && value.include?(search_params[param_name])
+      end
+
+      true
+    end
+
     def previous_resources(params)
       previous_requests(params)
         .flat_map do |request|

data/lib/us_core_test_kit/metadata.rb

@@ -70,7 +70,7 @@ module USCoreTestKit
       of the repository.
     DESCRIPTION
     suite_ids [:us_core_v311, :us_core_v400, :us_core_v501, :us_core_v610, :us_core_v700, :us_core_v800, :us_core_client_v311,
-               :us_core_client_v400, :us_core_client_v501, :us_core_client_v610, :us_core_client_v700]
+               :us_core_client_v400, :us_core_client_v501, :us_core_client_v610, :us_core_client_v700, :us_core_client_v800]
     tags ['SMART App Launch', 'US Core']
     last_updated LAST_UPDATED
     version VERSION