us_core_test_kit 0.7.0 → 0.7.2

data/lib/us_core_test_kit/resource_search_param_checker.rb

@@ -0,0 +1,139 @@
+require_relative 'fhir_resource_navigation'
+
+module USCoreTestKit
+  module ResourceSearchParamChecker
+    include FHIRResourceNavigation
+
+    def search_param_paths(name)
+      paths = metadata.search_definitions[name.to_sym][:paths]
+      if paths.first =='class'
+        paths[0] = 'local_class'
+      end
+
+      paths
+    end
+
+    def element_has_valid_value?(element, include_system)
+      case element
+      when FHIR::Reference
+        element.reference.present?
+      when FHIR::CodeableConcept
+        if include_system
+          coding =
+            find_a_value_at(element, 'coding') { |coding| coding.code.present? && coding.system.present? }
+          coding.present?
+        else
+          find_a_value_at(element, 'coding.code').present?
+        end
+      when FHIR::Identifier
+        include_system ? element.value.present? && element.system.present? : element.value.present?
+      when FHIR::Coding
+        include_system ? element.code.present? && element.system.present? : element.code.present?
+      when FHIR::HumanName
+        (element.family || element.given&.first || element.text).present?
+      when FHIR::Address
+        (element.text || element.city || element.state || element.postalCode || element.country).present?
+      when FHIR::Element
+        false
+      else
+        true
+      end
+    end
+
+    def resource_matches_param?(resource, search_param_name, escaped_search_value, values_found = [])
+      search_value = unescape_search_value(escaped_search_value)
+      paths = search_param_paths(search_param_name)
+
+      match_found = false
+
+      paths.each do |path|
+        type = metadata.search_definitions[search_param_name.to_sym][:type]
+        values_found =
+          resolve_path(resource, path)
+            .map do |value|
+          if value.is_a? FHIR::Reference
+            value.reference
+          else
+            value
+          end
+        end
+
+        match_found =
+          case type
+          when 'Period', 'date', 'instant', 'dateTime'
+            values_found.any? { |date| validate_date_search(search_value, date) }
+          when 'HumanName'
+            # When a string search parameter refers to the types HumanName and Address,
+            # the search covers the elements of type string, and does not cover elements such as use and period
+            # https://www.hl7.org/fhir/search.html#string
+            search_value_downcase = search_value.downcase
+            values_found.any? do |name|
+              name&.text&.downcase&.start_with?(search_value_downcase) ||
+                name&.family&.downcase&.start_with?(search_value_downcase) ||
+                name&.given&.any? { |given| given.downcase.start_with?(search_value_downcase) } ||
+                name&.prefix&.any? { |prefix| prefix.downcase.start_with?(search_value_downcase) } ||
+                name&.suffix&.any? { |suffix| suffix.downcase.start_with?(search_value_downcase) }
+            end
+          when 'Address'
+            search_value_downcase = search_value.downcase
+            values_found.any? do |address|
+              address&.text&.downcase&.start_with?(search_value_downcase) ||
+                address&.city&.downcase&.start_with?(search_value_downcase) ||
+                address&.state&.downcase&.start_with?(search_value_downcase) ||
+                address&.postalCode&.downcase&.start_with?(search_value_downcase) ||
+                address&.country&.downcase&.start_with?(search_value_downcase)
+            end
+          when 'CodeableConcept'
+            # FHIR token search (https://www.hl7.org/fhir/search.html#token): "When in doubt, servers SHOULD
+            # treat tokens in a case-insensitive manner, on the grounds that including undesired data has
+            # less safety implications than excluding desired behavior".
+            codings = values_found.flat_map(&:coding)
+            if search_value.include? '|'
+              system = search_value.split('|').first
+              code = search_value.split('|').last
+              codings&.any? { |coding| coding.system == system && coding.code&.casecmp?(code) }
+            else
+              codings&.any? { |coding| coding.code&.casecmp?(search_value) }
+            end
+          when 'Coding'
+            if search_value.include? '|'
+              system = search_value.split('|').first
+              code = search_value.split('|').last
+              values_found.any? { |coding| coding.system == system && coding.code&.casecmp?(code) }
+            else
+              values_found.any? { |coding| coding.code&.casecmp?(search_value) }
+            end
+          when 'Identifier'
+            if search_value.include? '|'
+              values_found.any? { |identifier| "#{identifier.system}|#{identifier.value}" == search_value }
+            else
+              values_found.any? { |identifier| identifier.value == search_value }
+            end
+          when 'string'
+            searched_values = search_value.downcase.split(/(?<!\\\\),/).map{ |string| string.gsub('\\,', ',') }
+            values_found.any? do |value_found|
+              searched_values.any? { |searched_value| value_found.downcase.starts_with? searched_value }
+            end
+          else
+            # searching by patient requires special case because we are searching by a resource identifier
+            # references can also be URLs, so we may need to resolve those URLs
+            if ['subject', 'patient'].include? search_param_name.to_s
+              id = search_value.split('Patient/').last
+              possible_values = [id, "Patient/#{id}", "#{url}/Patient/#{id}"]
+              values_found.any? do |reference|
+                possible_values.include? reference
+              end
+            else
+              search_values = search_value.split(/(?<!\\\\),/).map { |string| string.gsub('\\,', ',') }
+              values_found.any? { |value_found| search_values.include? value_found }
+            end
+          end
+
+        break if match_found
+      end
+
+      match_found
+    end
+    
+  end
+end

