us_core_test_kit 0.6.0 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 40e057a850a263a83b69fceef4614ef23b22c60b7ee67eb69cc0df62cff855f7
-  data.tar.gz: 164d24c97bec0fadea35fc97370c141cd200c036f4a7e8e85da3796d5f667ea3
+  metadata.gz: '085de7c8f5dfbf5411a51b4716939b476155eaa9a138134e62315893a997f12c'
+  data.tar.gz: 89dd64e5438427306397c2cee443cadd4584aed6a74dc02c4f6094d742ed2810
 SHA512:
-  metadata.gz: 8f12164ae95d2a69fbd9b81042703060718950e673fba85df055efe76c54c96fbec777d847d92343f84ecb35844c72c655026cde47741792f161e0965f9170b1
-  data.tar.gz: 82a4245c83563487602247524e6ac1ff7b6b3ae1e07d5b736ea84efc2c6cc08f5445c12ce8b48dd316c8c533761a3a5f56d17ad143cb635ec697d4e93aa5b11b
+  metadata.gz: 006a7404ef31b5b936456e487b3e81baaaa7b889452ad2688ed36d7947c255209f933d9c6987cc117ccd0c25afa6280cb9efc4f5ca4f8ae824b077354e2d603e
+  data.tar.gz: fbb0ade67a651b55cf4641c49955b3fc9939e0d25fc8e6c4b755788869b3a1d3d4aff8a9265894e6d5fadc48a13e7601193331bcc4f308f23bb6f7b792988505

data/lib/us_core_test_kit/custom_groups/capability_statement/profile_support_test.rb

@@ -20,30 +20,32 @@ module USCoreTestKit
       assert_resource_type(:capability_statement)
       capability_statement = resource
 
-      supported_resources =
+      supported_profiles =
         capability_statement.rest
-          &.each_with_object([]) do |rest, resources|
-            rest.resource.each { |resource| resources << resource.type }
+          &.each_with_object([]) do |rest, profiles|
+            rest.resource.each { |resource| profiles.concat(resource.supportedProfile) }
           end.uniq
 
-      assert supported_resources.include?('Patient'), 'US Core Patient profile not supported'
+      assert supported_profiles.include?('http://hl7.org/fhir/us/core/StructureDefinition/us-core-patient'), 'US Core Patient profile not supported'
 
-      us_core_resources = config.options[:us_core_resources]
+      us_core_profiles = config.options[:us_core_profiles]
 
-      other_resources = us_core_resources.reject { |resource_type| resource_type == 'Patient' }
-      other_resources_supported = other_resources.any? { |resource| supported_resources.include? resource }
-      assert other_resources_supported, 'No US Core resources other than Patient are supported'
+      other_profiles = us_core_profiles.reject { |resource_type| resource_type == 'http://hl7.org/fhir/us/core/StructureDefinition/us-core-patient' }
+      other_profiles_supported = other_profiles.any? { |profile| supported_profiles.include? profile }
+      assert other_profiles_supported, 'No US Core profiles other than Patient are supported'
 
-      if config.options[:required_resources].present?
-        missing_resources = config.options[:required_resources] - supported_resources
+      if config.options[:required_profiles].present?
+        required_profiles = config.options[:required_profiles]
 
-        missing_resource_list =
-          missing_resources
-          .map { |resource| "`#{resource}`" }
-          .join(', ')
+        missing_profiles = required_profiles - supported_profiles
 
-        assert missing_resources.empty?,
-               "The CapabilityStatement did not list support for the following resources: #{missing_resource_list}"
+        missing_profiles_list =
+          missing_profiles
+            .map { |resource| "`#{resource}`" }
+            .join(', ')
+
+        assert missing_profiles.empty?,
+               "The CapabilityStatement did not list support for the following resources: #{missing_profiles_list}"
       end
     end
   end

data/lib/us_core_test_kit/custom_groups/v3.1.1/capability_statement_group.rb

@@ -2,7 +2,7 @@ require 'tls_test_kit'
 require_relative '../capability_statement/conformance_support_test'
 require_relative '../capability_statement/fhir_version_test'
 require_relative '../capability_statement/json_support_test'
