us_core_test_kit 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ed2e43ac18efc613d5e8e4deaa2e27c90b3d14956676be3009cfcaf023316bfc
-  data.tar.gz: 602336f9a94c5ba3c89d0a6295543e9fccace4fd1ed96f8e296aca2c83bb4a2c
+  metadata.gz: 423a133232c347722fccf2898b4ad15c164310066ee3490b21f597fbc71f9687
+  data.tar.gz: d6976a899786dd91a28e63671f4e94bb8062e743be466b72db5c1fc037cee661
 SHA512:
-  metadata.gz: 6664094195116bde7e6483e0e6baf23f93e3515607502b74c94b18608e675925002a506ba29e31c8252b6ea583a499fb922f9b7352b604ce4569522cd8fbbfa8
-  data.tar.gz: 9f52ccb0ac909060103b5e568f480f71ae40ba4d07affbcdd7bf175532e1b359be3152b87edd538d3bc8be7bdb2f8ae580629474e6c3f4293e1cccf09bc37a60
+  metadata.gz: fff0f5644ac84c70e2a6782d245437c62d82115e6b6c22772c2290b641ea60c3cfd293cf41a642419de436168f03f691b351d348b5bdd61818eceb9f6c01aba2
+  data.tar.gz: e47893ae3a7207fbc0e85bd958a1d8ffc94d516206971af365f1a962f338155c40d538be86c89732bb519101d2d31e724887c05bffff98346049d3fb56f1a584

data/lib/us_core_test_kit/fhir_resource_navigation.rb

@@ -1,5 +1,7 @@
 module USCoreTestKit
   module FHIRResourceNavigation
+    DAR_EXTENSION_URL = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason'.freeze
+
     def resolve_path(elements, path)
       elements = Array.wrap(elements)
       return elements if path.blank?
@@ -14,12 +16,18 @@ module USCoreTestKit
       end.compact
     end
 
-    def find_a_value_at(element, path)
+    def find_a_value_at(element, path, include_dar: false)
       return nil if element.nil?
 
       elements = Array.wrap(element)
 
       if path.empty?
+        unless include_dar
+          elements = elements.reject do |el|
+            el.respond_to?(:extension) && el.extension.any? { |ext| ext.url == DAR_EXTENSION_URL}
+          end
+        end
+
         return elements.find { |el| yield(el) } if block_given?
 
         return elements.first
@@ -43,9 +51,9 @@ module USCoreTestKit
         child = get_next_value(element, segment)
         element_found =
           if block_given?
-            find_a_value_at(child, remaining_path) { |value_found| yield(value_found) }
+            find_a_value_at(child, remaining_path, include_dar: include_dar) { |value_found| yield(value_found) }
           else
-            find_a_value_at(child, remaining_path)
+            find_a_value_at(child, remaining_path, include_dar: include_dar)
           end
 
         return element_found if element_found.present? || element_found == false

data/lib/us_core_test_kit/generated/v3.1.1/device/device_must_support_test.rb

@@ -20,8 +20,7 @@ module USCoreTestKit
         * Device.serialNumber
         * Device.type
         * Device.udiCarrier
-        * Device.udiCarrier.carrierAIDC
-        * Device.udiCarrier.carrierHRF
+        * Device.udiCarrier.carrierAIDC or Device.udiCarrier.carrierHRF
         * Device.udiCarrier.deviceIdentifier
       )
 

data/lib/us_core_test_kit/generated/v3.1.1/document_reference/document_reference_must_support_test.rb

@@ -17,8 +17,7 @@ module USCoreTestKit
         * DocumentReference.content
         * DocumentReference.content.attachment
         * DocumentReference.content.attachment.contentType
-        * DocumentReference.content.attachment.data
-        * DocumentReference.content.attachment.url
+        * DocumentReference.content.attachment.data or DocumentReference.content.attachment.url
         * DocumentReference.content.format
         * DocumentReference.context
         * DocumentReference.context.encounter

data/lib/us_core_test_kit/generated/v4.0.0/document_reference/document_reference_must_support_test.rb

@@ -17,8 +17,7 @@ module USCoreTestKit
         * DocumentReference.content
         * DocumentReference.content.attachment
         * DocumentReference.content.attachment.contentType
-        * DocumentReference.content.attachment.data
-        * DocumentReference.content.attachment.url
+        * DocumentReference.content.attachment.data or DocumentReference.content.attachment.url
         * DocumentReference.content.format
         * DocumentReference.context
         * DocumentReference.context.encounter

