us_core_test_kit 0.4.3 → 0.4.5

data/lib/us_core_test_kit/generated/v5.0.1/respiratory_rate/respiratory_rate_reference_resolution_test.rb

@@ -7,11 +7,15 @@ module USCoreTestKit
       include USCoreTestKit::ReferenceResolutionTest
       include ResourceList
 
-      title 'MustSupport references within Observation resources can be read'
+      title 'MustSupport references within Observation resources are valid'
       description %(
         This test will attempt to read external references provided within elements
-        marked as 'MustSupport', if any are available.  Elements which may provide
-        external references include:
+        marked as 'MustSupport', if any are available.
+
+        It verifies that at least one external reference for each MustSupport Reference element
+        can be accessed by the test client, and conforms to corresponding US Core profile.
+
+        Elements which may provide external references include:
 
         * Observation.subject
       )

data/lib/us_core_test_kit/generated/v5.0.1/service_request/service_request_reference_resolution_test.rb

@@ -7,11 +7,15 @@ module USCoreTestKit
       include USCoreTestKit::ReferenceResolutionTest
       include ResourceList
 
-      title 'MustSupport references within ServiceRequest resources can be read'
+      title 'MustSupport references within ServiceRequest resources are valid'
       description %(
         This test will attempt to read external references provided within elements
-        marked as 'MustSupport', if any are available.  Elements which may provide
-        external references include:
+        marked as 'MustSupport', if any are available.
+
+        It verifies that at least one external reference for each MustSupport Reference element
+        can be accessed by the test client, and conforms to corresponding US Core profile.
+
+        Elements which may provide external references include:
 
         * ServiceRequest.requester
         * ServiceRequest.subject

data/lib/us_core_test_kit/generated/v5.0.1/smokingstatus/smokingstatus_reference_resolution_test.rb

@@ -7,11 +7,15 @@ module USCoreTestKit
       include USCoreTestKit::ReferenceResolutionTest
       include ResourceList
 
-      title 'MustSupport references within Observation resources can be read'
+      title 'MustSupport references within Observation resources are valid'
       description %(
         This test will attempt to read external references provided within elements
-        marked as 'MustSupport', if any are available.  Elements which may provide
-        external references include:
+        marked as 'MustSupport', if any are available.
+
+        It verifies that at least one external reference for each MustSupport Reference element
+        can be accessed by the test client, and conforms to corresponding US Core profile.
+
+        Elements which may provide external references include:
 
         * Observation.subject
       )

data/lib/us_core_test_kit/generated/v5.0.1/us_core_test_suite.rb

@@ -65,8 +65,8 @@ module USCoreTestKit
       version VERSION
 
       VALIDATION_MESSAGE_FILTERS = [
-        %r{Sub-extension url 'introspect' is not defined by the Extension http://fhir-registry\.smarthealthit\.org/StructureDefinition/oauth-uris$},
-        %r{Sub-extension url 'revoke' is not defined by the Extension http://fhir-registry\.smarthealthit\.org/StructureDefinition/oauth-uris$},
+        %r{Sub-extension url 'introspect' is not defined by the Extension http://fhir-registry\.smarthealthit\.org/StructureDefinition/oauth-uris},
+        %r{Sub-extension url 'revoke' is not defined by the Extension http://fhir-registry\.smarthealthit\.org/StructureDefinition/oauth-uris},
         /Observation\.effective\.ofType\(Period\): .*vs-1:/, # Invalid invariant in FHIR v4.0.1
         /Observation\.effective\.ofType\(Period\): .*us-core-1:/, # Invalid invariant in US Core v3.1.1
         /Provenance.agent\[\d*\]: Rule provenance-1/ #Invalid invariant in US Core v5.0.1

data/lib/us_core_test_kit/reference_resolution_test.rb

@@ -23,8 +23,31 @@ module USCoreTestKit
       unresolved_reference_hash.map { |path, profiles| "#{path}#{"(#{profiles.join('|')})" unless profiles.first.empty?}" }
     end
 
-    def record_resolved_reference(reference)
-      resolved_references.add?(reference.reference)
+    def record_resolved_reference(reference, target_profile)
+      saved_reference = resolved_references.find { |item| item[:reference] == reference.reference }
+
+      if saved_reference.present?
+        if target_profile.present? && !saved_reference[:profiles].include?(target_profile)
+          saved_reference[:profiles] << target_profile
+        end
+      else
+        saved_reference = {
+          reference: reference.reference,
+          profiles: []
+        }
+
+        saved_reference[:profiles] << target_profile if target_profile.present?
+        resolved_references.add(saved_reference)
+      end
+    end
+
+    def is_reference_resolved?(reference, target_profile)
+      resolved_references.any? do |item|
+        item[:reference] == reference.reference &&
+        (
+          target_profile.blank? || item[:profiles].include?(target_profile)
+        )
+      end
     end
 
     def resolved_references
@@ -87,7 +110,7 @@ module USCoreTestKit
     end
 
     def validate_reference_resolution(resource, reference, target_profile)
-      return true if resolved_references.include?(reference.reference) && target_profile.blank?
+      return true if is_reference_resolved?(reference, target_profile)
 
       if reference.contained?
         # if reference_id is blank it is referring to itself, so we know it exists
@@ -129,7 +152,7 @@ module USCoreTestKit
 
       return false unless resource_is_valid_with_target_profile?(resolved_resource, target_profile)
 
-      record_resolved_reference(reference)
+      record_resolved_reference(reference, target_profile)
       true
     end
 

data/lib/us_core_test_kit/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: us_core_test_kit
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.4.5
 platform: ruby
 authors:
 - Stephen MacVicar
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-12-09 00:00:00.000000000 Z
+date: 2023-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: inferno_core