-require_relative '../capability_statement/profile_support_test'
+require_relative './profile_support_test'
 
 module USCoreTestKit
   module USCoreV311

data/lib/us_core_test_kit/custom_groups/v3.1.1/profile_support_test.rb

@@ -0,0 +1,51 @@
+module USCoreTestKit
+  module USCoreV311
+    class ProfileSupportTest < Inferno::Test
+      id :us_core_profile_support
+      title 'Capability Statement lists support for required US Core Resoruce Types'
+      description %(
+        The US Core Implementation Guide states:
+
+        ```
+        The US Core Server SHALL:
+        1. Support the US Core Patient resource.
+        2. Support at least one additional US Core resources.
+
+        In order to support USCDI, servers must support all USCDI resources.
+        ```
+      )
+      uses_request :capability_statement
+
+      run do
+        assert_resource_type(:capability_statement)
+        capability_statement = resource
+
+        supported_resources =
+          capability_statement.rest
+            &.each_with_object([]) do |rest, resources|
+              rest.resource.each { |resource| resources << resource.type }
+            end.uniq
+
+        assert supported_resources.include?('Patient'), 'US Core Patient profile not supported'
+
+        us_core_resources = config.options[:us_core_resources]
+
+        other_resources = us_core_resources.reject { |resource_type| resource_type == 'Patient' }
+        other_resources_supported = other_resources.any? { |resource| supported_resources.include? resource }
+        assert other_resources_supported, 'No US Core resources other than Patient are supported'
+
+        if config.options[:required_resources].present?
+          missing_resources = config.options[:required_resources] - supported_resources
+
+          missing_resource_list =
+            missing_resources
+            .map { |resource| "`#{resource}`" }
+            .join(', ')
+
+          assert missing_resources.empty?,
+                "The CapabilityStatement did not list support for the following resources: #{missing_resource_list}"
+        end
+      end
+    end
+  end
+end

data/lib/us_core_test_kit/custom_groups/v4.0.0/capability_statement_group.rb

@@ -106,7 +106,7 @@ module USCoreTestKit
 
       test from: :us_core_profile_support do
         config(
-          options: { us_core_resources: PROFILES.keys }
+          options: { us_core_profiles: PROFILES.values.flatten }
         )
       end
 

data/lib/us_core_test_kit/custom_groups/v5.0.1/capability_statement_group.rb

@@ -118,7 +118,7 @@ module USCoreTestKit
 
       test from: :us_core_profile_support do
         config(
-          options: { us_core_resources: PROFILES.keys }
+          options: { us_core_profiles: PROFILES.values.flatten }
         )
       end
 

data/lib/us_core_test_kit/custom_groups/v6.1.0/capability_statement_group.rb

@@ -121,7 +121,7 @@ module USCoreTestKit
 
       test from: :us_core_profile_support do
         config(
-          options: { us_core_resources: PROFILES.keys }
+          options: { us_core_profiles: PROFILES.values.flatten }
         )
       end
 

data/lib/us_core_test_kit/fhir_resource_navigation.rb

@@ -20,7 +20,6 @@ module USCoreTestKit
       return nil if element.nil?
 
       elements = Array.wrap(element)
-
       if path.empty?
         unless include_dar
           elements = elements.reject do |el|
@@ -29,24 +28,20 @@ module USCoreTestKit
         end
 
         return elements.find { |el| yield(el) } if block_given?
-
         return elements.first
       end
 
       path_segments = path.split(/(?<!hl7)\./)
-      segment = path_segments.shift.delete_suffix('[x]').gsub(/^class$/, 'local_class').to_sym
 
+      segment = path_segments.shift.delete_suffix('[x]').gsub(/^class$/, 'local_class').gsub(/\[x\]:/, ':').to_sym
       no_elements_present =
         elements.none? do |element|
         child = get_next_value(element, segment)
-
         child.present? || child == false
       end
-
       return nil if no_elements_present
 
       remaining_path = path_segments.join('.')