data/lib/us_core_test_kit/generated/v4.0.0/encounter/encounter_must_support_test.rb

@@ -19,15 +19,13 @@ module USCoreTestKit
         * Encounter.identifier.system
         * Encounter.identifier.value
         * Encounter.location
-        * Encounter.location.location
+        * Encounter.location.location or Encounter.serviceProvider
         * Encounter.participant
         * Encounter.participant.individual
         * Encounter.participant.period
         * Encounter.participant.type
         * Encounter.period
-        * Encounter.reasonCode
-        * Encounter.reasonReference
-        * Encounter.serviceProvider
+        * Encounter.reasonCode or Encounter.reasonReference
         * Encounter.status
         * Encounter.subject
         * Encounter.type

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

@@ -19,8 +19,7 @@ module USCoreTestKit
         * MedicationRequest.encounter
         * MedicationRequest.intent
         * MedicationRequest.medication[x]
-        * MedicationRequest.reportedBoolean
-        * MedicationRequest.reportedReference
+        * MedicationRequest.reportedBoolean or MedicationRequest.reportedReference
         * MedicationRequest.requester
         * MedicationRequest.status
         * MedicationRequest.subject

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

@@ -12119,10 +12119,13 @@
     :extensions:
     - :id: Patient.extension:race
       :url: http://hl7.org/fhir/us/core/StructureDefinition/us-core-race
+      :uscdi_only: true
     - :id: Patient.extension:ethnicity
       :url: http://hl7.org/fhir/us/core/StructureDefinition/us-core-ethnicity
+      :uscdi_only: true
     - :id: Patient.extension:birthsex
       :url: http://hl7.org/fhir/us/core/StructureDefinition/us-core-birthsex
+      :uscdi_only: true
     :slices: []
     :elements:
     - :path: identifier
@@ -12132,8 +12135,11 @@
     - :path: name.family
     - :path: name.given
     - :path: telecom.system
+      :uscdi_only: true
     - :path: telecom.value
+      :uscdi_only: true
     - :path: telecom.use
+      :uscdi_only: true
     - :path: gender
     - :path: birthDate
     - :path: address
@@ -12143,10 +12149,23 @@
     - :path: address.postalCode
     - :path: address.period
     - :path: communication.language
-    - :path: telecom
+      :uscdi_only: true
     - :path: name.suffix
+      :uscdi_only: true
     - :path: name.use
       :fixed_value: old
+      :uscdi_only: true
+    - :path: name.period.end
+      :uscdi_only: true
+    - :path: telecom
+      :uscdi_only: true
+    - :path: communication
+      :uscdi_only: true
+    :choices:
+    - :paths:
+      - name.period.end
+      - name.use
+      :uscdi_only: true
   :mandatory_elements:
   - Patient.identifier
   - Patient.identifier.system
@@ -13976,7 +13995,6 @@
       - Reference
       :target_profiles:
       - http://hl7.org/fhir/us/core/StructureDefinition/us-core-practitioner
-      - http://hl7.org/fhir/us/core/StructureDefinition/us-core-organization
     - :path: agent.onBehalfOf
       :types:
       - Reference

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

@@ -151,10 +151,13 @@
   :extensions:
   - :id: Patient.extension:race
     :url: http://hl7.org/fhir/us/core/StructureDefinition/us-core-race
+    :uscdi_only: true
   - :id: Patient.extension:ethnicity
     :url: http://hl7.org/fhir/us/core/StructureDefinition/us-core-ethnicity
+    :uscdi_only: true
   - :id: Patient.extension:birthsex
     :url: http://hl7.org/fhir/us/core/StructureDefinition/us-core-birthsex
+    :uscdi_only: true
   :slices: []
   :elements:
   - :path: identifier
@@ -164,8 +167,11 @@
   - :path: name.family
   - :path: name.given
   - :path: telecom.system
+    :uscdi_only: true
   - :path: telecom.value
+    :uscdi_only: true
   - :path: telecom.use
+    :uscdi_only: true
   - :path: gender
   - :path: birthDate
   - :path: address
@@ -175,10 +181,23 @@
   - :path: address.postalCode
   - :path: address.period
   - :path: communication.language
-  - :path: telecom
+    :uscdi_only: true
   - :path: name.suffix
