us_core_test_kit 0.4.4 → 0.4.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aac6a564a32ae165aafa5464db0cf48406798016af086d3f27eb3b89c7c6358a
-  data.tar.gz: 5dfd9dec3bc2559f5c02d985d08bcd8766673c5b292114c4f225d950125c35d3
+  metadata.gz: 827607a65eeb7956db852bbf500ad1d9d55f03403e6eb9075d2adb6186e69b2f
+  data.tar.gz: efabaf62e09af2fed1de8a5e15e5bcc104ff744dbcfe4976577774a92700a700
 SHA512:
-  metadata.gz: 55352a177a081274e200990644114ba019c09d7e684b4d40edf3c1ce3e2138434058bd7b9c7eea21361c77d08f5010a51b06cf774a2a5ac97db08421d8f0700d
-  data.tar.gz: c1aa7c927b0cc9a3c3181ebc122a17f85bf8d9a9c8b411292a13bccd42520f3cdd5fe01da347f7a9e4121d17404df56cedfac2c686d37dec11ef743c669b02d9
+  metadata.gz: 07a7bffbc53564983eb5c28944f98983108abf34be06f96eafff061edfc6bc4f800db1634b7e2414d452c063e926a97d834429c762825c0d72dd83eae58eb3be
+  data.tar.gz: 4dcfe3c97fb35c3319f466936a3c09ea84d9c887b02d487ce1b0a14de2e999c0097b9d6d55e9e319f10f102693b0e58d8ccdcdb26861e35b51c39cdb35a3c931

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

@@ -9,7 +9,9 @@ module USCoreTestKit
       The US Core Server SHALL:
       1. Support the US Core Patient resource profile.
       2. Support at least one additional resource profile from the list of US
-          Core Profiles.
+         Core Profiles.
+
+      In order to support USCDI, servers must support all USCDI resources.
       ```
     )
     uses_request :capability_statement
@@ -23,30 +25,25 @@ module USCoreTestKit
           &.each_with_object([]) do |rest, resources|
             rest.resource.each { |resource| resources << resource.type }
           end.uniq
-      supported_profiles =
-        capability_statement.rest
-          &.flat_map(&:resource)
-          &.flat_map { |resource| resource.supportedProfile + [resource.profile] }
-          &.compact || []
-      supported_profiles.map! { |profile_url| profile_url.split('|').first }
 
       assert supported_resources.include?('Patient'), 'US Core Patient profile not supported'
 
-      target_profiles = config.options[:target_profiles]
+      us_core_resources = config.options[:us_core_resources]
 
-      other_resources = target_profiles.keys.reject { |resource_type| resource_type == 'Patient' }
+      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'
 
-      target_profiles.each do |resource_type, profiles|
-        next unless supported_resources.include? resource_type
+      if config.options[:required_resources].present?
+        missing_resources = config.options[:required_resources] - supported_resources
+
+        missing_resource_list =
+          missing_resources
+          .map { |resource| "`#{resource}`" }
+          .join(', ')
 
-        profiles.each do |profile|
-          warning do
-            assert supported_profiles&.include?(profile),
-                    "CapabilityStatement does not claim support for US Core #{resource_type} profile: #{profile}"
-          end
-        end
+        assert missing_resources.empty?,
+               "The CapabilityStatement did not list support for the following resources: #{missing_resource_list}"
       end
     end
   end

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

@@ -102,7 +102,7 @@ module USCoreTestKit
 
       test from: :us_core_profile_support do
         config(
-          options: { target_profiles: PROFILES }
+          options: { us_core_resources: PROFILES.keys }
         )
       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: { target_profiles: PROFILES }
+          options: { us_core_resources: PROFILES.keys }
         )
       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: { target_profiles: PROFILES }
+          options: { us_core_resources: PROFILES.keys }
         )
       end
 

data/lib/us_core_test_kit/generated/v3.1.1/us_core_test_suite.rb