-
       elements.each do |element|
         child = get_next_value(element, segment)
         element_found =
@@ -55,7 +50,6 @@ module USCoreTestKit
           else
             find_a_value_at(child, remaining_path, include_dar: include_dar)
           end
-
         return element_found if element_found.present? || element_found == false
       end
 
@@ -64,14 +58,88 @@ module USCoreTestKit
 
     def get_next_value(element, property)
       extension_url = property[/(?<=where\(url=').*(?='\))/]
-
       if extension_url.present?
         element.url == extension_url ? element : nil
+      elsif property.to_s.include?(':') && !property.to_s.include?('url')
+        slice = find_slice_via_discriminator(element, property)
+        slice
       else
         element.send(property)
       end
     rescue NoMethodError
       nil
     end
+
+    def find_slice_via_discriminator(element, property)
+      element_name = property.to_s.split(':')[0].gsub(/^class$/, 'local_class')
+      slice_name = property.to_s.split(':')[1].gsub(/^class$/, 'local_class')
+      if metadata.present?
+        slice_by_name = metadata.must_supports[:slices].find{ |slice| slice[:slice_name] == slice_name }
+        discriminator = slice_by_name[:discriminator]
+        slices = Array.wrap(element.send(element_name))
+        slices.find do |slice|
+          case discriminator[:type]
+          when 'patternCodeableConcept'
+            slice_value = discriminator[:path].present? ? slice.send("#{discriminator[:path]}").coding : slice.coding
+            slice_value.any? { |coding| coding.code == discriminator[:code] && coding.system == discriminator[:system] }
+          when 'patternCoding'
+            slice_value = discriminator[:path].present? ? slice.send(discriminator[:path]) : slice
+            slice_value.code == discriminator[:code] && slice_value.system == discriminator[:system]
+          when 'patternIdentifier'
+            slice.identifier.system == discriminator[:system]
+          when 'value'
+            values = discriminator[:values].map { |value| value.merge(path: value[:path].split('.')) }
+            verify_slice_by_values(slice, values)
+          when 'type'
+            case discriminator[:code]
+            when 'Date'
+              begin
+                Date.parse(slice)
+              rescue ArgumentError
+                false
+              end
+            when 'DateTime'
+              begin
+                DateTime.parse(slice)
+              rescue ArgumentError
+                false
+              end
+            when 'String'
+              slice.is_a? String
+            else
+              slice.is_a? FHIR.const_get(discriminator[:code])
+            end
+          when 'requiredBinding'
+            slice_value = discriminator[:path].present? ? slice.send("#{discriminator[:path]}").coding : slice.coding
+            slice_value {|coding| discriminator[:values].include?(coding.code) }
+          end
+        end
+      else
+        #TODO: Error handling for if this file doesn't have access to metadata for some reason (begin/rescue with StandardError?)
+      end
+    end
+
+    def verify_slice_by_values(element, value_definitions)
+      path_prefixes = value_definitions.map { |value_definition| value_definition[:path].first }.uniq
+      path_prefixes.all? do |path_prefix|
+        value_definitions_for_path =
+          value_definitions
+            .select { |value_definition| value_definition[:path].first == path_prefix }
+            .each { |value_definition| value_definition[:path].shift }
+        find_a_value_at(element, path_prefix) do |el_found|
+          child_element_value_definitions, current_element_value_definitions =
+            value_definitions_for_path.partition { |value_definition| value_definition[:path].present? }
+
+          current_element_values_match =
+            current_element_value_definitions
+              .all? { |value_definition| value_definition[:value] == el_found }
+
+          child_element_values_match =
+            child_element_value_definitions.present? ?
+              verify_slice_by_values(el_found, child_element_value_definitions) : true
+          current_element_values_match && child_element_values_match
+        end
+      end
+    end
   end
 end

data/lib/us_core_test_kit/generated/v3.1.1/allergy_intolerance/allergy_intolerance_reference_resolution_test.rb

@@ -1,11 +1,9 @@
 require_relative '../../../reference_resolution_test'