+    :uscdi_only: true
   - :path: name.use
     :fixed_value: old
+    :uscdi_only: true
+  - :path: name.period.end
+    :uscdi_only: true
+  - :path: telecom
+    :uscdi_only: true
+  - :path: communication
+    :uscdi_only: true
+  :choices:
+  - :paths:
+    - name.period.end
+    - name.use
+    :uscdi_only: true
 :mandatory_elements:
 - Patient.identifier
 - Patient.identifier.system

data/lib/us_core_test_kit/generated/v4.0.0/patient/patient_must_support_test.rb

@@ -19,10 +19,6 @@ module USCoreTestKit
         * Patient.address.postalCode
         * Patient.address.state
         * Patient.birthDate
-        * Patient.communication.language
-        * Patient.extension:birthsex
-        * Patient.extension:ethnicity
-        * Patient.extension:race
         * Patient.gender
         * Patient.identifier
         * Patient.identifier.system
@@ -30,8 +26,16 @@ module USCoreTestKit
         * Patient.name
         * Patient.name.family
         * Patient.name.given
+
+        For ONC USCDI requirements, each Patient must support the following additional elements:
+
+        * Patient.communication
+        * Patient.communication.language
+        * Patient.extension:birthsex
+        * Patient.extension:ethnicity
+        * Patient.extension:race
+        * Patient.name.period.end or Patient.name.use
         * Patient.name.suffix
-        * Patient.name.use
         * Patient.telecom
         * Patient.telecom.system
         * Patient.telecom.use

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

@@ -64,7 +64,6 @@
     - Reference
     :target_profiles:
     - http://hl7.org/fhir/us/core/StructureDefinition/us-core-practitioner
-    - http://hl7.org/fhir/us/core/StructureDefinition/us-core-organization
   - :path: agent.onBehalfOf
     :types:
     - Reference

data/lib/us_core_test_kit/generator/must_support_metadata_extractor.rb

@@ -277,7 +277,6 @@ module USCoreTestKit
         when '4.0.0'
           add_device_distinct_identifier
           add_patient_uscdi_elements
-          add_provenance_agent_who
         end
       end
 
@@ -344,18 +343,23 @@ module USCoreTestKit
       def add_must_support_choices
         choices = []
 
-        choices << {paths: ['content.attachment.data', 'content.attachment.url']} if profile.type == 'DocumentReference'
+        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'
+          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']}
+            choices << { paths: ['reasonCode', 'reasonReference'] }
+            choices << { paths: ['location.location', 'serviceProvider'] }
           when 'MedicationRequest'
-            choices << {paths: ['reportedBoolean', 'reportedReference']}
+            choices << { paths: ['reportedBoolean', 'reportedReference'] }
+          when 'Patient'
+            choices << {
+              paths: ['name.period.end', 'name.use'],
+              uscdi_only: true
+            }
           end
         end
 
@@ -377,35 +381,44 @@ module USCoreTestKit
           #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'
+            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'
+            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'
+            url: 'http://hl7.org/fhir/us/core/StructureDefinition/us-core-birthsex',
+            uscdi_only: true
           }
           @must_supports[:elements] << {
-            path: 'telecom'
+            path: 'name.suffix',
+            uscdi_only: true
           }
           @must_supports[:elements] << {
-            path: 'name.suffix'
+            path: 'name.use',
+            fixed_value: 'old',
+            uscdi_only: true
           }
           @must_supports[:elements] << {
-            path: 'name.use',
-            fixed_value: 'old'
+            path: 'name.period.end',
+            uscdi_only: true
           }
-        end
-      end
-
-      def add_provenance_agent_who
-        # FHIR-36344 US Core 4.0.0 mistakenly not lable us-core-organization as MS for Provenance.agent.who
-        # This will be fixed in US Core 5.0.0
-        if profile.type == 'Provenance'
-          target_element = @must_supports[:elements].find { |element| element[:path] == 'agent.who'}
-          target_element[:target_profiles] << 'http://hl7.org/fhir/us/core/StructureDefinition/us-core-organization'
+          @must_supports[:elements] << {
+            path: 'telecom',
+            uscdi_only: true
+          }
+          @must_supports[:elements] << {
+            path: 'communication',
+            uscdi_only: true
+          }
+          @must_supports[:elements].each do |element|
+            path = element[:path]
+            element[:uscdi_only] = true if path.include?('telecom.') || path.include?('communication.')
+          end
         end
       end
     end