data/lib/us_core_test_kit/search_test.rb

@@ -1,5 +1,6 @@
 require_relative 'date_search_validation'
 require_relative 'fhir_resource_navigation'
+require_relative 'resource_search_param_checker'
 require_relative 'search_test_properties'
 
 module USCoreTestKit
@@ -7,6 +8,7 @@ module USCoreTestKit
     extend Forwardable
     include DateSearchValidation
     include FHIRResourceNavigation
+    include ResourceSearchParamChecker
 
     def_delegators 'self.class', :metadata, :provenance_metadata, :properties
     def_delegators 'properties',
@@ -629,6 +631,8 @@ module USCoreTestKit
             element.family || element.given&.first || element.text
           when FHIR::Address
             element.text || element.city || element.state || element.postalCode || element.country
+          when USCoreTestKit::PrimitiveType
+            element.value
           else
             if metadata.version != 'v3.1.1' &&
                metadata.search_definitions[name.to_sym][:type] == 'date' &&
@@ -676,8 +680,8 @@ module USCoreTestKit
         (element.family || element.given&.first || element.text).present?
       when FHIR::Address
         (element.text || element.city || element.state || element.postalCode || element.country).present?
-      when FHIR::Element
-        false
+      when USCoreTestKit::PrimitiveType
+        element.value.present?
       else
         true
       end

data/lib/us_core_test_kit/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module USCoreTestKit
-  VERSION = '0.7.0'
+  VERSION = '0.7.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: us_core_test_kit
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.2
 platform: ruby
 authors:
 - Stephen MacVicar
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-05-06 00:00:00.000000000 Z
+date: 2024-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: inferno_core
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.2
+        version: 0.4.37
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.2
+        version: 0.4.37
 - !ruby/object:Gem::Dependency
   name: smart_app_launch_test_kit
   requirement: !ruby/object:Gem::Requirement
@@ -127,6 +127,7 @@ files:
 - lib/us_core_test_kit/custom_groups/clinical_note_type_test.rb
 - lib/us_core_test_kit/custom_groups/data_absent_reason_group.rb
 - lib/us_core_test_kit/custom_groups/granted_granular_scopes_test.rb
+- lib/us_core_test_kit/custom_groups/screening_assessment_category_test.rb
 - lib/us_core_test_kit/custom_groups/smart_app_launch_group.rb
 - lib/us_core_test_kit/custom_groups/smart_ehr_launch_stu1.rb
 - lib/us_core_test_kit/custom_groups/smart_ehr_launch_stu2.rb