-require_relative '../resource_list'
 
 module USCoreTestKit
   module USCoreV311
     class AllergyIntoleranceReferenceResolutionTest < Inferno::Test
       include USCoreTestKit::ReferenceResolutionTest
-      include ResourceList
 
       title 'MustSupport references within AllergyIntolerance resources are valid'
       description %(

data/lib/us_core_test_kit/generated/v3.1.1/bodyheight/bodyheight_must_support_test.rb

@@ -13,20 +13,20 @@ module USCoreTestKit
         found previously for the following must support elements:
 
         * Observation.category
-        * Observation.category.coding
-        * Observation.category.coding.code
-        * Observation.category.coding.system
         * Observation.category:VSCat
+        * Observation.category:VSCat.coding
+        * Observation.category:VSCat.coding.code
+        * Observation.category:VSCat.coding.system
         * Observation.code
         * Observation.effective[x]
         * Observation.status
         * Observation.subject
         * Observation.value[x]
-        * Observation.value[x].code
-        * Observation.value[x].system
-        * Observation.value[x].unit
-        * Observation.value[x].value
         * Observation.value[x]:valueQuantity
+        * Observation.value[x]:valueQuantity.code
+        * Observation.value[x]:valueQuantity.system
+        * Observation.value[x]:valueQuantity.unit
+        * Observation.value[x]:valueQuantity.value
       )
 
       id :us_core_v311_bodyheight_must_support_test

data/lib/us_core_test_kit/generated/v3.1.1/bodyheight/bodyheight_reference_resolution_test.rb

@@ -1,11 +1,9 @@
 require_relative '../../../reference_resolution_test'
-require_relative '../resource_list'
 
 module USCoreTestKit
   module USCoreV311
     class BodyheightReferenceResolutionTest < Inferno::Test
       include USCoreTestKit::ReferenceResolutionTest
-      include ResourceList
 
       title 'MustSupport references within Observation resources are valid'
       description %(

data/lib/us_core_test_kit/generated/v3.1.1/bodyheight/metadata.yml

@@ -141,12 +141,14 @@
 :must_supports:
   :extensions: []
   :slices:
-  - :name: Observation.value[x]:valueQuantity
+  - :slice_id: Observation.value[x]:valueQuantity
+    :slice_name: valueQuantity
     :path: value[x]
     :discriminator:
       :type: type
       :code: Quantity
-  - :name: Observation.category:VSCat
+  - :slice_id: Observation.category:VSCat
+    :slice_name: VSCat
     :path: category
     :discriminator:
       :type: value
@@ -158,10 +160,10 @@
   :elements:
   - :path: status
   - :path: category
-  - :path: category.coding
-  - :path: category.coding.system
+  - :path: category:VSCat.coding
+  - :path: category:VSCat.coding.system
     :fixed_value: http://terminology.hl7.org/CodeSystem/observation-category
-  - :path: category.coding.code
+  - :path: category:VSCat.coding.code
     :fixed_value: vital-signs
   - :path: code
   - :path: subject
@@ -169,11 +171,11 @@
     - Reference
   - :path: effective[x]
   - :path: value[x]
-  - :path: value[x].value
-  - :path: value[x].unit
-  - :path: value[x].system
+  - :path: value[x]:valueQuantity.value
+  - :path: value[x]:valueQuantity.unit
+  - :path: value[x]:valueQuantity.system
     :fixed_value: http://unitsofmeasure.org
-  - :path: value[x].code
+  - :path: value[x]:valueQuantity.code
 :mandatory_elements:
 - Observation.status
 - Observation.category

data/lib/us_core_test_kit/generated/v3.1.1/bodytemp/bodytemp_must_support_test.rb

@@ -13,20 +13,20 @@ module USCoreTestKit
         found previously for the following must support elements:
 
         * Observation.category
-        * Observation.category.coding
-        * Observation.category.coding.code
-        * Observation.category.coding.system
         * Observation.category:VSCat
+        * Observation.category:VSCat.coding
+        * Observation.category:VSCat.coding.code
+        * Observation.category:VSCat.coding.system
         * Observation.code
         * Observation.effective[x]
         * Observation.status
         * Observation.subject
         * Observation.value[x]
-        * Observation.value[x].code
-        * Observation.value[x].system
-        * Observation.value[x].unit
-        * Observation.value[x].value
         * Observation.value[x]:valueQuantity
+        * Observation.value[x]:valueQuantity.code
+        * Observation.value[x]:valueQuantity.system
+        * Observation.value[x]:valueQuantity.unit
+        * Observation.value[x]:valueQuantity.value
       )
 
       id :us_core_v311_bodytemp_must_support_test