data/lib/us_core_test_kit/generator/must_support_test_generator.rb

@@ -68,9 +68,32 @@ module USCoreTestKit
       end
 
       def must_support_list_string
-        slice_names = group_metadata.must_supports[:slices].map { |slice| slice[:name] }
-        element_names = group_metadata.must_supports[:elements].map { |slice| "#{resource_type}.#{slice[:path]}" }
-        extension_names = group_metadata.must_supports[:extensions].map { |slice| slice[:id] }
+        build_must_support_list_string(false)
+      end
+
+      def uscdi_list_string
+        build_must_support_list_string(true)
+      end
+
+      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] }
+
+        element_names = group_metadata.must_supports[:elements]
+          .select { |element| element[:uscdi_only].presence == uscdi_only.presence }
+          .map { |element| "#{resource_type}.#{element[:path]}" }
+
+        extension_names = group_metadata.must_supports[:extensions]
+          .select { |extension| extension[:uscdi_only].presence == uscdi_only.presence }
+          .map { |extension| extension[:id] }
+
+        group_metadata.must_supports[:choices]&.each do |choice|
+          next unless choice[:uscdi_only].presence == uscdi_only.presence
+          choice[:paths].each { |path| element_names.delete("#{resource_type}.#{path}") }
+          element_names << choice[:paths].map { |path| "#{resource_type}.#{path}" }.join(' or ')
+        end
+
         (slice_names + element_names + extension_names)
           .uniq
           .sort

data/lib/us_core_test_kit/must_support_test.rb

@@ -36,8 +36,16 @@ module USCoreTestKit
       end
     end
 
+    def include_uscdi_only_test?
+      config.options[:include_uscdi_only_test] == true
+    end
+
     def must_support_extensions
-      metadata.must_supports[:extensions]
+      if include_uscdi_only_test?
+        metadata.must_supports[:extensions]
+      else
+        metadata.must_supports[:extensions].reject{ |extension| extension[:uscdi_only] }
+      end
     end
 
     def missing_extensions(resources = [])
@@ -50,7 +58,11 @@ module USCoreTestKit
     end
 
     def must_support_elements
-      metadata.must_supports[:elements]
+      if include_uscdi_only_test?
+        metadata.must_supports[:elements]
+      else
+        metadata.must_supports[:elements].reject{ |element| element[:uscdi_only] }
+      end
     end
 
     def missing_elements(resources = [])
@@ -85,7 +97,11 @@ module USCoreTestKit
     end
 
     def must_support_slices
-      metadata.must_supports[:slices]
+      if include_uscdi_only_test?
+        metadata.must_supports[:slices]
+      else
+        metadata.must_supports[:slices].reject{ |slice| slice[:uscdi_only] }
+      end
     end
 
     def missing_slices(resources = [])

data/lib/us_core_test_kit/search_test.rb

@@ -31,7 +31,7 @@ module USCoreTestKit
             if fixed_value_search?
               fixed_value_search_param_values.map { |value| fixed_value_search_params(value, patient_id) }
             else
-              [search_params_with_values(patient_id)]
+              [search_params_with_values(search_param_names, patient_id)]
             end
           new_params.reject! do |params|
             params.any? { |_key, value| value.blank? }
@@ -135,6 +135,9 @@ module USCoreTestKit
       check_search_response
 
       post_search_resources = fetch_all_bundled_resources.select { |resource| resource.resourceType == resource_type }
+
+      filter_devices(post_search_resources) if resource_type == 'Device'
+
       get_resource_count = get_search_resources.length
       post_resource_count = post_search_resources.length
 
@@ -240,10 +243,11 @@ module USCoreTestKit
       new_search_params = params.merge('patient' => "Patient/#{params['patient']}")
       search_and_check_response(new_search_params)
 
-      new_resource_count =
-        fetch_all_bundled_resources
-          .select { |resource| resource.resourceType == resource_type }
-          .count
+      reference_with_type_resources = fetch_all_bundled_resources.select { |resource| resource.resourceType == resource_type }
+
+      filter_devices(reference_with_type_resources) if resource_type == 'Device'
+
+      new_resource_count = reference_with_type_resources.count
 
       assert new_resource_count == resource_count,
              "Expected search by `#{params['patient']}` to to return the same results as searching " \