@@ -141,8 +142,10 @@ files:
 - lib/us_core_test_kit/custom_groups/v4.0.0/document_reference_custodian_test.rb
 - lib/us_core_test_kit/custom_groups/v5.0.1/capability_statement_group.rb
 - lib/us_core_test_kit/custom_groups/v6.1.0/capability_statement_group.rb
+- lib/us_core_test_kit/custom_groups/v6.1.0/screening_assessment_group.rb
 - lib/us_core_test_kit/custom_groups/v6.1.0/smart_granular_scopes_group.rb
 - lib/us_core_test_kit/custom_groups/v7.0.0-ballot/capability_statement_group.rb
+- lib/us_core_test_kit/custom_groups/v7.0.0-ballot/screening_assessment_group.rb
 - lib/us_core_test_kit/custom_groups/v7.0.0-ballot/smart_granular_scopes_group.rb
 - lib/us_core_test_kit/date_search_validation.rb
 - lib/us_core_test_kit/fhir_resource_navigation.rb
@@ -1408,6 +1411,7 @@ files:
 - lib/us_core_test_kit/generated/v6.1.0/condition_encounter_diagnosis/metadata.yml
 - lib/us_core_test_kit/generated/v6.1.0/condition_encounter_diagnosis_group.rb
 - lib/us_core_test_kit/generated/v6.1.0/condition_granular_scope1_group.rb
+- lib/us_core_test_kit/generated/v6.1.0/condition_granular_scope2_group.rb
 - lib/us_core_test_kit/generated/v6.1.0/condition_problems_health_concerns/condition_problems_health_concerns_must_support_test.rb
 - lib/us_core_test_kit/generated/v6.1.0/condition_problems_health_concerns/condition_problems_health_concerns_patient_abatement_date_search_test.rb
 - lib/us_core_test_kit/generated/v6.1.0/condition_problems_health_concerns/condition_problems_health_concerns_patient_asserted_date_search_test.rb
@@ -1510,24 +1514,27 @@ files:
 - lib/us_core_test_kit/generated/v6.1.0/goal/goal_validation_test.rb
 - lib/us_core_test_kit/generated/v6.1.0/goal/metadata.yml
 - lib/us_core_test_kit/generated/v6.1.0/goal_group.rb
-- lib/us_core_test_kit/generated/v6.1.0/granular_scope_tests/condition/condition_patient_abatement_date_granular_scope_test.rb
-- lib/us_core_test_kit/generated/v6.1.0/granular_scope_tests/condition/condition_patient_asserted_date_granular_scope_test.rb
-- lib/us_core_test_kit/generated/v6.1.0/granular_scope_tests/condition/condition_patient_category_clinical_status_granular_scope_test.rb
-- lib/us_core_test_kit/generated/v6.1.0/granular_scope_tests/condition/condition_patient_category_encounter_granular_scope_test.rb
-- lib/us_core_test_kit/generated/v6.1.0/granular_scope_tests/condition/condition_patient_category_granular_scope_test.rb
-- lib/us_core_test_kit/generated/v6.1.0/granular_scope_tests/condition/condition_patient_clinical_status_granular_scope_test.rb
-- lib/us_core_test_kit/generated/v6.1.0/granular_scope_tests/condition/condition_patient_code_granular_scope_test.rb
-- lib/us_core_test_kit/generated/v6.1.0/granular_scope_tests/condition/condition_patient_granular_scope_test.rb
-- lib/us_core_test_kit/generated/v6.1.0/granular_scope_tests/condition/condition_patient_onset_date_granular_scope_test.rb
-- lib/us_core_test_kit/generated/v6.1.0/granular_scope_tests/condition/condition_patient_recorded_date_granular_scope_test.rb
+- lib/us_core_test_kit/generated/v6.1.0/granular_scope_tests/condition/condition_granular_scope_read_test.rb
+- lib/us_core_test_kit/generated/v6.1.0/granular_scope_tests/condition/condition_patient_abatement_date_granular_scope_search_test.rb
+- lib/us_core_test_kit/generated/v6.1.0/granular_scope_tests/condition/condition_patient_asserted_date_granular_scope_search_test.rb
+- lib/us_core_test_kit/generated/v6.1.0/granular_scope_tests/condition/condition_patient_category_clinical_status_granular_scope_search_test.rb
+- lib/us_core_test_kit/generated/v6.1.0/granular_scope_tests/condition/condition_patient_category_encounter_granular_scope_search_test.rb
+- lib/us_core_test_kit/generated/v6.1.0/granular_scope_tests/condition/condition_patient_category_granular_scope_search_test.rb
+- lib/us_core_test_kit/generated/v6.1.0/granular_scope_tests/condition/condition_patient_clinical_status_granular_scope_search_test.rb
+- lib/us_core_test_kit/generated/v6.1.0/granular_scope_tests/condition/condition_patient_code_granular_scope_search_test.rb
+- lib/us_core_test_kit/generated/v6.1.0/granular_scope_tests/condition/condition_patient_granular_scope_search_test.rb
+- lib/us_core_test_kit/generated/v6.1.0/granular_scope_tests/condition/condition_patient_onset_date_granular_scope_search_test.rb
+- lib/us_core_test_kit/generated/v6.1.0/granular_scope_tests/condition/condition_patient_recorded_date_granular_scope_search_test.rb
 - lib/us_core_test_kit/generated/v6.1.0/granular_scope_tests/condition/metadata.yml
 - lib/us_core_test_kit/generated/v6.1.0/granular_scope_tests/observation/metadata.yml