@@ -54,8 +54,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/generated/v4.0.0/device/metadata.yml

@@ -136,8 +136,6 @@
   :file_name: device_must_support_test.rb
 - :id: us_core_v400_device_reference_resolution_test
   :file_name: device_reference_resolution_test.rb
-- :id: us_core_v400_device_udi_pi_test
-  :file_name: "../../custom_groups/v4.0.0/device_udi_pi_test.rb"
 :id: us_core_v400_device
 :file_name: device_group.rb
 :delayed_references: []

data/lib/us_core_test_kit/generated/v4.0.0/device_group.rb

@@ -5,7 +5,6 @@ require_relative 'device/device_provenance_revinclude_search_test'
 require_relative 'device/device_validation_test'
 require_relative 'device/device_must_support_test'
 require_relative 'device/device_reference_resolution_test'
-require_relative '../../custom_groups/v4.0.0/device_udi_pi_test'
 
 module USCoreTestKit
   module USCoreV400
@@ -84,7 +83,6 @@ read succeeds.
       test from: :us_core_v400_device_validation_test
       test from: :us_core_v400_device_must_support_test
       test from: :us_core_v400_device_reference_resolution_test
-      test from: :us_core_v400_device_udi_pi_test
     end
   end
 end

data/lib/us_core_test_kit/generated/v4.0.0/medication_request/medication_request_reference_resolution_test.rb

@@ -19,6 +19,7 @@ module USCoreTestKit
 
         * MedicationRequest.encounter
         * MedicationRequest.medication[x]
+        * MedicationRequest.reportedReference
         * MedicationRequest.requester
         * MedicationRequest.subject
       )

data/lib/us_core_test_kit/generated/v4.0.0/medication_request/metadata.yml

@@ -150,7 +150,7 @@
     :original_path: reported[x]
   - :path: reportedReference
     :original_path: reported[x]
-    :type:
+    :types:
     - Reference
     :target_profiles:
     - http://hl7.org/fhir/us/core/StructureDefinition/us-core-practitioner

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

@@ -2529,7 +2529,7 @@
       :original_path: reported[x]
     - :path: reportedReference
       :original_path: reported[x]
-      :type:
+      :types:
       - Reference
       :target_profiles:
       - http://hl7.org/fhir/us/core/StructureDefinition/us-core-practitioner

data/lib/us_core_test_kit/generated/v4.0.0/us_core_test_suite.rb

@@ -56,8 +56,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/generated/v5.0.1/device/metadata.yml

@@ -136,8 +136,6 @@
   :file_name: device_must_support_test.rb
 - :id: us_core_v501_device_reference_resolution_test
   :file_name: device_reference_resolution_test.rb
-- :id: us_core_v400_device_udi_pi_test
-  :file_name: "../../custom_groups/v4.0.0/device_udi_pi_test.rb"
 :id: us_core_v501_device
 :file_name: device_group.rb
 :delayed_references: []

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

@@ -5,7 +5,6 @@ require_relative 'device/device_provenance_revinclude_search_test'
 require_relative 'device/device_validation_test'
 require_relative 'device/device_must_support_test'
 require_relative 'device/device_reference_resolution_test'
-require_relative '../../custom_groups/v4.0.0/device_udi_pi_test'
 
 module USCoreTestKit
   module USCoreV501
@@ -84,7 +83,6 @@ read succeeds.
       test from: :us_core_v501_device_validation_test
       test from: :us_core_v501_device_must_support_test
       test from: :us_core_v501_device_reference_resolution_test
-      test from: :us_core_v400_device_udi_pi_test
     end
   end
 end

data/lib/us_core_test_kit/generated/v5.0.1/medication_request/medication_request_reference_resolution_test.rb

@@ -19,6 +19,7 @@ module USCoreTestKit
 
         * MedicationRequest.encounter
         * MedicationRequest.medication[x]
+        * MedicationRequest.reportedReference
         * MedicationRequest.requester
         * MedicationRequest.subject
       )

