us_core_test_kit 0.8.0 → 0.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '0646308cfd9f7fae1d17b4b4b9c3f1cb3d09b1c6cfd9a649104beb0a65077672'
-  data.tar.gz: bd6a3a0fa4427eed31e61d93da2b327bb43eaccf9accf5146fb089601a34a22e
+  metadata.gz: a96c6f3f861e76af7890dece571af5e3c4ca97a8250438807218ac2affe33fce
+  data.tar.gz: 5b005b8775b3855768365acdc237ce371501187102672fbc5058d0214a18dc5f
 SHA512:
-  metadata.gz: bceab9b2ccb933f2af3931d342e7b8a86b4c5c258c2f57187d6bffe7c6856916a1d4db4b58878fcd549d3b8354fbacde2191ab6b0062bc361acb988a7fa2938a
-  data.tar.gz: 031b914039a12f0263230605c6256a57864e4f0780db9379626a207f100adf824bffe03f32f99a55c751e8bced04de27043c1e12237d68c269bd85a9ea4358bb
+  metadata.gz: b210de56a48140207534ad50251d849da40023352e34d71b0e4d73d05a307ec02e5c2c04a81e6b40120246ab50e6e68ff8f138b54134c1c46c94906b453ec36a
+  data.tar.gz: e43c0f334ee18d8b7861328890ed0bc791bc4ef3175d439fafb37b0ecda10222b4e5e5100fd00307ce3f92abaaed35450845b556d6dc3e81e79530fea37328dd

data/lib/us_core_test_kit/custom_groups/granted_granular_scopes_test.rb

@@ -13,18 +13,30 @@ module USCoreTestKit
           .options[:required_scopes]
           .map { |scope| scope[scope.index('/') + 1, scope.length] }
 
+      required_granular_regexes = 
+        required_granular_scopes.flat_map do |scope|
+          [ 
+            Regexp.new(Regexp.quote(scope).gsub(".rs", ".r?s")),
+            Regexp.new(Regexp.quote(scope).gsub(".rs", ".rs?"))
+          ]
+        end
+
       received_granular_scopes =
         received_scopes
           .split(' ')
           .select { |scope| scope.include? '?' }
           .map { |scope| scope[scope.index('/') + 1, scope.length] }
 
-      missing_scopes = required_granular_scopes - received_granular_scopes
+      missing_scopes = 
+        required_granular_regexes
+          .reject do |required_scope|
+            received_granular_scopes.any? { |received_scope| received_scope.match?(required_scope) }
+          end
 
-      wrapped_missing_scopes = missing_scopes.map { |scope| "`#{scope}`" }
+      wrapped_missing_scopes = missing_scopes.map { |scope| "`#{scope.source}`" }
 
       assert missing_scopes.empty?,
-             "The following granular scopes were not granted: #{wrapped_missing_scopes.to_sentence}"
+             "Granular scopes matching the following were not matched: #{wrapped_missing_scopes.to_sentence}"
 
       granular_scope_resource_types =
         required_granular_scopes

data/lib/us_core_test_kit/generated/v6.1.0/metadata.yml

@@ -7111,12 +7111,6 @@
         :path: ''
         :code: social-history
         :system: http://terminology.hl7.org/CodeSystem/observation-category
-    - :slice_id: Observation.effective[x]:effectiveDateTime
-      :slice_name: effectiveDateTime
-      :path: effective[x]
-      :discriminator:
-        :type: type
-        :code: DateTime
     :elements:
     - :path: status
     - :path: category
@@ -7128,6 +7122,7 @@
       - http://hl7.org/fhir/us/core/StructureDefinition/us-core-patient
     - :path: valueCodeableConcept
       :original_path: value[x]
+    - :path: effective[x]
   :mandatory_elements:
   - Observation.status
   - Observation.category
@@ -10732,12 +10727,6 @@
     - :path: telecom
     - :path: telecom.system
     - :path: telecom.value
-    - :path: address
-    - :path: address.line
-    - :path: address.city
-    - :path: address.state
-    - :path: address.postalCode
-    - :path: address.country
   :mandatory_elements:
   - Practitioner.identifier
   - Practitioner.identifier.system