-- lib/us_core_test_kit/generated/v6.1.0/granular_scope_tests/observation/observation_patient_category_date_granular_scope_test.rb
-- lib/us_core_test_kit/generated/v6.1.0/granular_scope_tests/observation/observation_patient_category_granular_scope_test.rb
-- lib/us_core_test_kit/generated/v6.1.0/granular_scope_tests/observation/observation_patient_category_status_granular_scope_test.rb
-- lib/us_core_test_kit/generated/v6.1.0/granular_scope_tests/observation/observation_patient_code_date_granular_scope_test.rb
-- lib/us_core_test_kit/generated/v6.1.0/granular_scope_tests/observation/observation_patient_code_granular_scope_test.rb
+- lib/us_core_test_kit/generated/v6.1.0/granular_scope_tests/observation/observation_granular_scope_read_test.rb
+- lib/us_core_test_kit/generated/v6.1.0/granular_scope_tests/observation/observation_patient_category_date_granular_scope_search_test.rb
+- lib/us_core_test_kit/generated/v6.1.0/granular_scope_tests/observation/observation_patient_category_granular_scope_search_test.rb
+- lib/us_core_test_kit/generated/v6.1.0/granular_scope_tests/observation/observation_patient_category_status_granular_scope_search_test.rb
+- lib/us_core_test_kit/generated/v6.1.0/granular_scope_tests/observation/observation_patient_code_date_granular_scope_search_test.rb
+- lib/us_core_test_kit/generated/v6.1.0/granular_scope_tests/observation/observation_patient_code_granular_scope_search_test.rb
 - lib/us_core_test_kit/generated/v6.1.0/granular_scopes1_group.rb
+- lib/us_core_test_kit/generated/v6.1.0/granular_scopes2_group.rb
 - lib/us_core_test_kit/generated/v6.1.0/head_circumference/head_circumference_must_support_test.rb
 - lib/us_core_test_kit/generated/v6.1.0/head_circumference/head_circumference_patient_category_date_search_test.rb
 - lib/us_core_test_kit/generated/v6.1.0/head_circumference/head_circumference_patient_category_search_test.rb
@@ -1610,6 +1617,7 @@ files:
 - lib/us_core_test_kit/generated/v6.1.0/observation_clinical_result/observation_clinical_result_validation_test.rb
 - lib/us_core_test_kit/generated/v6.1.0/observation_clinical_result_group.rb
 - lib/us_core_test_kit/generated/v6.1.0/observation_granular_scope1_group.rb