data/lib/us_core_test_kit/generated/v3.1.1/bodytemp/bodytemp_reference_resolution_test.rb

@@ -1,11 +1,9 @@
 require_relative '../../../reference_resolution_test'
-require_relative '../resource_list'
 
 module USCoreTestKit
   module USCoreV311
     class BodytempReferenceResolutionTest < Inferno::Test
       include USCoreTestKit::ReferenceResolutionTest
-      include ResourceList
 
       title 'MustSupport references within Observation resources are valid'
       description %(

data/lib/us_core_test_kit/generated/v3.1.1/bodytemp/metadata.yml

@@ -141,12 +141,14 @@
 :must_supports:
   :extensions: []
   :slices:
-  - :name: Observation.value[x]:valueQuantity
+  - :slice_id: Observation.value[x]:valueQuantity
+    :slice_name: valueQuantity
     :path: value[x]
     :discriminator:
       :type: type
       :code: Quantity
-  - :name: Observation.category:VSCat
+  - :slice_id: Observation.category:VSCat
+    :slice_name: VSCat
     :path: category
     :discriminator:
       :type: value
@@ -158,10 +160,10 @@
   :elements:
   - :path: status
   - :path: category
-  - :path: category.coding
-  - :path: category.coding.system
+  - :path: category:VSCat.coding
+  - :path: category:VSCat.coding.system
     :fixed_value: http://terminology.hl7.org/CodeSystem/observation-category
-  - :path: category.coding.code
+  - :path: category:VSCat.coding.code
     :fixed_value: vital-signs
   - :path: code
   - :path: subject
@@ -169,11 +171,11 @@
     - Reference
   - :path: effective[x]
   - :path: value[x]
-  - :path: value[x].value
-  - :path: value[x].unit
-  - :path: value[x].system
+  - :path: value[x]:valueQuantity.value
+  - :path: value[x]:valueQuantity.unit
+  - :path: value[x]:valueQuantity.system
     :fixed_value: http://unitsofmeasure.org
-  - :path: value[x].code
+  - :path: value[x]:valueQuantity.code
 :mandatory_elements:
 - Observation.status
 - Observation.category

data/lib/us_core_test_kit/generated/v3.1.1/bodyweight/bodyweight_must_support_test.rb

@@ -13,20 +13,20 @@ module USCoreTestKit
         found previously for the following must support elements:
 
         * Observation.category
-        * Observation.category.coding
-        * Observation.category.coding.code
-        * Observation.category.coding.system
         * Observation.category:VSCat
+        * Observation.category:VSCat.coding
+        * Observation.category:VSCat.coding.code
+        * Observation.category:VSCat.coding.system
         * Observation.code
         * Observation.effective[x]
         * Observation.status
         * Observation.subject
         * Observation.value[x]
-        * Observation.value[x].code
-        * Observation.value[x].system
-        * Observation.value[x].unit
-        * Observation.value[x].value
         * Observation.value[x]:valueQuantity
+        * Observation.value[x]:valueQuantity.code
+        * Observation.value[x]:valueQuantity.system
+        * Observation.value[x]:valueQuantity.unit
+        * Observation.value[x]:valueQuantity.value
       )
 
       id :us_core_v311_bodyweight_must_support_test

data/lib/us_core_test_kit/generated/v3.1.1/bodyweight/bodyweight_reference_resolution_test.rb