data/lib/us_core_test_kit/generated/v5.0.1/medication_request/metadata.yml

@@ -161,7 +161,7 @@
     :original_path: reported[x]
   - :path: reportedReference
     :original_path: reported[x]
-    :type:
+    :types:
     - Reference
     :target_profiles:
     - http://hl7.org/fhir/us/core/StructureDefinition/us-core-practitioner

data/lib/us_core_test_kit/generated/v5.0.1/metadata.yml

@@ -3079,7 +3079,7 @@
       :original_path: reported[x]
     - :path: reportedReference
       :original_path: reported[x]
-      :type:
+      :types:
       - Reference
       :target_profiles:
       - http://hl7.org/fhir/us/core/StructureDefinition/us-core-practitioner
@@ -10047,6 +10047,11 @@
         - sdoh
         - '386053000'
         - '410606002'
+        - '108252007'
+        - '363679005'
+        - '409063005'
+        - '409073007'
+        - '387713003'
     :elements:
     - :path: status
     - :path: intent

data/lib/us_core_test_kit/generated/v5.0.1/service_request/metadata.yml

@@ -170,6 +170,11 @@
       - sdoh
       - '386053000'
       - '410606002'
+      - '108252007'
+      - '363679005'
+      - '409063005'
+      - '409073007'
+      - '387713003'
   :elements:
   - :path: status
   - :path: intent

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/generator/group_generator.rb

@@ -110,11 +110,6 @@ module USCoreTestKit
         return if group_metadata.reformatted_version == 'v311'
 
         case group_metadata.resource
-        when 'Device'
-          group_metadata.add_test(
-            id: 'us_core_v400_device_udi_pi_test',
-            file_name: '../../custom_groups/v4.0.0/device_udi_pi_test.rb'
-          )
         when 'DocumentReference'
           group_metadata.add_test(
             id: 'us_core_v400_document_reference_custodian_test',

data/lib/us_core_test_kit/generator/must_support_metadata_extractor.rb

@@ -1,4 +1,7 @@
 require_relative 'value_extractor'
+require_relative 'must_support_metadata_extractor_us_core_3'
+require_relative 'must_support_metadata_extractor_us_core_4'
+require_relative 'must_support_metadata_extractor_us_core_5'
 
 module USCoreTestKit
   class Generator
@@ -218,7 +221,7 @@ module USCoreTestKit
               path: "#{current_metadata[:path].delete_suffix('[x]')}#{type.code.upcase_first}",
               original_path: current_metadata[:path]
             }
-            metadata[:type] = [type.code] if save_type_code?(type)
+            metadata[:types] = [type.code] if save_type_code?(type)
             handle_type_must_support_target_profiles(type, metadata) if type.code == 'Reference'
 
             metadata
@@ -288,18 +291,14 @@ module USCoreTestKit
         remove_vital_sign_component
         remove_blood_pressure_value
         remove_observation_data_absent_reason
-        add_must_support_choices
 
         case profile.version
         when '3.1.1'
-          remove_document_reference_custodian
+          MustSupportMetadataExtractorUsCore3.new(profile, @must_supports).handle_special_cases
         when '4.0.0'
-          add_device_distinct_identifier
-          add_patient_uscdi_elements
+          MustSupportMetadataExtractorUsCore4.new(profile, @must_supports).handle_special_cases
         when '5.0.1'
-          add_patient_uscdi_elements
-          add_document_reference_category_values
-          remove_survey_questionnaire_response
+          MustSupportMetadataExtractorUsCore5.new(profile, @must_supports).handle_special_cases
         end
       end
 
@@ -346,165 +345,6 @@ module USCoreTestKit
           end
         end
       end