@@ -256,9 +260,7 @@ module USCoreTestKit
     def perform_search_with_system(params, patient_id)
       return if search_variant_test_records[:token_variants]
 
-      new_search_params = token_search_params.each_with_object({}) do |name, search_params|
-        search_params[name] = search_param_value(name, patient_id, include_system: true)
-      end
+      new_search_params = search_params_with_values(token_search_params, patient_id, include_system: true)
       return if new_search_params.any? { |_name, value| value.blank? }
 
       search_params = params.merge(new_search_params)
@@ -308,7 +310,7 @@ module USCoreTestKit
       definition = metadata.search_definitions[param_name]
       return [] if definition.blank?
 
-      definition[:multiple_or] == 'SHALL' ? [definition[:values].join(',')] : [definition[:values]]
+      definition[:multiple_or] == 'SHALL' ? [definition[:values].join(',')] : Array.wrap(definition[:values])
     end
 
 
@@ -317,7 +319,7 @@ module USCoreTestKit
 
       all_search_params.each do |patient_id, params_list|
         next unless params_list.present?
-        
+
         search_params = params_list.first
         existing_values = {}
         missing_values = {}
@@ -423,11 +425,29 @@ module USCoreTestKit
       end
     end
 
-    def search_params_with_values(patient_id)
-      search_param_names.each_with_object({}) do |name, params|
-        value = patient_id_param?(name) ? patient_id : search_param_value(name, patient_id)
-        params[name] = value
+    def search_params_with_values(search_param_names, patient_id, include_system: false)
+      resources = scratch_resources_for_patient(patient_id)
+
+      if resources.empty?
+        return search_param_names.each_with_object({}) do |name, params|
+          value = patient_id_param?(name) ? patient_id : nil
+          params[name] = value
+        end
       end
+
+      params_with_partial_value = resources.each_with_object({}) do |resource, outer_params|
+        results_from_one_resource = search_param_names.each_with_object({}) do |name, params|
+          value = patient_id_param?(name) ? patient_id : search_param_value(name, resource, include_system: include_system)
+          params[name] = value
+        end
+
+        outer_params.merge!(results_from_one_resource)
+
+        # stop if all parameter values are found
+        return outer_params if outer_params.all? { |_key, value| value.present? }
+      end
+
+      params_with_partial_value
     end
 
     def patient_id_list
@@ -446,10 +466,10 @@ module USCoreTestKit
 
     def search_param_paths(name)
       paths = metadata.search_definitions[name.to_sym][:paths]
-      if paths.first =='class' 
+      if paths.first =='class'
         paths[0] = 'local_class'
       end
-      
+
       paths
     end
 
@@ -470,8 +490,13 @@ module USCoreTestKit
     end
 
     def no_resources_skip_message(resource_type = self.resource_type)