+- lib/us_core_test_kit/generated/v6.1.0/observation_granular_scope2_group.rb
 - lib/us_core_test_kit/generated/v6.1.0/observation_lab/metadata.yml
 - lib/us_core_test_kit/generated/v6.1.0/observation_lab/observation_lab_must_support_test.rb
 - lib/us_core_test_kit/generated/v6.1.0/observation_lab/observation_lab_patient_category_date_search_test.rb
@@ -2092,46 +2100,51 @@ files:
 - lib/us_core_test_kit/generated/v7.0.0-ballot/goal/goal_validation_test.rb
 - lib/us_core_test_kit/generated/v7.0.0-ballot/goal/metadata.yml
 - lib/us_core_test_kit/generated/v7.0.0-ballot/goal_group.rb
-- lib/us_core_test_kit/generated/v7.0.0-ballot/granular_scope_tests/condition/condition_patient_abatement_date_granular_scope_test.rb
-- lib/us_core_test_kit/generated/v7.0.0-ballot/granular_scope_tests/condition/condition_patient_asserted_date_granular_scope_test.rb
-- lib/us_core_test_kit/generated/v7.0.0-ballot/granular_scope_tests/condition/condition_patient_category_clinical_status_granular_scope_test.rb
-- lib/us_core_test_kit/generated/v7.0.0-ballot/granular_scope_tests/condition/condition_patient_category_encounter_granular_scope_test.rb
-- lib/us_core_test_kit/generated/v7.0.0-ballot/granular_scope_tests/condition/condition_patient_category_granular_scope_test.rb
-- lib/us_core_test_kit/generated/v7.0.0-ballot/granular_scope_tests/condition/condition_patient_clinical_status_granular_scope_test.rb
-- lib/us_core_test_kit/generated/v7.0.0-ballot/granular_scope_tests/condition/condition_patient_code_granular_scope_test.rb
-- lib/us_core_test_kit/generated/v7.0.0-ballot/granular_scope_tests/condition/condition_patient_granular_scope_test.rb
-- lib/us_core_test_kit/generated/v7.0.0-ballot/granular_scope_tests/condition/condition_patient_onset_date_granular_scope_test.rb
-- lib/us_core_test_kit/generated/v7.0.0-ballot/granular_scope_tests/condition/condition_patient_recorded_date_granular_scope_test.rb
+- lib/us_core_test_kit/generated/v7.0.0-ballot/granular_scope_tests/condition/condition_granular_scope_read_test.rb
+- lib/us_core_test_kit/generated/v7.0.0-ballot/granular_scope_tests/condition/condition_patient_abatement_date_granular_scope_search_test.rb
+- lib/us_core_test_kit/generated/v7.0.0-ballot/granular_scope_tests/condition/condition_patient_asserted_date_granular_scope_search_test.rb
+- lib/us_core_test_kit/generated/v7.0.0-ballot/granular_scope_tests/condition/condition_patient_category_clinical_status_granular_scope_search_test.rb
+- lib/us_core_test_kit/generated/v7.0.0-ballot/granular_scope_tests/condition/condition_patient_category_encounter_granular_scope_search_test.rb
+- lib/us_core_test_kit/generated/v7.0.0-ballot/granular_scope_tests/condition/condition_patient_category_granular_scope_search_test.rb
+- lib/us_core_test_kit/generated/v7.0.0-ballot/granular_scope_tests/condition/condition_patient_clinical_status_granular_scope_search_test.rb
+- lib/us_core_test_kit/generated/v7.0.0-ballot/granular_scope_tests/condition/condition_patient_code_granular_scope_search_test.rb
+- lib/us_core_test_kit/generated/v7.0.0-ballot/granular_scope_tests/condition/condition_patient_granular_scope_search_test.rb
+- lib/us_core_test_kit/generated/v7.0.0-ballot/granular_scope_tests/condition/condition_patient_onset_date_granular_scope_search_test.rb
+- lib/us_core_test_kit/generated/v7.0.0-ballot/granular_scope_tests/condition/condition_patient_recorded_date_granular_scope_search_test.rb
 - lib/us_core_test_kit/generated/v7.0.0-ballot/granular_scope_tests/condition/metadata.yml