-
-      def remove_device_carrier
-        if profile.type == 'Device'
-          @must_supports[:elements].delete_if do |element|
-            ['udiCarrier.carrierAIDC', 'udiCarrier.carrierHRF'].include?(element[:path])
-          end
-        end
-      end
-
-      # US Core clarified that server implmentation is not required to support DocumentReference.custodian (FHIR-28393)
-      def remove_document_reference_custodian
-        if profile.type == 'DocumentReference'
-          @must_supports[:elements].delete_if do |element|
-            element[:path] == 'custodian'
-          end
-        end
-      end
-
-      def remove_document_reference_attachment_data_url
-        if profile.type == 'DocumentReference'
-          @must_supports[:elements].delete_if do |element|
-            ['content.attachment.data', 'content.attachment.url'].include?(element[:path])
-          end
-        end
-      end
-
-      def add_must_support_choices
-        choices = []
-
-        choices << { paths: ['content.attachment.data', 'content.attachment.url'] } if profile.type == 'DocumentReference'
-
-        case profile.version
-        when '3.1.1'
-          choices << { paths: ['udiCarrier.carrierAIDC', 'udiCarrier.carrierHRF'] } if profile.type == 'Device'
-        when '4.0.0'
-          case profile.type
-          when 'Encounter'
-            choices << { paths: ['reasonCode', 'reasonReference'] }
-            choices << { paths: ['location.location', 'serviceProvider'] }
-          when 'MedicationRequest'
-            choices << { paths: ['reportedBoolean', 'reportedReference'] }
-          end
-        when '5.0.1'
-          case profile.type
-          when 'CareTeam'
-            choices << {
-              target_profiles: [
-                'http://hl7.org/fhir/us/core/StructureDefinition/us-core-practitioner',
-                'http://hl7.org/fhir/us/core/StructureDefinition/us-core-practitionerrole'
-              ]
-            }
-          when 'Condition'
-            choices << {
-              paths: ['onsetDateTime'],
-              extension_ids: ['Condition.extension:assertedDate']
-            }
-          when 'Encounter'
-            choices << { paths: ['reasonCode', 'reasonReference'] }
-            choices << { paths: ['location.location', 'serviceProvider'] }
-          when 'MedicationRequest'
-            choices << { paths: ['reportedBoolean', 'reportedReference'] }
-          end
-        end
-
-        @must_supports[:choices] = choices if choices.present?
-      end
-
-      def add_device_distinct_identifier
-        if profile.type == 'Device'
-          # FHIR-36303 US Core 4.0.0 mistakenly removed MS from Device.distinctIdentifier
-          # This will be fixed in US Core 5.0.0
-          @must_supports[:elements] << {
-            path: 'distinctIdentifier'
-          }
-        end
-      end
-
-      def add_patient_uscdi_elements
-        return unless profile.type == 'Patient'
-
-        #US Core 4.0.0 Section 10.112.1.1 Additional USCDI v1 Requirement:
-        @must_supports[:extensions] << {
-          id: 'Patient.extension:race',
-          url: 'http://hl7.org/fhir/us/core/StructureDefinition/us-core-race',
-          uscdi_only: true
-        }
-        @must_supports[:extensions] << {
-          id: 'Patient.extension:ethnicity',
-          url: 'http://hl7.org/fhir/us/core/StructureDefinition/us-core-ethnicity',
-          uscdi_only: true
-        }
-        @must_supports[:extensions] << {
-          id: 'Patient.extension:birthsex',
-          url: 'http://hl7.org/fhir/us/core/StructureDefinition/us-core-birthsex',
-          uscdi_only: true
-        }
-        @must_supports[:elements] << {
-          path: 'name.suffix',
-          uscdi_only: true
-        }
-        @must_supports[:elements] << {
-          path: 'name.period.end',
-          uscdi_only: true
-        }
-        @must_supports[:elements] << {
-          path: 'telecom',
-          uscdi_only: true
-        }
-        @must_supports[:elements] << {
-          path: 'communication',
-          uscdi_only: true
-        }
-        # Though telecom.system, telecom.value, telecom.use, and communication.language are marked as MustSupport since US Core v4.0.0,
-        # their parent elements telecom, and communication are not MustSupport but listed under "Additional USCDI requirements"
-        # According to the updated FHIR spec that "When a child element is defined as Must Support and the parent element isn't,
-        # a system must support the child if it support the parent, but there's no expectation that the system must support the parent.",
-        # We add uscdi_only tag to these elements
-        @must_supports[:elements].each do |element|
-          path = element[:path]
-          element[:uscdi_only] = true if path.include?('telecom.') || path.include?('communication.')
-        end
-
-        if profile.version == '5.0.1'
-          @must_supports[:extensions] << {
-            id: 'Patient.extension:genderIdentity',
-            url: 'http://hl7.org/fhir/us/core/StructureDefinition/us-core-genderIdentity',
-            uscdi_only: true
-          }
-          @must_supports[:elements] << {
-            path: 'address.use',
-            fixed_value: 'old',
-            uscdi_only: true
-          }
-          @must_supports[:elements] << {
-            path: 'name.use',
-            fixed_value: 'old',
-            uscdi_only: true
-          }
-        end
-      end
-
-      def add_document_reference_category_values
-        return unless profile.type == 'DocumentReference'
-
-        slice = @must_supports[:slices].find{|slice| slice[:path] == 'category'}
-
-        slice[:discriminator][:values] = ['clinical-note'] if slice.present?
-      end
-
-      # FHIR-37794 Server systems are not required to support US Core QuestionnaireResponse
-      def remove_survey_questionnaire_response
-        return unless profile.type == 'Observation' &&
-          ['us-core-observation-survey', 'us-core-observation-sdoh-assessment'].include?(profile.id)
-
-        element = @must_supports[:elements].find { |element| element[:path] == 'derivedFrom' }
-        element[:target_profiles].delete_if do |url|
-          url == 'http://hl7.org/fhir/us/core/StructureDefinition/us-core-questionnaireresponse'
-        end
-      end
     end
   end
 end