-      "No #{resource_type} resources appear to be available. " \
-      "Please use patients with more information"
+      msg = "No #{resource_type} resources appear to be available"
+
+      if (resource_type == 'Device' && implantable_device_codes.present?)
+        msg.concat(" with the following Device Type Code filter: #{implantable_device_codes}")
+      end
+
+      msg + ". Please use patients with more information"
     end
 
     def fetch_all_bundled_resources(
@@ -504,15 +529,6 @@ module USCoreTestKit
         page_count += 1
       end
 
-      valid_resource_types = [resource_type, 'OperationOutcome'].concat(additional_resource_types)
-      valid_resource_types << 'Medication' if resource_type == 'MedicationRequest'
-
-      all_valid_resource_types =
-        resources.all? { |entry| valid_resource_types.include? entry.resourceType }
-
-      assert all_valid_resource_types,
-             "All resources returned must be of the type: #{valid_resource_types.join(', ')}"
-
       resources
     end
 
@@ -520,11 +536,11 @@ module USCoreTestKit
       "Could not resolve next bundle: #{link}"
     end
 
-    def search_param_value(name, patient_id, include_system: false)
+    def search_param_value(name, resource, include_system: false)
       paths = search_param_paths(name)
       search_value = nil
       paths.each do |path|
-        element = find_a_value_at(scratch_resources_for_patient(patient_id), path)
+        element = find_a_value_at(resource, path) { |element| element_has_valid_value?(element, include_system) }
 
         search_value =
           case element
@@ -541,34 +557,37 @@ module USCoreTestKit
             if include_system
               coding =
                 find_a_value_at(element, 'coding') { |coding| coding.code.present? && coding.system.present? }
-              coding.present? ? "#{coding.system}|#{coding.code}" : nil
+              "#{coding.system}|#{coding.code}"
             else
               find_a_value_at(element, 'coding.code')
             end
           when FHIR::Identifier
-            if include_system
-              identifier = find_a_value_at(scratch_resources_for_patient(patient_id), path) do |identifier|
-                identifier.value.present? && identifier.system.present?
-              end
-              identifier.present? ? "#{identifier.system}|#{identifier.value}" : nil
-            else
-              element.value
-            end
+            include_system ? "#{element.system}|#{element.value}" : element.value
           when FHIR::Coding
-            if include_system
-              coding = find_a_value_at(scratch_resources_for_patient(patient_id), path) do |coding|
-                coding.code.present? && coding.system.present?
-              end
-              coding.present? ? "#{coding.system}|#{coding.code}" : nil
-            else
-              element.code
-            end
+            include_system ? "#{element.system}|#{element.code}" : element.code
           when FHIR::HumanName
             element.family || element.given&.first || element.text
           when FHIR::Address
             element.text || element.city || element.state || element.postalCode || element.country
           else
-            element
+            if metadata.version != 'v3.1.1' &&
+               metadata.search_definitions[name.to_sym][:type] == 'date' &&
+               params_with_comparators&.include?(name)
+              # convert date search to greath-than comparator search with correct precision
+              # For all date search parameters:
+              #   Patient.birthDate does not mandate comparators so cannot be converted
+              #   Goal.target-date has day precision
+              #   All others have second + time offset precision
+              if /^\d{4}$/.match?(element) || # YYYY
+                 /^\d{4}-\d{2}$/.match?(element) || # YYYY-MM
+                (/^\d{4}-\d{2}-\d{2}$/.match?(element) && resource_type != "Goal") # YYYY-MM-DD AND Resource is NOT Goal
+                "gt#{(DateTime.xmlschema(element)-1).xmlschema}"
+              else
+                element
+              end
+            else
+              element
+            end
           end
 
           break if search_value.present?
@@ -578,6 +597,31 @@ module USCoreTestKit
       escaped_value
     end
 
+    def element_has_valid_value?(element, include_system)
+      case element
+      when FHIR::Reference
+        element.reference.present?
+      when FHIR::CodeableConcept
+        if include_system
+          coding =
+            find_a_value_at(element, 'coding') { |coding| coding.code.present? && coding.system.present? }
+          coding.present?
+        else
+          find_a_value_at(element, 'coding.code').present?
+        end
+      when FHIR::Identifier
+        include_system ? element.value.present? && element.system.present? : element.value.present?
+      when FHIR::Coding
+        include_system ? element.code.present? && element.system.present? : element.code.present?
+      when FHIR::HumanName
+        (element.family || element.given&.first || element.text).present?
+      when FHIR::Address
+        (element.text || element.city || element.state || element.postalCode || element.country).present?
+      else
+        true
+      end
+    end
+
     def save_resource_reference(resource_type, reference)
       scratch[:references] ||= {}
       scratch[:references][resource_type] ||= Set.new
@@ -647,9 +691,9 @@ module USCoreTestKit
                 address&.country&.downcase&.start_with?(search_value_downcase)
               end
             when 'CodeableConcept'
-              # FHIR token search (https://www.hl7.org/fhir/search.html#token): "When in doubt, servers SHOULD 
-              # treat tokens in a case-insensitive manner, on the grounds that including undesired data has 
-              # less safety implications than excluding desired behavior". 
+              # FHIR token search (https://www.hl7.org/fhir/search.html#token): "When in doubt, servers SHOULD
+              # treat tokens in a case-insensitive manner, on the grounds that including undesired data has
+              # less safety implications than excluding desired behavior".
               codings = values_found.flat_map(&:coding)
               if search_value.include? '|'
                 system = search_value.split('|').first
@@ -691,7 +735,7 @@ module USCoreTestKit
                 values_found.any? { |value_found| search_values.include? value_found }
               end
             end
-          
+
           break if match_found
         end
 

data/lib/us_core_test_kit/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module USCoreTestKit
-  VERSION = '0.2.2'
+  VERSION = '0.2.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: us_core_test_kit
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Stephen MacVicar
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-05-09 00:00:00.000000000 Z
+date: 2022-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: inferno_core