-- lib/us_core_test_kit/generated/v7.0.0-ballot/granular_scope_tests/diagnostic_report/diagnostic_report_patient_category_date_granular_scope_test.rb
-- lib/us_core_test_kit/generated/v7.0.0-ballot/granular_scope_tests/diagnostic_report/diagnostic_report_patient_category_granular_scope_test.rb
-- lib/us_core_test_kit/generated/v7.0.0-ballot/granular_scope_tests/diagnostic_report/diagnostic_report_patient_code_date_granular_scope_test.rb
-- lib/us_core_test_kit/generated/v7.0.0-ballot/granular_scope_tests/diagnostic_report/diagnostic_report_patient_code_granular_scope_test.rb
-- lib/us_core_test_kit/generated/v7.0.0-ballot/granular_scope_tests/diagnostic_report/diagnostic_report_patient_granular_scope_test.rb
-- lib/us_core_test_kit/generated/v7.0.0-ballot/granular_scope_tests/diagnostic_report/diagnostic_report_patient_status_granular_scope_test.rb
+- lib/us_core_test_kit/generated/v7.0.0-ballot/granular_scope_tests/diagnostic_report/diagnostic_report_granular_scope_read_test.rb
+- lib/us_core_test_kit/generated/v7.0.0-ballot/granular_scope_tests/diagnostic_report/diagnostic_report_patient_category_date_granular_scope_search_test.rb
+- lib/us_core_test_kit/generated/v7.0.0-ballot/granular_scope_tests/diagnostic_report/diagnostic_report_patient_category_granular_scope_search_test.rb
+- lib/us_core_test_kit/generated/v7.0.0-ballot/granular_scope_tests/diagnostic_report/diagnostic_report_patient_code_date_granular_scope_search_test.rb
+- lib/us_core_test_kit/generated/v7.0.0-ballot/granular_scope_tests/diagnostic_report/diagnostic_report_patient_code_granular_scope_search_test.rb
+- lib/us_core_test_kit/generated/v7.0.0-ballot/granular_scope_tests/diagnostic_report/diagnostic_report_patient_granular_scope_search_test.rb
+- lib/us_core_test_kit/generated/v7.0.0-ballot/granular_scope_tests/diagnostic_report/diagnostic_report_patient_status_granular_scope_search_test.rb
 - lib/us_core_test_kit/generated/v7.0.0-ballot/granular_scope_tests/diagnostic_report/metadata.yml
-- lib/us_core_test_kit/generated/v7.0.0-ballot/granular_scope_tests/document_reference/document_reference_id_granular_scope_test.rb
-- lib/us_core_test_kit/generated/v7.0.0-ballot/granular_scope_tests/document_reference/document_reference_patient_category_date_granular_scope_test.rb
-- lib/us_core_test_kit/generated/v7.0.0-ballot/granular_scope_tests/document_reference/document_reference_patient_category_granular_scope_test.rb
-- lib/us_core_test_kit/generated/v7.0.0-ballot/granular_scope_tests/document_reference/document_reference_patient_granular_scope_test.rb
-- lib/us_core_test_kit/generated/v7.0.0-ballot/granular_scope_tests/document_reference/document_reference_patient_status_granular_scope_test.rb
-- lib/us_core_test_kit/generated/v7.0.0-ballot/granular_scope_tests/document_reference/document_reference_patient_type_granular_scope_test.rb
-- lib/us_core_test_kit/generated/v7.0.0-ballot/granular_scope_tests/document_reference/document_reference_patient_type_period_granular_scope_test.rb
+- lib/us_core_test_kit/generated/v7.0.0-ballot/granular_scope_tests/document_reference/document_reference_granular_scope_read_test.rb
+- lib/us_core_test_kit/generated/v7.0.0-ballot/granular_scope_tests/document_reference/document_reference_id_granular_scope_search_test.rb
+- lib/us_core_test_kit/generated/v7.0.0-ballot/granular_scope_tests/document_reference/document_reference_patient_category_date_granular_scope_search_test.rb
+- lib/us_core_test_kit/generated/v7.0.0-ballot/granular_scope_tests/document_reference/document_reference_patient_category_granular_scope_search_test.rb
+- lib/us_core_test_kit/generated/v7.0.0-ballot/granular_scope_tests/document_reference/document_reference_patient_granular_scope_search_test.rb
+- lib/us_core_test_kit/generated/v7.0.0-ballot/granular_scope_tests/document_reference/document_reference_patient_status_granular_scope_search_test.rb
+- lib/us_core_test_kit/generated/v7.0.0-ballot/granular_scope_tests/document_reference/document_reference_patient_type_granular_scope_search_test.rb
+- lib/us_core_test_kit/generated/v7.0.0-ballot/granular_scope_tests/document_reference/document_reference_patient_type_period_granular_scope_search_test.rb
 - lib/us_core_test_kit/generated/v7.0.0-ballot/granular_scope_tests/document_reference/metadata.yml
 - lib/us_core_test_kit/generated/v7.0.0-ballot/granular_scope_tests/observation/metadata.yml