data/lib/us_core_test_kit/generator/must_support_metadata_extractor_us_core_3.rb

@@ -0,0 +1,39 @@
+module USCoreTestKit
+  class Generator
+    class MustSupportMetadataExtractorUsCore3
+      attr_accessor :profile, :must_supports
+
+      def initialize(profile, must_supports)
+        self.profile = profile
+        self.must_supports = must_supports
+      end
+
+      def handle_special_cases
+        add_must_support_choices
+        remove_document_reference_custodian
+      end
+
+      def add_must_support_choices
+        choices = []
+
+        case profile.type
+        when 'Device'
+          choices << { paths: ['udiCarrier.carrierAIDC', 'udiCarrier.carrierHRF'] }
+        when 'DocumentReference'
+          choices << { paths: ['content.attachment.data', 'content.attachment.url'] }
+        end
+
+        must_supports[:choices] = choices if choices.present?
+      end
+
+      # US Core clarified that server implmentation is not required to support DocumentReference.custodian (FHIR-28393)
+      def remove_document_reference_custodian
+        return unless profile.type == 'DocumentReference'
+
+        must_supports[:elements].delete_if do |element|
+          element[:path] == 'custodian'
+        end
+      end
+    end
+  end
+end

data/lib/us_core_test_kit/generator/must_support_metadata_extractor_us_core_4.rb

