us_core_test_kit 0.6.0 → 0.6.2

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

@@ -142,40 +142,46 @@
 :must_supports:
   :extensions: []
   :slices:
-  - :name: Observation.code.coding:PulseOx
+  - :slice_id: Observation.code.coding:PulseOx
+    :slice_name: PulseOx
     :path: code.coding
     :discriminator:
       :type: patternCoding
       :path: ''
       :code: 59408-5
       :system: http://loinc.org
-  - :name: Observation.code.coding:O2Sat
+  - :slice_id: Observation.code.coding:O2Sat
+    :slice_name: O2Sat
     :path: code.coding
     :discriminator:
       :type: patternCoding
       :path: ''
       :code: 2708-6
       :system: http://loinc.org
-  - :name: Observation.component:FlowRate
+  - :slice_id: Observation.component:FlowRate
+    :slice_name: FlowRate
     :path: component
     :discriminator:
       :type: patternCodeableConcept
       :path: code
       :code: 3151-8
       :system: http://loinc.org
-  - :name: Observation.component:Concentration
+  - :slice_id: Observation.component:Concentration
+    :slice_name: Concentration
     :path: component
     :discriminator:
       :type: patternCodeableConcept
       :path: code
       :code: 3150-0
       :system: http://loinc.org
-  - :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
@@ -187,50 +193,61 @@
   :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: code.coding
   - :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: "%"
   - :path: component
   - :path: component.code
   - :path: component.valueQuantity
     :original_path: component.value[x]
-  - :path: component.code.coding.code
-    :fixed_value: 3151-8
-  - :path: component.valueQuantity.system
-    :original_path: component.value[x].system
+  - :path: component:FlowRate.code
+  - :path: component:FlowRate.valueQuantity
+    :original_path: component:FlowRate.value[x]
+  - :path: component:FlowRate.valueQuantity.value
+    :original_path: component:FlowRate.value[x].value
+  - :path: component:FlowRate.valueQuantity.unit
+    :original_path: component:FlowRate.value[x].unit
+  - :path: component:FlowRate.valueQuantity.system
+    :original_path: component:FlowRate.value[x].system
     :fixed_value: http://unitsofmeasure.org
-  - :path: component.valueQuantity.code
-    :original_path: component.value[x].code
+  - :path: component:FlowRate.valueQuantity.code
+    :original_path: component:FlowRate.value[x].code
     :fixed_value: L/min
-  - :path: component.code.coding.code
-    :fixed_value: 3150-0
-  - :path: component.valueQuantity.value
-    :original_path: component.value[x].value
-  - :path: component.valueQuantity.unit
-    :original_path: component.value[x].unit
-  - :path: component.valueQuantity.code
-    :original_path: component.value[x].code
+  - :path: component:Concentration.code
+  - :path: component:Concentration.valueQuantity
+    :original_path: component:Concentration.value[x]
+  - :path: component:Concentration.valueQuantity.value
+    :original_path: component:Concentration.value[x].value
+  - :path: component:Concentration.valueQuantity.unit
+    :original_path: component:Concentration.value[x].unit
+  - :path: component:Concentration.valueQuantity.system
+    :original_path: component:Concentration.value[x].system
+    :fixed_value: http://unitsofmeasure.org
+  - :path: component:Concentration.valueQuantity.code
+    :original_path: component:Concentration.value[x].code
     :fixed_value: "%"
 :mandatory_elements:
 - Observation.status

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/pulse_oximetry/pulse_oximetry_reference_resolution_test.rb

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

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/questionnaire_response/questionnaire_response_reference_resolution_test.rb

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

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/related_person/related_person_reference_resolution_test.rb

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

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/respiratory_rate/respiratory_rate_reference_resolution_test.rb

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

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/service_request/service_request_reference_resolution_test.rb

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

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/simple_observation/simple_observation_reference_resolution_test.rb

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

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/smokingstatus/smokingstatus_reference_resolution_test.rb

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

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/generated/v6.1.0/specimen/specimen_reference_resolution_test.rb

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

data/lib/us_core_test_kit/generator/group_metadata_extractor.rb

@@ -187,7 +187,6 @@ module USCoreTestKit
       end
 
       def profile_name
-        binding.pry if profile.nil?
         profile.title.gsub('  ', ' ')
       end
 

data/lib/us_core_test_kit/generator/ig_loader.rb

@@ -33,6 +33,8 @@ module USCoreTestKit
 
           file_name = entry.full_name.split('/').last
 
+          next if file_name.end_with? 'openapi.json'
+
           next unless file_name.end_with? '.json'
 
           next unless entry.full_name.start_with? 'package/'