-- lib/us_core_test_kit/generated/v7.0.0-ballot/granular_scope_tests/observation/observation_patient_category_date_granular_scope_test.rb
-- lib/us_core_test_kit/generated/v7.0.0-ballot/granular_scope_tests/observation/observation_patient_category_granular_scope_test.rb
-- lib/us_core_test_kit/generated/v7.0.0-ballot/granular_scope_tests/observation/observation_patient_category_status_granular_scope_test.rb
-- lib/us_core_test_kit/generated/v7.0.0-ballot/granular_scope_tests/observation/observation_patient_code_date_granular_scope_test.rb
-- lib/us_core_test_kit/generated/v7.0.0-ballot/granular_scope_tests/observation/observation_patient_code_granular_scope_test.rb
+- lib/us_core_test_kit/generated/v7.0.0-ballot/granular_scope_tests/observation/observation_granular_scope_read_test.rb
+- lib/us_core_test_kit/generated/v7.0.0-ballot/granular_scope_tests/observation/observation_patient_category_date_granular_scope_search_test.rb
+- lib/us_core_test_kit/generated/v7.0.0-ballot/granular_scope_tests/observation/observation_patient_category_granular_scope_search_test.rb
+- lib/us_core_test_kit/generated/v7.0.0-ballot/granular_scope_tests/observation/observation_patient_category_status_granular_scope_search_test.rb
+- lib/us_core_test_kit/generated/v7.0.0-ballot/granular_scope_tests/observation/observation_patient_code_date_granular_scope_search_test.rb
+- lib/us_core_test_kit/generated/v7.0.0-ballot/granular_scope_tests/observation/observation_patient_code_granular_scope_search_test.rb
 - lib/us_core_test_kit/generated/v7.0.0-ballot/granular_scope_tests/service_request/metadata.yml