@@ -0,0 +1,90 @@
+module USCoreTestKit
+  class Generator
+    class MustSupportMetadataExtractorUsCore4
+      attr_accessor :profile, :must_supports
+
+      def initialize(profile, must_supports)
+        self.profile = profile
+        self.must_supports = must_supports
+      end
+
+      def handle_special_cases
+        add_must_support_choices
+        add_device_distinct_identifier
+        add_patient_uscdi_elements
+      end
+
+      def add_must_support_choices
+        choices = []
+
+        case profile.type
+        when 'DocumentReference'
+          choices << { paths: ['content.attachment.data', 'content.attachment.url'] }
+        when 'Encounter'
+          choices << { paths: ['reasonCode', 'reasonReference'] }
+          choices << { paths: ['location.location', 'serviceProvider'] }
+        when 'MedicationRequest'
+          choices << { paths: ['reportedBoolean', 'reportedReference'] }
+        end
+
+        must_supports[:choices] = choices if choices.present?
+      end
+
+      def add_device_distinct_identifier
+        if profile.type == 'Device'
+          # FHIR-36303 US Core 4.0.0 mistakenly removed MS from Device.distinctIdentifier
+          # This will be fixed in US Core 5.0.0
+          must_supports[:elements] << {
+            path: 'distinctIdentifier'
+          }
+        end
+      end
+
+      def add_patient_uscdi_elements
+        return unless profile.type == 'Patient'
+
+        #US Core 4.0.0 Section 10.112.1.1 Additional USCDI v1 Requirement:
+        must_supports[:extensions] << {
+          id: 'Patient.extension:race',
+          url: 'http://hl7.org/fhir/us/core/StructureDefinition/us-core-race',
+          uscdi_only: true
+        }
+        must_supports[:extensions] << {
+          id: 'Patient.extension:ethnicity',
+          url: 'http://hl7.org/fhir/us/core/StructureDefinition/us-core-ethnicity',
+          uscdi_only: true
+        }
+        must_supports[:extensions] << {
+          id: 'Patient.extension:birthsex',
+          url: 'http://hl7.org/fhir/us/core/StructureDefinition/us-core-birthsex',
+          uscdi_only: true
+        }
+        must_supports[:elements] << {
+          path: 'name.suffix',
+          uscdi_only: true
+        }
+        must_supports[:elements] << {
+          path: 'name.period.end',
+          uscdi_only: true
+        }
+        must_supports[:elements] << {
+          path: 'telecom',
+          uscdi_only: true
+        }
+        must_supports[:elements] << {
+          path: 'communication',
+          uscdi_only: true
+        }
+        # Though telecom.system, telecom.value, telecom.use, and communication.language are marked as MustSupport since US Core v4.0.0,
+        # their parent elements telecom, and communication are not MustSupport but listed under "Additional USCDI requirements"
+        # According to the updated FHIR spec that "When a child element is defined as Must Support and the parent element isn't,
+        # a system must support the child if it support the parent, but there's no expectation that the system must support the parent.",
+        # We add uscdi_only tag to these elements
+        must_supports[:elements].each do |element|
+          path = element[:path]
+          element[:uscdi_only] = true if path.include?('telecom.') || path.include?('communication.')
+        end
+      end
+    end
+  end
+end

data/lib/us_core_test_kit/generator/must_support_metadata_extractor_us_core_5.rb

