us_core_test_kit 0.6.1 → 0.6.2

data/lib/us_core_test_kit/generated/v6.1.0/pulse_oximetry/pulse_oximetry_must_support_test.rb

@@ -13,32 +13,39 @@ 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.code.coding
         * Observation.code.coding:O2Sat
         * Observation.code.coding:PulseOx
         * Observation.component
         * Observation.component.code
-        * Observation.component.code.coding.code
         * Observation.component.valueQuantity
-        * Observation.component.valueQuantity.code
-        * Observation.component.valueQuantity.system
-        * Observation.component.valueQuantity.unit
-        * Observation.component.valueQuantity.value
         * Observation.component:Concentration
+        * Observation.component:Concentration.code
+        * Observation.component:Concentration.valueQuantity
+        * Observation.component:Concentration.valueQuantity.code
+        * Observation.component:Concentration.valueQuantity.system
+        * Observation.component:Concentration.valueQuantity.unit
+        * Observation.component:Concentration.valueQuantity.value
         * Observation.component:FlowRate
+        * Observation.component:FlowRate.code
+        * Observation.component:FlowRate.valueQuantity
+        * Observation.component:FlowRate.valueQuantity.code
+        * Observation.component:FlowRate.valueQuantity.system
+        * Observation.component:FlowRate.valueQuantity.unit
+        * Observation.component:FlowRate.valueQuantity.value
         * Observation.effectiveDateTime
         * Observation.status
         * Observation.subject
         * Observation.valueQuantity
-        * Observation.valueQuantity.code
-        * Observation.valueQuantity.system
-        * Observation.valueQuantity.unit
-        * Observation.valueQuantity.value
+        * Observation.valueQuantity:valueQuantity.code
+        * Observation.valueQuantity:valueQuantity.system
+        * Observation.valueQuantity:valueQuantity.unit
+        * Observation.valueQuantity:valueQuantity.value
         * Observation.value[x]:valueQuantity
       )
 

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

@@ -142,6 +142,8 @@
   - :path: subject
     :types:
     - Reference
+    :target_profiles:
+    - http://hl7.org/fhir/us/core/StructureDefinition/us-core-patient
   - :path: authored
   - :path: author
     :types:

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

@@ -95,6 +95,8 @@
   - :path: patient
     :types:
     - Reference
+    :target_profiles:
+    - http://hl7.org/fhir/us/core/StructureDefinition/us-core-patient
   - :path: relationship
   - :path: name
   - :path: telecom

data/lib/us_core_test_kit/generated/v6.1.0/respiratory_rate/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,29 +160,31 @@
   :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.coding.code
     :fixed_value: 9279-1
   - :path: subject
     :types:
     - Reference
+    :target_profiles:
+    - http://hl7.org/fhir/us/core/StructureDefinition/us-core-patient
   - :path: effectiveDateTime
     :original_path: effective[x]
   - :path: valueQuantity
     :original_path: value[x]
-  - :path: valueQuantity.value
-    :original_path: value[x].value
-  - :path: valueQuantity.unit
-    :original_path: value[x].unit
-  - :path: valueQuantity.system
-    :original_path: value[x].system
+  - :path: valueQuantity:valueQuantity.value
+    :original_path: value[x]:valueQuantity.value
+  - :path: valueQuantity:valueQuantity.unit
+    :original_path: value[x]:valueQuantity.unit
+  - :path: valueQuantity:valueQuantity.system
+    :original_path: value[x]:valueQuantity.system
     :fixed_value: http://unitsofmeasure.org
-  - :path: valueQuantity.code
-    :original_path: value[x].code
+  - :path: valueQuantity:valueQuantity.code
+    :original_path: value[x]:valueQuantity.code
     :fixed_value: "/min"
 :mandatory_elements:
 - Observation.status

data/lib/us_core_test_kit/generated/v6.1.0/respiratory_rate/respiratory_rate_must_support_test.rb

@@ -13,19 +13,19 @@ 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.coding.code
         * Observation.effectiveDateTime
         * Observation.status
         * Observation.subject
         * Observation.valueQuantity
-        * Observation.valueQuantity.code
-        * Observation.valueQuantity.system
-        * Observation.valueQuantity.unit
-        * Observation.valueQuantity.value
+        * Observation.valueQuantity:valueQuantity.code
+        * Observation.valueQuantity:valueQuantity.system
+        * Observation.valueQuantity:valueQuantity.unit
+        * Observation.valueQuantity:valueQuantity.value
         * Observation.value[x]:valueQuantity
       )
 

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