-- lib/us_core_test_kit/generated/v7.0.0-ballot/granular_scope_tests/service_request/service_request_id_granular_scope_test.rb
-- lib/us_core_test_kit/generated/v7.0.0-ballot/granular_scope_tests/service_request/service_request_patient_category_authored_granular_scope_test.rb
-- lib/us_core_test_kit/generated/v7.0.0-ballot/granular_scope_tests/service_request/service_request_patient_category_granular_scope_test.rb
-- lib/us_core_test_kit/generated/v7.0.0-ballot/granular_scope_tests/service_request/service_request_patient_code_authored_granular_scope_test.rb
-- lib/us_core_test_kit/generated/v7.0.0-ballot/granular_scope_tests/service_request/service_request_patient_code_granular_scope_test.rb
-- lib/us_core_test_kit/generated/v7.0.0-ballot/granular_scope_tests/service_request/service_request_patient_granular_scope_test.rb
-- lib/us_core_test_kit/generated/v7.0.0-ballot/granular_scope_tests/service_request/service_request_patient_status_granular_scope_test.rb
+- lib/us_core_test_kit/generated/v7.0.0-ballot/granular_scope_tests/service_request/service_request_granular_scope_read_test.rb
+- lib/us_core_test_kit/generated/v7.0.0-ballot/granular_scope_tests/service_request/service_request_id_granular_scope_search_test.rb
+- lib/us_core_test_kit/generated/v7.0.0-ballot/granular_scope_tests/service_request/service_request_patient_category_authored_granular_scope_search_test.rb
+- lib/us_core_test_kit/generated/v7.0.0-ballot/granular_scope_tests/service_request/service_request_patient_category_granular_scope_search_test.rb
+- lib/us_core_test_kit/generated/v7.0.0-ballot/granular_scope_tests/service_request/service_request_patient_code_authored_granular_scope_search_test.rb
+- lib/us_core_test_kit/generated/v7.0.0-ballot/granular_scope_tests/service_request/service_request_patient_code_granular_scope_search_test.rb
+- lib/us_core_test_kit/generated/v7.0.0-ballot/granular_scope_tests/service_request/service_request_patient_granular_scope_search_test.rb
+- lib/us_core_test_kit/generated/v7.0.0-ballot/granular_scope_tests/service_request/service_request_patient_status_granular_scope_search_test.rb
 - lib/us_core_test_kit/generated/v7.0.0-ballot/granular_scopes1_group.rb
 - lib/us_core_test_kit/generated/v7.0.0-ballot/granular_scopes2_group.rb
 - lib/us_core_test_kit/generated/v7.0.0-ballot/head_circumference/head_circumference_must_support_test.rb
@@ -2488,6 +2501,7 @@ files:
 - lib/us_core_test_kit/generated/v7.0.0-ballot/us_core_test_suite.rb
 - lib/us_core_test_kit/generator.rb
 - lib/us_core_test_kit/generator/granular_scope_group_generator.rb
+- lib/us_core_test_kit/generator/granular_scope_read_test_generator.rb
 - lib/us_core_test_kit/generator/granular_scope_resource_type_group_generator.rb
 - lib/us_core_test_kit/generator/granular_scope_test_generator.rb
 - lib/us_core_test_kit/generator/group_generator.rb
@@ -2516,7 +2530,9 @@ files:
 - lib/us_core_test_kit/generator/terminology_binding_metadata_extractor.rb
 - lib/us_core_test_kit/generator/validation_test_generator.rb
 - lib/us_core_test_kit/generator/value_extractor.rb
-- lib/us_core_test_kit/granular_scope_checker.rb
+- lib/us_core_test_kit/granular_scope.rb
+- lib/us_core_test_kit/granular_scope_read_test.rb
+- lib/us_core_test_kit/granular_scope_search_test.rb
 - lib/us_core_test_kit/igs/us_core_311.tgz
 - lib/us_core_test_kit/igs/us_core_311/StructureDefinition-bodyheight.json
 - lib/us_core_test_kit/igs/us_core_311/StructureDefinition-bodytemp.json
@@ -2537,10 +2553,12 @@ files:
 - lib/us_core_test_kit/igs/us_core_700_ballot/StructureDefinition-condition-assertedDate.json
 - lib/us_core_test_kit/igs/us_core_700_ballot/ValueSet-servicerequest-category.json
 - lib/us_core_test_kit/must_support_test.rb
+- lib/us_core_test_kit/primitive_type.rb
 - lib/us_core_test_kit/provenance_validator.rb
 - lib/us_core_test_kit/read_test.rb
 - lib/us_core_test_kit/reference_resolution_test.rb
 - lib/us_core_test_kit/request_logger.rb
+- lib/us_core_test_kit/resource_search_param_checker.rb
 - lib/us_core_test_kit/search_test.rb
 - lib/us_core_test_kit/search_test_properties.rb
 - lib/us_core_test_kit/us_core_options.rb