@@ -10794,6 +10783,8 @@
     :file_name: practitioner_validation_test.rb
   - :id: us_core_v610_practitioner_must_support_test
     :file_name: practitioner_must_support_test.rb
+  - :id: us_core_v610_practitioner_address_test
+    :file_name: practitioner_address_test.rb
   :id: us_core_v610_practitioner
   :file_name: practitioner_group.rb
   :delayed_references: []

data/lib/us_core_test_kit/generated/v6.1.0/practitioner/metadata.yml

@@ -100,12 +100,6 @@
   - :path: telecom
   - :path: telecom.system
   - :path: telecom.value
-  - :path: address
-  - :path: address.line
-  - :path: address.city
-  - :path: address.state
-  - :path: address.postalCode
-  - :path: address.country
 :mandatory_elements:
 - Practitioner.identifier
 - Practitioner.identifier.system
@@ -162,6 +156,8 @@
   :file_name: practitioner_validation_test.rb
 - :id: us_core_v610_practitioner_must_support_test
   :file_name: practitioner_must_support_test.rb
+- :id: us_core_v610_practitioner_address_test
+  :file_name: practitioner_address_test.rb
 :id: us_core_v610_practitioner
 :file_name: practitioner_group.rb
 :delayed_references: []

data/lib/us_core_test_kit/generated/v6.1.0/practitioner/practitioner_address_test.rb

@@ -0,0 +1,32 @@
+require_relative '../../../practitioner_address_test'
+
+module USCoreTestKit
+  module USCoreV610
+    class PractitionerAddressTest < Inferno::Test
+      include USCoreTestKit::PractitionerAddressTest
+
+      title 'Server support either Practitioner.address or PractitionerRole'
+      description %(
+        US Core Responders SHALL support either US Core PractitionerRole Profile or
+        these data elements in US Core Practitioner Profile
+
+        * Practitioner.address
+        * Practitioner.address.city
+        * Practitioner.address.country
+        * Practitioner.address.line
+        * Practitioner.address.postalCode
+        * Practitioner.address.state
+      )
+
+      id :us_core_v610_practitioner_address_test
+
+      def self.metadata
+        @metadata ||= Generator::GroupMetadata.new(YAML.load_file(File.join(__dir__, 'metadata.yml'), aliases: true))
+      end
+
+      run do
+        verify_practitioner_address
+      end
+    end
+  end
+end

data/lib/us_core_test_kit/generated/v6.1.0/practitioner/practitioner_must_support_test.rb

@@ -12,12 +12,6 @@ module USCoreTestKit
         Statement. This test will look through the Practitioner resources
         found previously for the following must support elements:
 
-        * Practitioner.address
-        * Practitioner.address.city
-        * Practitioner.address.country
-        * Practitioner.address.line
-        * Practitioner.address.postalCode
-        * Practitioner.address.state
         * Practitioner.identifier
         * Practitioner.identifier.system
         * Practitioner.identifier.value

data/lib/us_core_test_kit/generated/v6.1.0/practitioner_group.rb

@@ -4,6 +4,7 @@ require_relative 'practitioner/practitioner_name_search_test'
 require_relative 'practitioner/practitioner_identifier_search_test'
 require_relative 'practitioner/practitioner_validation_test'
 require_relative 'practitioner/practitioner_must_support_test'
+require_relative 'practitioner/practitioner_address_test'
 
 module USCoreTestKit
   module USCoreV610
@@ -82,6 +83,7 @@ read succeeds.
       test from: :us_core_v610_practitioner_identifier_search_test
       test from: :us_core_v610_practitioner_validation_test
       test from: :us_core_v610_practitioner_must_support_test
+      test from: :us_core_v610_practitioner_address_test
     end
   end
 end

data/lib/us_core_test_kit/generated/v6.1.0/smokingstatus/metadata.yml

@@ -144,12 +144,6 @@
       :path: ''
       :code: social-history
       :system: http://terminology.hl7.org/CodeSystem/observation-category