@@ -0,0 +1,108 @@
+require_relative 'must_support_metadata_extractor_us_core_4'
+
+module USCoreTestKit
+  class Generator
+    class MustSupportMetadataExtractorUsCore5
+      attr_accessor :profile, :must_supports
+
+      def initialize(profile, must_supports)
+        self.profile = profile
+        self.must_supports = must_supports
+      end
+
+
+      def us_core_4_extractor
+        @us_core_4_extractor ||= MustSupportMetadataExtractorUsCore4.new(profile, must_supports)
+      end
+
+      def handle_special_cases
+        add_must_support_choices
+        add_patient_uscdi_elements
+        add_value_set_expansion
+        remove_survey_questionnaire_response
+      end
+
+      def add_must_support_choices
+        us_core_4_extractor.add_must_support_choices
+
+        more_choices = []
+
+        case profile.type
+        when 'CareTeam'
+          more_choices << {
+            target_profiles: [
+              'http://hl7.org/fhir/us/core/StructureDefinition/us-core-practitioner',
+              'http://hl7.org/fhir/us/core/StructureDefinition/us-core-practitionerrole'
+            ]
+          }
+        when 'Condition'
+          more_choices << {
+            paths: ['onsetDateTime'],
+            extension_ids: ['Condition.extension:assertedDate']
+          }
+        end
+
+        if more_choices.present?
+          must_supports[:choices] ||= []
+          must_supports[:choices].concat(more_choices)
+        end
+      end
+
+      def add_patient_uscdi_elements
+        return unless profile.type == 'Patient'
+
+        us_core_4_extractor.add_patient_uscdi_elements
+
+        must_supports[:extensions] << {
+          id: 'Patient.extension:genderIdentity',
+          url: 'http://hl7.org/fhir/us/core/StructureDefinition/us-core-genderIdentity',
+          uscdi_only: true
+        }
+        must_supports[:elements] << {
+          path: 'address.use',
+          fixed_value: 'old',
+          uscdi_only: true
+        }
+        must_supports[:elements] << {
+          path: 'name.use',
+          fixed_value: 'old',
+          uscdi_only: true
+        }
+      end
+
+      def add_value_set_expansion
+        add_document_reference_category_values
+        add_service_request_category_values
+      end
+
+      def add_document_reference_category_values
+        return unless profile.type == 'DocumentReference'
+
+        slice = must_supports[:slices].find{|slice| slice[:path] == 'category'}
+
+        slice[:discriminator][:values] = ['clinical-note'] if slice.present?
+      end
+
+      def add_service_request_category_values
+        return unless profile.type == 'ServiceRequest'
+
+        slice = must_supports[:slices].find{|slice| slice[:path] == 'category'}
+
+        if slice.present?
+          slice[:discriminator][:values].concat(['108252007', '363679005', '409063005', '409073007', '387713003'])
+        end
+      end
+
+      # FHIR-37794 Server systems are not required to support US Core QuestionnaireResponse
+      def remove_survey_questionnaire_response
+        return unless profile.type == 'Observation' &&
+          ['us-core-observation-survey', 'us-core-observation-sdoh-assessment'].include?(profile.id)
+
+        element = must_supports[:elements].find { |element| element[:path] == 'derivedFrom' }
+        element[:target_profiles].delete_if do |url|
+          url == 'http://hl7.org/fhir/us/core/StructureDefinition/us-core-questionnaireresponse'
+        end
+      end
+    end
+  end
+end

data/lib/us_core_test_kit/generator.rb

@@ -1,6 +1,6 @@
 require 'fhir_models'
+require 'inferno/ext/fhir_models'
 
-require_relative 'ext/fhir_models'
 require_relative 'generator/ig_loader'
 require_relative 'generator/ig_metadata_extractor'
 require_relative 'generator/group_generator'

data/lib/us_core_test_kit/version.rb

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

data/lib/us_core_test_kit.rb

@@ -1,4 +1,3 @@
-require_relative 'us_core_test_kit/ext/fhir_models'
 require_relative 'us_core_test_kit/generated/v3.1.1/us_core_test_suite'
 require_relative 'us_core_test_kit/generated/v4.0.0/us_core_test_suite'
 require_relative 'us_core_test_kit/generated/v5.0.1/us_core_test_suite'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: us_core_test_kit
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.4.6
 platform: ruby
 authors:
 - Stephen MacVicar
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-01-06 00:00:00.000000000 Z
+date: 2023-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: inferno_core
@@ -115,11 +115,9 @@ files:
 - lib/us_core_test_kit/custom_groups/v3.1.1/clinical_notes_guidance_group.rb
 - lib/us_core_test_kit/custom_groups/v4.0.0/capability_statement_group.rb
 - lib/us_core_test_kit/custom_groups/v4.0.0/clinical_notes_guidance_group.rb
-- lib/us_core_test_kit/custom_groups/v4.0.0/device_udi_pi_test.rb
 - lib/us_core_test_kit/custom_groups/v4.0.0/document_reference_custodian_test.rb
 - lib/us_core_test_kit/custom_groups/v5.0.1/capability_statement_group.rb
 - lib/us_core_test_kit/date_search_validation.rb