@@ -169,7 +169,8 @@
 :must_supports:
   :extensions: []
   :slices:
-  - :name: ServiceRequest.category:us-core
+  - :slice_id: ServiceRequest.category:us-core
+    :slice_name: us-core
     :path: category
     :discriminator:
       :type: requiredBinding
@@ -194,6 +195,8 @@
   - :path: subject
     :types:
     - Reference
+    :target_profiles:
+    - http://hl7.org/fhir/us/core/StructureDefinition/us-core-patient
   - :path: occurrencePeriod
     :original_path: occurrence[x]
   - :path: authoredOn

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

@@ -152,7 +152,8 @@
 :must_supports:
   :extensions: []
   :slices:
-  - :name: Observation.category:us-core
+  - :slice_id: Observation.category:us-core
+    :slice_name: us-core
     :path: category
     :discriminator:
       :type: requiredBinding
@@ -178,6 +179,8 @@
   - :path: subject
     :types:
     - Reference
+    :target_profiles:
+    - http://hl7.org/fhir/us/core/StructureDefinition/us-core-patient
   - :path: effectiveDateTime
     :original_path: effective[x]
   - :path: performer

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

@@ -135,14 +135,16 @@
 :must_supports:
   :extensions: []
   :slices:
-  - :name: Observation.category:SocialHistory
+  - :slice_id: Observation.category:SocialHistory
+    :slice_name: SocialHistory
     :path: category
     :discriminator:
       :type: patternCodeableConcept
       :path: ''
       :code: social-history
       :system: http://terminology.hl7.org/CodeSystem/observation-category
-  - :name: Observation.effective[x]:effectiveDateTime
+  - :slice_id: Observation.effective[x]:effectiveDateTime
+    :slice_name: effectiveDateTime
     :path: effective[x]
     :discriminator:
       :type: type
@@ -154,6 +156,8 @@
   - :path: subject
     :types:
     - Reference
+    :target_profiles:
+    - http://hl7.org/fhir/us/core/StructureDefinition/us-core-patient
   - :path: valueCodeableConcept
     :original_path: value[x]
 :mandatory_elements:

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

@@ -73,6 +73,8 @@
   - :path: subject
     :types:
     - Reference
+    :target_profiles:
+    - http://hl7.org/fhir/us/core/StructureDefinition/us-core-patient
 :mandatory_elements:
 - Specimen.type
 :bindings:

data/lib/us_core_test_kit/generator/must_support_metadata_extractor.rb

@@ -36,7 +36,7 @@ module USCoreTestKit
       end
 
       def all_must_support_elements
-        profile_elements.select { |element| element.mustSupport || is_uscdi_requirement_element?(element) }
+        profile_elements.select { |element| (element.mustSupport || is_uscdi_requirement_element?(element))}
       end
 
       def must_support_extension_elements
@@ -77,7 +77,8 @@ module USCoreTestKit
       def pattern_slices
         must_support_pattern_slice_elements.map do |current_element|
           {
-            name: current_element.id,
+            slice_id: current_element.id,
+            slice_name: current_element.sliceName,
             path: current_element.path.gsub("#{resource}.", '')
           }.tap do |metadata|
             discriminator = discriminators(sliced_element(current_element)).first
@@ -89,7 +90,6 @@ module USCoreTestKit
               else
                 current_element
               end