@@ -1,11 +1,9 @@
 require_relative '../../../reference_resolution_test'
-require_relative '../resource_list'
 
 module USCoreTestKit
   module USCoreV311
     class BodyweightReferenceResolutionTest < Inferno::Test
       include USCoreTestKit::ReferenceResolutionTest
-      include ResourceList
 
       title 'MustSupport references within Observation resources are valid'
       description %(

data/lib/us_core_test_kit/generated/v3.1.1/bodyweight/metadata.yml

@@ -141,12 +141,14 @@
 :must_supports:
   :extensions: []
   :slices:
-  - :name: Observation.value[x]:valueQuantity
+  - :slice_id: Observation.value[x]:valueQuantity
+    :slice_name: valueQuantity
     :path: value[x]
     :discriminator:
       :type: type
       :code: Quantity
-  - :name: Observation.category:VSCat
+  - :slice_id: Observation.category:VSCat
+    :slice_name: VSCat
     :path: category
     :discriminator:
       :type: value
@@ -158,10 +160,10 @@
   :elements:
   - :path: status
   - :path: category
-  - :path: category.coding
-  - :path: category.coding.system
+  - :path: category:VSCat.coding
+  - :path: category:VSCat.coding.system
     :fixed_value: http://terminology.hl7.org/CodeSystem/observation-category
-  - :path: category.coding.code
+  - :path: category:VSCat.coding.code
     :fixed_value: vital-signs
   - :path: code
   - :path: subject
@@ -169,11 +171,11 @@
     - Reference
   - :path: effective[x]
   - :path: value[x]
-  - :path: value[x].value
-  - :path: value[x].unit
-  - :path: value[x].system
+  - :path: value[x]:valueQuantity.value
+  - :path: value[x]:valueQuantity.unit
+  - :path: value[x]:valueQuantity.system
     :fixed_value: http://unitsofmeasure.org
-  - :path: value[x].code
+  - :path: value[x]:valueQuantity.code
 :mandatory_elements:
 - Observation.status
 - Observation.category

data/lib/us_core_test_kit/generated/v3.1.1/bp/bp_must_support_test.rb

@@ -13,20 +13,28 @@ module USCoreTestKit
         found previously for the following must support elements:
 
         * Observation.category
-        * Observation.category.coding
-        * Observation.category.coding.code
-        * Observation.category.coding.system
         * Observation.category:VSCat
+        * Observation.category:VSCat.coding
+        * Observation.category:VSCat.coding.code
+        * Observation.category:VSCat.coding.system
         * Observation.code
         * Observation.component
         * Observation.component.code
         * Observation.component.value[x]
-        * Observation.component.value[x].code
-        * Observation.component.value[x].system
-        * Observation.component.value[x].unit
-        * Observation.component.value[x].value
         * Observation.component:DiastolicBP
+        * Observation.component:DiastolicBP.code
+        * Observation.component:DiastolicBP.value[x]
+        * Observation.component:DiastolicBP.value[x].code
+        * Observation.component:DiastolicBP.value[x].system
+        * Observation.component:DiastolicBP.value[x].unit
+        * Observation.component:DiastolicBP.value[x].value
         * Observation.component:SystolicBP
+        * Observation.component:SystolicBP.code
+        * Observation.component:SystolicBP.value[x]
+        * Observation.component:SystolicBP.value[x].code
+        * Observation.component:SystolicBP.value[x].system
+        * Observation.component:SystolicBP.value[x].unit
+        * Observation.component:SystolicBP.value[x].value
         * Observation.effective[x]
         * Observation.status
         * Observation.subject

data/lib/us_core_test_kit/generated/v3.1.1/bp/bp_reference_resolution_test.rb

@@ -1,11 +1,9 @@
 require_relative '../../../reference_resolution_test'
-require_relative '../resource_list'
 
 module USCoreTestKit
   module USCoreV311
     class BpReferenceResolutionTest < Inferno::Test
       include USCoreTestKit::ReferenceResolutionTest
-      include ResourceList
 
       title 'MustSupport references within Observation resources are valid'
       description %(