-- lib/us_core_test_kit/ext/fhir_models.rb
 - lib/us_core_test_kit/fhir_resource_navigation.rb
 - lib/us_core_test_kit/generated/v3.1.1/allergy_intolerance/allergy_intolerance_must_support_test.rb
 - lib/us_core_test_kit/generated/v3.1.1/allergy_intolerance/allergy_intolerance_patient_clinical_status_search_test.rb
@@ -1279,6 +1277,9 @@ files:
 - lib/us_core_test_kit/generator/ig_metadata_extractor.rb
 - lib/us_core_test_kit/generator/ig_resources.rb
 - lib/us_core_test_kit/generator/must_support_metadata_extractor.rb
+- lib/us_core_test_kit/generator/must_support_metadata_extractor_us_core_3.rb
+- lib/us_core_test_kit/generator/must_support_metadata_extractor_us_core_4.rb
+- lib/us_core_test_kit/generator/must_support_metadata_extractor_us_core_5.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/provenance_revinclude_search_test_generator.rb

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

@@ -1,40 +0,0 @@
-module USCoreTestKit
-  module USCoreV400
-    class DeviceUdiPiTest < Inferno::Test
-      id :us_core_v400_device_udi_pi_test
-      title 'Device resources returned during previous tests have UDI-PI elements'
-      description %(
-        This test verifies implantable medical devices that have UDI information represent all of the UDI-PI elements that are present in the UDI code
-        in the corresponding US Core Implantable Device Profile element.
-      )
-
-      def scratch_resources
-        scratch[:device_resources] ||= {}
-      end
-
-      run do
-        resources = scratch_resources[:all] || []
-
-        skip_if resources.blank?,
-                'No Devices resources appear to be available. ' \
-                'Please use patients with more information.'
-
-        resources.each do |device|
-          if device.udiCarrier&.first&.carrierHRF.present? &&
-            !(
-              device.manufactureDate.present? ||
-              device.expirationDate.present? ||
-              device.lotNumber.present? ||
-              device.serialNumber.present? ||
-              device.distinctIdentifier.present?
-            )
-            add_message('error',
-                        "Device/#{device.id} has UDI information but does not have any UDI-PI elements presented")
-          end
-        end
-
-        assert messages.blank?, "Resource has UDI information but does not have any UDI-PI elements presented"
-      end
-    end
-  end
-end

data/lib/us_core_test_kit/ext/fhir_models.rb

@@ -1,59 +0,0 @@
-require 'json'
-
-# Extension to FHIR::Model. Prepending this into FHIR::Model (done below)
-# allows us to call super() on initialize when we overriding it,
-# while also defining new methods and attributes
-module InfernoFHIRModelExtensions
-  attr_accessor :source_hash, :source_text
-
-  def initialize(hash = {})
-    super(hash)
-    @source_hash = hash
-  end
-
-  def source_contents
-    @source_text || JSON.generate(@source_hash)
-  end
-end
-
-module FHIR
-  class Model
-    prepend ::InfernoFHIRModelExtensions
-  end
-end
-
-# Extension to FHIR::Json. Prepending this into FHIR::Json (done below)
-# allows us to call super() on from_json
-module InfernoJson
-  def from_json(json)
-    resource = super(json)
-    resource.source_text = json
-    resource
-  end
-end
-
-# Extension to FHIR::Xml. Prepending this into FHIR::Xml (done below)
-# allows us to call super() on from_xml
-module InfernoXml
-  def from_xml(xml)
-    resource = super(xml)
-    resource.source_text = xml
-    resource
-  end
-end
-
-module FHIR
-  module Json
-    class << self
-      prepend InfernoJson
-    end
-  end
-end
-
-module FHIR
-  module Xml
-    class << self
-      prepend InfernoXml
-    end
-  end
-end