-  - :slice_id: Observation.effective[x]:effectiveDateTime
-    :slice_name: effectiveDateTime
-    :path: effective[x]
-    :discriminator:
-      :type: type
-      :code: DateTime
   :elements:
   - :path: status
   - :path: category
@@ -161,6 +155,7 @@
     - http://hl7.org/fhir/us/core/StructureDefinition/us-core-patient
   - :path: valueCodeableConcept
     :original_path: value[x]
+  - :path: effective[x]
 :mandatory_elements:
 - Observation.status
 - Observation.category

data/lib/us_core_test_kit/generated/v6.1.0/smokingstatus/smokingstatus_must_support_test.rb

@@ -15,7 +15,7 @@ module USCoreTestKit
         * Observation.category
         * Observation.category:SocialHistory
         * Observation.code
-        * Observation.effective[x]:effectiveDateTime
+        * Observation.effective[x]
         * Observation.status
         * Observation.subject
         * Observation.valueCodeableConcept

data/lib/us_core_test_kit/generated/v6.1.0/us_core_test_suite.rb

@@ -88,7 +88,11 @@ module USCoreTestKit
         %r{Observation.component\[\d+\].value.ofType\(Quantity\): The code provided \(http://unitsofmeasure.org#L/min\) was not found in the value set 'Vital Signs Units'} # Known issue with the Pulse Oximetry Profile
       ].freeze
 
-      VERSION_SPECIFIC_MESSAGE_FILTERS = [].freeze
+      VERSION_SPECIFIC_MESSAGE_FILTERS = [
+        %r{Observation\.effective\.ofType\(Period\):.*http://hl7.org/fhir/us/core/StructureDefinition/us-core-smokingstatus},
+        %r{Observation: Slice 'Observation\.effective\[x\]:effectiveDateTime':.*http://hl7.org/fhir/us/core/StructureDefinition/us-core-smokingstatus},
+        %r{Observation\.effective\.ofType\(Period\).*This element is not allowed by the profile http://hl7.org/fhir/StructureDefinition/dateTime}
+      ].freeze
 
       def self.metadata
         @metadata ||= YAML.load_file(File.join(__dir__, 'metadata.yml'), aliases: true)[:groups].map do |raw_metadata|

data/lib/us_core_test_kit/generated/v7.0.0/metadata.yml

@@ -12533,12 +12533,6 @@
     - :path: telecom
     - :path: telecom.system
     - :path: telecom.value
-    - :path: address
-    - :path: address.line
-    - :path: address.city
-    - :path: address.state
-    - :path: address.postalCode
-    - :path: address.country
   :mandatory_elements:
   - Practitioner.identifier
   - Practitioner.identifier.system
@@ -12595,6 +12589,8 @@
     :file_name: practitioner_validation_test.rb
   - :id: us_core_v700_practitioner_must_support_test
     :file_name: practitioner_must_support_test.rb
+  - :id: us_core_v700_practitioner_address_test
+    :file_name: practitioner_address_test.rb
   :id: us_core_v700_practitioner
   :file_name: practitioner_group.rb
   :delayed_references: []

data/lib/us_core_test_kit/generated/v7.0.0/practitioner/metadata.yml

@@ -100,12 +100,6 @@
   - :path: telecom
   - :path: telecom.system
   - :path: telecom.value
-  - :path: address
-  - :path: address.line
-  - :path: address.city
-  - :path: address.state
-  - :path: address.postalCode
-  - :path: address.country
 :mandatory_elements:
 - Practitioner.identifier
 - Practitioner.identifier.system
@@ -162,6 +156,8 @@
   :file_name: practitioner_validation_test.rb
 - :id: us_core_v700_practitioner_must_support_test
   :file_name: practitioner_must_support_test.rb
+- :id: us_core_v700_practitioner_address_test
+  :file_name: practitioner_address_test.rb
 :id: us_core_v700_practitioner
 :file_name: practitioner_group.rb
 :delayed_references: []

data/lib/us_core_test_kit/generated/v7.0.0/practitioner/practitioner_address_test.rb

@@ -0,0 +1,32 @@
+require_relative '../../../practitioner_address_test'
+
+module USCoreTestKit
+  module USCoreV700
+    class PractitionerAddressTest < Inferno::Test
+      include USCoreTestKit::PractitionerAddressTest
+
+      title 'Server support either Practitioner.address or PractitionerRole'
+      description %(
+        US Core Responders SHALL support either US Core PractitionerRole Profile or
+        these data elements in US Core Practitioner Profile
+
+        * Practitioner.address
+        * Practitioner.address.city
+        * Practitioner.address.country
+        * Practitioner.address.line
+        * Practitioner.address.postalCode
+        * Practitioner.address.state
+      )
+
+      id :us_core_v700_practitioner_address_test
+
+      def self.metadata
+        @metadata ||= Generator::GroupMetadata.new(YAML.load_file(File.join(__dir__, 'metadata.yml'), aliases: true))
+      end
+
+      run do
+        verify_practitioner_address
+      end
+    end
+  end
+end

data/lib/us_core_test_kit/generated/v7.0.0/practitioner/practitioner_must_support_test.rb

@@ -12,12 +12,6 @@ module USCoreTestKit
         Statement. This test will look through the Practitioner resources
         found previously for the following must support elements:
 
-        * Practitioner.address
-        * Practitioner.address.city
-        * Practitioner.address.country
-        * Practitioner.address.line
-        * Practitioner.address.postalCode
-        * Practitioner.address.state
         * Practitioner.identifier
         * Practitioner.identifier.system
         * Practitioner.identifier.value

data/lib/us_core_test_kit/generated/v7.0.0/practitioner_group.rb

@@ -4,6 +4,7 @@ require_relative 'practitioner/practitioner_identifier_search_test'
 require_relative 'practitioner/practitioner_name_search_test'
 require_relative 'practitioner/practitioner_validation_test'
 require_relative 'practitioner/practitioner_must_support_test'
+require_relative 'practitioner/practitioner_address_test'
 
 module USCoreTestKit
   module USCoreV700
@@ -82,6 +83,7 @@ read succeeds.
       test from: :us_core_v700_practitioner_name_search_test
       test from: :us_core_v700_practitioner_validation_test
       test from: :us_core_v700_practitioner_must_support_test
+      test from: :us_core_v700_practitioner_address_test
     end
   end
 end

data/lib/us_core_test_kit/generator/group_generator.rb

@@ -110,8 +110,7 @@ module USCoreTestKit
       def add_special_tests
         return if group_metadata.reformatted_version == 'v311'
 
-        case group_metadata.resource
-        when 'DocumentReference'
+        if group_metadata.resource == 'DocumentReference'
           group_metadata.add_test(
             id: 'us_core_v400_document_reference_custodian_test',
             file_name: '../../custom_groups/v4.0.0/document_reference_custodian_test.rb'

data/lib/us_core_test_kit/generator/must_support_metadata_extractor_us_core_6.rb

@@ -27,6 +27,8 @@ module USCoreTestKit
       def handle_special_cases
         add_must_support_choices
         add_patient_uscdi_elements
+        update_smoking_status_effective
+        remove_practitioner_address
       end
 
       def add_must_support_choices
@@ -79,8 +81,21 @@ module USCoreTestKit
             element[:path] = 'deceasedDateTime'
           end
         end
+      end
+
+      # US Core v6.1.0 Patch FHIR-43355, US Core Smoking Status Observation Profile may be supported
+      # either Observation.effectiveDateTime or Observation.effectivePeriod data element
+      def update_smoking_status_effective
+        return unless profile.id == 'us-core-smokingstatus'
+
+        must_supports[:slices].delete_if { |slice| slice[:slice_id] == 'Observation.effective[x]:effectiveDateTime' }
+        must_supports[:elements] << { path: 'effective[x]' }
+      end
 
+      def remove_practitioner_address
+        return unless profile.type == 'Practitioner'
 
+        must_supports[:elements].delete_if { |element| element[:path].start_with?('address') }
       end
     end
   end

data/lib/us_core_test_kit/generator/must_support_metadata_extractor_us_core_7.rb

@@ -17,11 +17,14 @@ module USCoreTestKit
       end
 
       def handle_special_cases
-        us_core_6_extractor.handle_special_cases
+        us_core_6_extractor.add_patient_uscdi_elements
         add_must_support_choices
+        us_core_6_extractor.remove_practitioner_address
       end
 
       def add_must_support_choices
+        us_core_6_extractor.add_must_support_choices
+
         more_choices = []
 
         case profile.type

data/lib/us_core_test_kit/generator/practitioner_address_test_generator.rb

@@ -0,0 +1,68 @@
+module USCoreTestKit
+  class Generator
+    class PractitionerAddressTestGenerator
+      class << self
+        def generate(ig_metadata, base_output_dir)
+          ig_metadata.groups
+            .reject { |group| SpecialCases.exclude_group? group }
+            .each { |group| new(group, base_output_dir).generate }
+        end
+      end
+
+      attr_accessor :group_metadata, :base_output_dir
+
+      def initialize(group_metadata, base_output_dir)
+        self.group_metadata = group_metadata
+        self.base_output_dir = base_output_dir
+      end
+
+      def template
+        @template ||= File.read(File.join(__dir__, 'templates', 'practitioner_address_test.rb.erb'))
+      end
+
+      def output
+        @output ||= ERB.new(template).result(binding)
+      end
+
+      def base_output_file_name
+        "#{class_name.underscore}.rb"
+      end
+
+      def output_file_directory
+        File.join(base_output_dir, profile_identifier)
+      end
+
+      def output_file_name
+        File.join(output_file_directory, base_output_file_name)
+      end
+
+      def profile_identifier
+        Naming.snake_case_for_profile(group_metadata)
+      end
+
+      def test_id
+        "us_core_#{group_metadata.reformatted_version}_practitioner_address_test"
+      end
+
+      def class_name
+        "PractitionerAddressTest"
+      end
+
+      def module_name
+        "USCore#{group_metadata.reformatted_version.upcase}"
+      end
+
+      def generate
+        return unless group_metadata.resource == 'Practitioner' && group_metadata.version[1].to_i > 5
+
+        FileUtils.mkdir_p(output_file_directory)
+        File.open(output_file_name, 'w') { |f| f.write(output) }
+
+        group_metadata.add_test(
+          id: test_id,
+          file_name: base_output_file_name
+        )
+      end
+    end
+  end
+end

data/lib/us_core_test_kit/generator/suite_generator.rb

@@ -18,7 +18,16 @@ module USCoreTestKit
       end
 
       def version_specific_message_filters
-        []
+        case ig_metadata.reformatted_version
+        when 'v610'
+          [
+            %r{Observation\.effective\.ofType\(Period\):.*http://hl7.org/fhir/us/core/StructureDefinition/us-core-smokingstatus},
+            %r{Observation: Slice 'Observation\.effective\[x\]:effectiveDateTime':.*http://hl7.org/fhir/us/core/StructureDefinition/us-core-smokingstatus},
+            %r{Observation\.effective\.ofType\(Period\).*This element is not allowed by the profile http://hl7.org/fhir/StructureDefinition/dateTime}
+          ]
+        else
+          []
+        end
       end
 
       def template

data/lib/us_core_test_kit/generator.rb

@@ -15,6 +15,7 @@ require_relative 'generator/reference_resolution_test_generator'
 require_relative 'generator/search_test_generator'
 require_relative 'generator/suite_generator'
 require_relative 'generator/validation_test_generator'
+require_relative 'generator/practitioner_address_test_generator'
 
 module USCoreTestKit
   class Generator
@@ -44,6 +45,7 @@ module USCoreTestKit
       generate_validation_tests
       generate_must_support_tests
       generate_reference_resolution_tests
+      generate_practitioner_address_tests
 
       generate_granular_scope_tests
 
@@ -120,6 +122,10 @@ module USCoreTestKit
       GranularScopeGroupGenerator.generate(ig_metadata, base_output_dir)
     end
 
+    def generate_practitioner_address_tests
+      PractitionerAddressTestGenerator.generate(ig_metadata, base_output_dir)
+    end
+
     def generate_suites
       SuiteGenerator.generate(ig_metadata, base_output_dir)
     end

data/lib/us_core_test_kit/granular_scope_search_test.rb

@@ -28,7 +28,7 @@ module USCoreTestKit
           if request.status != 200
             []
           else
-            fetch_all_bundled_resources
+            fetch_all_bundled_resources.select { |resource| resource.resourceType == resource_type }
           end
 
         mismatched_ids = mismatched_resource_ids(found_resources)
@@ -78,6 +78,7 @@ module USCoreTestKit
 
     def expected_resource_ids(resources)
       resources
+        .select { |resource| resource.resourceType == resource_type }
         .select do |resource|
           granular_scope_search_params.any? do |param|
             resource_matches_param?(resource, param[:name], param[:value])
@@ -88,6 +89,7 @@ module USCoreTestKit
 
     def mismatched_resource_ids(resources)
       resources
+        .select { |resource| resource.resourceType == resource_type }
         .reject do |resource|
           granular_scope_search_params.any? do |param|
             resource_matches_param?(resource, param[:name], param[:value])

data/lib/us_core_test_kit/must_support_test.rb

@@ -107,33 +107,36 @@ module USCoreTestKit
     end
 
     def missing_elements(resources = [])
-      @missing_elements ||=
-        must_support_elements.select do |element_definition|
-          resources.none? do |resource|
-            path = element_definition[:path]
-            ms_extension_urls = must_support_extensions.select { |ex| ex[:path] == "#{path}.extension" }
-              .map { |ex| ex[:url] }
-
-            value_found = find_a_value_at(resource, path) do |value|
-              if value.instance_of?(USCoreTestKit::PrimitiveType) && ms_extension_urls.present?
-                urls = value.extension&.map(&:url)
-                has_ms_extension = (urls & ms_extension_urls).present?
-              end
+      @missing_elements ||= find_missing_elements(resources, must_support_elements)
+      @missing_elements
+    end
 
-              unless has_ms_extension
-                value = value.value if value.instance_of?(USCoreTestKit::PrimitiveType)
-                value_without_extensions =
-                  value.respond_to?(:to_hash) ? value.to_hash.reject { |key, _| key == 'extension' } : value
-              end
+    def find_missing_elements(resources, must_support_elements)
+      must_support_elements.select do |element_definition|
+        resources.none? do |resource|
+          path = element_definition[:path]
+          ms_extension_urls = must_support_extensions.select { |ex| ex[:path] == "#{path}.extension" }
+            .map { |ex| ex[:url] }
+
+          value_found = find_a_value_at(resource, path) do |value|
+            if value.instance_of?(USCoreTestKit::PrimitiveType) && ms_extension_urls.present?
+              urls = value.extension&.map(&:url)
+              has_ms_extension = (urls & ms_extension_urls).present?
+            end
 
-              (has_ms_extension || value_without_extensions.present? || value_without_extensions == false) &&
-                (element_definition[:fixed_value].blank? || value == element_definition[:fixed_value])
+            unless has_ms_extension
+              value = value.value if value.instance_of?(USCoreTestKit::PrimitiveType)
+              value_without_extensions =
+                value.respond_to?(:to_hash) ? value.to_hash.reject { |key, _| key == 'extension' } : value
             end
-            # Note that false.present? => false, which is why we need to add this extra check
-            value_found.present? || value_found == false
+
+            (has_ms_extension || value_without_extensions.present? || value_without_extensions == false) &&
+              (element_definition[:fixed_value].blank? || value == element_definition[:fixed_value])
           end
+          # Note that false.present? => false, which is why we need to add this extra check
+          value_found.present? || value_found == false
         end
-      @missing_elements
+      end
     end
 
     def must_support_slices

data/lib/us_core_test_kit/practitioner_address_test.rb

@@ -0,0 +1,85 @@
+# frozen_string_literal: true
+
+module USCoreTestKit
+  module PractitionerAddressTest
+    include SearchTest
+    include ReferenceResolutionTest
+    include MustSupportTest
+
+    MUST_SUPPORT_ELEMENTS = [
+      { path: 'address' },
+      { path: 'address.line' },
+      { path: 'address.city' },
+      { path: 'address.state' },
+      { path: 'address.postalCode' },
+      { path: 'address.country' }
+    ].freeze
+
+    def resource_type
+      'Practitioner'
+    end
+
+    def scratch_resources
+      scratch[:practitioner_resource] ||= {}
+    end
+
+    def verify_practitioner_address
+      references = scratch.dig(:references, 'Practitioner')
+      assert references.any?, 'No Pracitioner references found.'
+
+      @missing_elements = MUST_SUPPORT_ELEMENTS
+      practitioners = []
+
+      references.each do |reference|
+        resolved_resource = resolve_reference(reference)
+
+        if resolved_resource.nil? ||
+           resolved_resource.resourceType != resource_type ||
+           resolved_resource.id != reference.reference_id
+          next
+        end
+
+        practitioners << resolved_resource
+
+        some_missing_elements = find_missing_elements([resolved_resource], MUST_SUPPORT_ELEMENTS)
+        @missing_elements &= some_missing_elements
+
+        break if @missing_elements.empty?
+      end
+
+      missing_elements_string = @missing_elements.map { |element| missing_element_string(element) }
+      support_practitioner_role = false
+
+      if @missing_elements.any?
+        resource_type = 'PractitionerRole'
+        support_practitioner_role = practitioners.any? do |practitioner|
+          search_params = { practitioner: practitioner.id }
+
+          search_and_check_response(search_params, resource_type)
+
+          practitioner_roles = fetch_all_bundled_resources(resource_type:)
+                               .select { |resource| resource.resourceType == resource_type }
+
+          next false if practitioner_roles.empty?
+          next true if config.options[:skip_practitioner_role_validation]
+
+          target_profile_with_version =
+            "http://hl7.org/fhir/us/core/StructureDefinition/us-core-practitionerrole|#{metadata.profile_version}"
+
+          practitioner_roles.any? { |pr| resource_is_valid_with_target_profile?(pr, target_profile_with_version) }
+        end
+      end
+
+      missing_must_support_message = "Could not find US Core PractitionerRole Profile resources and " \
+                                     "these MustSupport elements #{missing_elements_string.join(', ')} " \
+                                     "in US Core Practitioner Profile resources. " \
+                                     "Please use patients with more information."
+
+      assert (support_practitioner_role || @missing_elements.blank?), missing_must_support_message
+    end
+
+    def get_practitioner_ids(references)
+      references.map { |reference| reference.reference&.split('/')&.last }.compact.uniq
+    end
+  end
+end

data/lib/us_core_test_kit/reference_resolution_test.rb

@@ -119,36 +119,17 @@ module USCoreTestKit
         return resource.contained.any? do |contained_resource|
             contained_resource&.id == reference.reference_id &&
               resource_is_valid_with_target_profile?(contained_resource, target_profile)
-          end
+        end
       end
 
       reference_type = reference.resource_type
       reference_id = reference.reference_id
 
-      resolved_resource =
-        begin
-          if reference.relative?
-            begin
-              reference.resource_class
-            rescue NameError
-              return false
-            end
+      resolved_resource = resolve_reference(reference)
 
-            fhir_read(reference_type, reference_id)&.resource
-          else
-            if reference.base_uri.chomp('/') == fhir_client.instance_variable_get(:@base_service_url).chomp('/')
-              fhir_read(reference_type, reference_id)&.resource
-            else
-              get(reference.reference)&.resource
-            end
-          end
-        rescue StandardError => e
-          Inferno::Application['logger'].error("Unable to resolve reference #{reference.reference}")
-          Inferno::Application['logger'].error(e.full_message)
-          return false
-        end
+      return false if resolved_resource.nil?
 
-      return false unless resolved_resource&.resourceType == reference_type && resolved_resource&.id == reference_id
+      return false unless resolved_resource.resourceType == reference_type && resolved_resource.id == reference_id
 
       return false unless resource_is_valid_with_target_profile?(resolved_resource, target_profile)
 
@@ -156,6 +137,33 @@ module USCoreTestKit
       true
     end
 
+    def resolve_reference(reference)
+      reference_type = reference.resource_type
+      reference_id = reference.reference_id
+
+      begin
+        if reference.relative?
+          begin
+            reference.resource_class
+          rescue NameError
+            return nil
+          end
+
+          fhir_read(reference_type, reference_id)&.resource
+        else
+          if reference.base_uri.chomp('/') == fhir_client.instance_variable_get(:@base_service_url).chomp('/')
+            fhir_read(reference_type, reference_id)&.resource
+          else
+            get(reference.reference)&.resource
+          end
+        end
+      rescue StandardError => e
+        Inferno::Application['logger'].error("Unable to resolve reference #{reference.reference}")
+        Inferno::Application['logger'].error(e.full_message)
+        return nil
+      end
+    end
+
     def resource_is_valid_with_target_profile?(resource, target_profile)
       return true if target_profile.blank?
 

data/lib/us_core_test_kit/search_test.rb

@@ -737,16 +737,19 @@ module USCoreTestKit
 
       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
+
+        resolve_path(resource, path).each do |value|
+          values_found <<
+            if value.is_a? FHIR::Reference
+              value.reference
+            elsif value.is_a? USCoreTestKit::PrimitiveType
+              value.value
+            else
+              value
+            end
         end
 
+        values_found.compact!
         match_found =
           case type
           when 'Period', 'date', 'instant', 'dateTime'

data/lib/us_core_test_kit/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: us_core_test_kit
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.8.2
 platform: ruby
 authors:
 - Stephen MacVicar
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-08-01 00:00:00.000000000 Z
+date: 2024-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: inferno_core
@@ -1739,6 +1739,7 @@ files:
 - lib/us_core_test_kit/generated/v6.1.0/pediatric_weight_for_height/pediatric_weight_for_height_validation_test.rb
 - lib/us_core_test_kit/generated/v6.1.0/pediatric_weight_for_height_group.rb
 - lib/us_core_test_kit/generated/v6.1.0/practitioner/metadata.yml
+- lib/us_core_test_kit/generated/v6.1.0/practitioner/practitioner_address_test.rb
 - lib/us_core_test_kit/generated/v6.1.0/practitioner/practitioner_id_search_test.rb
 - lib/us_core_test_kit/generated/v6.1.0/practitioner/practitioner_identifier_search_test.rb
 - lib/us_core_test_kit/generated/v6.1.0/practitioner/practitioner_must_support_test.rb
@@ -2359,6 +2360,7 @@ files:
 - lib/us_core_test_kit/generated/v7.0.0/pediatric_weight_for_height/pediatric_weight_for_height_validation_test.rb
 - lib/us_core_test_kit/generated/v7.0.0/pediatric_weight_for_height_group.rb
 - lib/us_core_test_kit/generated/v7.0.0/practitioner/metadata.yml
+- lib/us_core_test_kit/generated/v7.0.0/practitioner/practitioner_address_test.rb
 - lib/us_core_test_kit/generated/v7.0.0/practitioner/practitioner_id_search_test.rb
 - lib/us_core_test_kit/generated/v7.0.0/practitioner/practitioner_identifier_search_test.rb
 - lib/us_core_test_kit/generated/v7.0.0/practitioner/practitioner_must_support_test.rb
@@ -2522,6 +2524,7 @@ files:
 - lib/us_core_test_kit/generator/must_support_metadata_extractor_us_core_7.rb
 - lib/us_core_test_kit/generator/must_support_test_generator.rb
 - lib/us_core_test_kit/generator/naming.rb
+- lib/us_core_test_kit/generator/practitioner_address_test_generator.rb
 - lib/us_core_test_kit/generator/provenance_revinclude_search_test_generator.rb
 - lib/us_core_test_kit/generator/read_test_generator.rb
 - lib/us_core_test_kit/generator/reference_resolution_test_generator.rb
@@ -2558,6 +2561,7 @@ files:
 - lib/us_core_test_kit/igs/us_core_700/ValueSet-SmokingStatusType.json
 - lib/us_core_test_kit/igs/us_core_700/ValueSet-servicerequest-category.json
 - lib/us_core_test_kit/must_support_test.rb
+- lib/us_core_test_kit/practitioner_address_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