-
             metadata[:discriminator] =
               if pattern_element.patternCodeableConcept.present?
                 {
@@ -156,7 +156,8 @@ module USCoreTestKit
           type_code = type_element.type.first.code
 
           {
-            name: current_element.id,
+            slice_id: current_element.id,
+            slice_name: current_element.sliceName,
             path: current_element.path.gsub("#{resource}.", ''),
             discriminator: {
               type: 'type',
@@ -179,7 +180,8 @@ module USCoreTestKit
       def value_slices
         must_support_value_slice_elements.map do |current_element|
           {
-            name: current_element.id,
+            slice_id: current_element.id,
+            slice_name: current_element.sliceName,
             path: current_element.path.gsub("#{resource}.", ''),
             discriminator: {
               type: 'value'
@@ -209,18 +211,23 @@ module USCoreTestKit
       end
 
       def plain_must_support_elements
-        all_must_support_elements - must_support_extension_elements - must_support_slice_elements
+        plain_must_supports = all_must_support_elements - must_support_extension_elements - must_support_slice_elements
+      end
+
+      def element_part_of_slice_discrimination?(element)
+        must_support_slice_elements.any? { |ms_slice| element.id.include?(ms_slice.id) }
       end
 
+
       def handle_fixed_values(metadata, element)
         if element.fixedUri.present?
           metadata[:fixed_value] = element.fixedUri
-        elsif element.patternCodeableConcept.present?
+        elsif element.patternCodeableConcept.present? && !element_part_of_slice_discrimination?(element)
           metadata[:fixed_value] = element.patternCodeableConcept.coding.first.code
           metadata[:path] += '.coding.code'
         elsif element.fixedCode.present?
           metadata[:fixed_value] = element.fixedCode
-        elsif element.patternIdentifier.present?
+        elsif element.patternIdentifier.present? && !element_part_of_slice_discrimination?(element)
           metadata[:fixed_value] = element.patternIdentifier.system
           metadata[:path] += '.system'
         end
@@ -254,17 +261,25 @@ module USCoreTestKit
       end
 
       def handle_type_must_support_target_profiles(type, metadata)
-        index = 0
+        # US Core 3.1.1 profiles do not have US Core target profiles.
+        # Vital Sign proifles from FHIR R4 (version 4.0.1) do not have US Core target profiles either.
+        return if ['3.1.1', '4.0.1'].include?(profile.version)
+
         target_profiles = []
 
-        type.source_hash['_targetProfile']&.each do |hash|
-          if hash.present?
-            element = FHIR::Element.new(hash)
-            target_profiles << type.targetProfile[index] if type_must_support_extension?(element.extension)
+        if type.targetProfile&.length == 1
+          target_profiles << type.targetProfile.first
+        else
+          type.source_hash['_targetProfile']&.each_with_index do |hash, index|
+            if hash.present?
+              element = FHIR::Element.new(hash)
+              target_profiles << type.targetProfile[index] if type_must_support_extension?(element.extension)
+            end
           end
-          index += 1
         end
 
+        # remove target_profile for FHIR Base resource type.
+        target_profiles.delete_if { |reference| reference.start_with?('http://hl7.org/fhir/StructureDefinition')}
         metadata[:target_profiles] = target_profiles if target_profiles.present?
       end
 
@@ -283,7 +298,7 @@ module USCoreTestKit
       def must_support_elements
         plain_must_support_elements.each_with_object([]) do |current_element, must_support_elements_metadata|
           {
-            path: current_element.path.gsub("#{resource}.", '')
+            path: current_element.id.gsub("#{resource}.", '')
           }.tap do |current_metadata|
             if is_uscdi_requirement_element?(current_element)
               current_metadata[:uscdi_only] = true
@@ -317,7 +332,7 @@ module USCoreTestKit
 
       def handle_special_cases
         remove_vital_sign_component
-        remove_blood_pressure_value
+        remove_blood_pressure_value_data_absent_reason
         remove_observation_data_absent_reason
 
         case profile.version
@@ -345,7 +360,9 @@ module USCoreTestKit
 
       # Exclude Observation.component from vital sign profiles except observation-bp and observation-pulse-ox
       def remove_vital_sign_component
-        if is_vital_sign? && !is_blood_pressure? && profile.name != 'USCorePulseOximetryProfile'
+        return if is_blood_pressure? || profile.name == 'USCorePulseOximetryProfile'
+
+        if is_vital_sign?
           @must_supports[:elements].delete_if do |element|
             element[:path].start_with?('component')
           end
@@ -353,14 +370,22 @@ module USCoreTestKit
       end
 
       # Exclude Observation.value[x] from observation-bp
-      def remove_blood_pressure_value
-        if is_blood_pressure?
-          @must_supports[:elements].delete_if do |element|
-            element[:path].start_with?('value[x]') || element[:original_path]&.start_with?('value[x]')
-          end
-          @must_supports[:slices].delete_if do |slice|
-            slice[:path].start_with?('value[x]')
-          end
+      def remove_blood_pressure_value_data_absent_reason
+        return unless is_blood_pressure?
+
+        pattern = /component(:[^.]+)?\.dataAbsentReason/
+
+        @must_supports[:elements].delete_if do |element|
+          element[:path].start_with?('value[x]') ||
+          element[:original_path]&.start_with?('value[x]') ||
+          element[:path] == ('dataAbsentReason') ||
+          (
+            pattern.match?(element[:path]) && ['3.1.1', '4.0.0'].include?(ig_resources.ig.version)
+          )
+        end
+
+        @must_supports[:slices].delete_if do |slice|
+          slice[:path].start_with?('value[x]')
         end
       end
 
@@ -368,10 +393,15 @@ module USCoreTestKit
       # are not required to demonstrate Health IT Module support for "dataAbsentReason" elements.
       # Remove MS check for dataAbsentReason and component.dataAbsentReason from vital sign profiles and observation lab profile
       # Smoking status profile does not have MS on dataAbsentReason. It is safe to use profile.type == 'Observation'
+      # Since US Core 5.0.1, Blood Pressure profile restores component.dataAbsentReason as MustSupport.
       def remove_observation_data_absent_reason
+        return if is_blood_pressure?
+
+        pattern = /(component(:[^.]+)?\.)?dataAbsentReason/
+
         if profile.type == 'Observation'
           @must_supports[:elements].delete_if do |element|
-            ['dataAbsentReason', 'component.dataAbsentReason'].include?(element[:path])
+            pattern.match?(element[:path])
           end
         end
       end

data/lib/us_core_test_kit/generator/must_support_test_generator.rb

@@ -78,7 +78,7 @@ module USCoreTestKit
       def build_must_support_list_string(uscdi_only)
         slice_names = group_metadata.must_supports[:slices]
           .select { |slice| slice[:uscdi_only].presence == uscdi_only.presence }
-          .map { |slice| slice[:name] }
+          .map { |slice| slice[:slice_id] }
 
         element_names = group_metadata.must_supports[:elements]
           .select { |element| element[:uscdi_only].presence == uscdi_only.presence }

data/lib/us_core_test_kit/must_support_test.rb

@@ -23,7 +23,6 @@ module USCoreTestKit
       if (missing_elements + missing_slices + missing_extensions).length.zero?
         pass
       end
-
       skip "Could not find #{missing_must_support_strings.join(', ')} in the #{resources.length} " \
            "provided #{resource_type} resource(s)"
     end
@@ -56,8 +55,8 @@ module USCoreTestKit
 
     def missing_must_support_strings
       missing_elements.map { |element_definition| missing_element_string(element_definition) } +
-        missing_slices.map { |slice_definition| slice_definition[:name] } +
-        missing_extensions.map { |extension_definition| extension_definition[:id] }
+      missing_slices.map { |slice_definition| slice_definition[:slice_id] } +
+      missing_extensions.map { |extension_definition| extension_definition[:id] }
     end
 
     def missing_element_string(element_definition)
@@ -110,12 +109,10 @@ module USCoreTestKit
                 (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
         end
-
       @missing_elements
     end
 

data/lib/us_core_test_kit/reference_resolution_test.rb

@@ -12,7 +12,7 @@ module USCoreTestKit
 
       pass if unresolved_references(resources).length.zero?
 
-      skip "Could not resolve Must Support references #{unresolved_references_strings.join(', ')}"
+      skip "Could not resolve and validate any Must Support references for #{unresolved_references_strings.join(', ')}"
     end
 
     def unresolved_references_strings
@@ -20,7 +20,7 @@ module USCoreTestKit
         unresolved_references.each_with_object(Hash.new { |hash, key| hash[key] = [] }) do |missing, hash|
           hash[missing[:path]] << missing[:target_profile]
         end
-      unresolved_reference_hash.map { |path, profiles| "#{path}#{"(#{profiles.join('|')})" unless profiles.first.empty?}" }
+      unresolved_reference_hash.map { |path, profiles| "#{path} element: Reference#{"(#{profiles.join('|')})" unless profiles.first.empty?}" }
     end
 
     def record_resolved_reference(reference, target_profile)

data/lib/us_core_test_kit/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: us_core_test_kit
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.2
 platform: ruby
 authors:
 - Stephen MacVicar
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-11-06 00:00:00.000000000 Z
+date: 2023-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: inferno_core