us_core_test_kit 0.2.4 → 0.3.1

data/lib/us_core_test_kit/reference_resolution_test.rb

@@ -18,7 +18,7 @@ module USCoreTestKit
     def unresolved_references_strings
       unresolved_reference_hash =
         unresolved_references.each_with_object(Hash.new { |hash, key| hash[key] = [] }) do |missing, hash|
-          hash[missing[:path]] << missing[:target_profile] 
+          hash[missing[:path]] << missing[:target_profile]
         end
       unresolved_reference_hash.map { |path, profiles| "#{path}#{"(#{profiles.join('|')})" unless profiles.first.empty?}" }
     end
@@ -32,7 +32,7 @@ module USCoreTestKit
     end
 
     def no_resources_skip_message
-      "No #{resource_type} resources appeart to be available. " \
+      "No #{resource_type} resources appear to be available. " \
       'Please use patients with more information.'
     end
 
@@ -41,7 +41,7 @@ module USCoreTestKit
     end
 
     def must_support_references_with_target_profile
-      # mapping array of target_profiles to array of {path, target_profile} pair 
+      # mapping array of target_profiles to array of {path, target_profile} pair
       must_support_references.map do |element_definition|
         (element_definition[:target_profiles] || ['']).map do |target_profile|
           {
@@ -73,6 +73,17 @@ module USCoreTestKit
 
           found_one_reference && !resolve_one_reference
         end
+
+      if metadata.must_supports[:choices].present?
+        @unresolved_references.delete_if do |reference|
+          choice_profiles = metadata.must_supports[:choices].find { |choice| choice[:target_profiles]&.include?(reference[:target_profile]) }
+
+          choice_profiles.present? &&
+          choice_profiles[:target_profiles]&.any? { |profile| @unresolved_references.none? { |element| element[:target_profile] == profile } }
+        end
+      end
+
+      @unresolved_references
     end
 
     def validate_reference_resolution(resource, reference, target_profile)
@@ -125,7 +136,19 @@ module USCoreTestKit
     def resource_is_valid_with_target_profile?(resource, target_profile)
       return true if target_profile.blank?
 
-      resource_is_valid?(resource: resource, profile_url: target_profile)
+      # Only need to know if the resource is valid.
+      # Calling resource_is_valid? causes validation errors to be logged.
+      validator = find_validator(:default)
+
+      outcome = FHIR::OperationOutcome.new(JSON.parse(validator.validate(resource, target_profile)))
+
+      message_hashes = outcome.issue&.map { |issue| validator.message_hash_from_issue(issue, resource) } || []
+
+      message_hashes.concat(validator.additional_validation_messages(resource, target_profile))
+
+      validator.filter_messages(message_hashes)
+
+      message_hashes.none? { |message_hash| message_hash[:type] == 'error' }
     end
   end
 end

data/lib/us_core_test_kit/search_test.rb

@@ -106,6 +106,7 @@ module USCoreTestKit
 
       perform_comparator_searches(params, patient_id) if params_with_comparators.present?
 
+      filter_conditions(resources_returned) if resource_type == 'Condition' && metadata.version == 'v5.0.1'
       filter_devices(resources_returned) if resource_type == 'Device'
 
       if first_search?
@@ -136,6 +137,7 @@ module USCoreTestKit
 
       post_search_resources = fetch_all_bundled_resources.select { |resource| resource.resourceType == resource_type }
 
+      filter_conditions(post_search_resources) if resource_type == 'Condition' && metadata.version == 'v5.0.1'
       filter_devices(post_search_resources) if resource_type == 'Device'
 
       get_resource_count = get_search_resources.length
@@ -158,6 +160,19 @@ module USCoreTestKit
       end
     end
 
+    def filter_conditions(resources)
+      # HL7 JIRA FHIR-37917. US Core v5.0.1 does not required patient+category.
+      # In order to distinguish which resources matches the current profile, Inferno has to manually filter
+      # the result of first search, which is searching by patient.
+      resources.select! do |resource|
+        resource.category.any? do |category|
+          category.coding.any? do |coding|
+            metadata.search_definitions[:category][:values].include? coding.code
+          end
+        end
+      end
+    end
+
     def search_and_check_response(params, resource_type = self.resource_type)
       fhir_search resource_type, params: params
 
@@ -228,8 +243,9 @@ module USCoreTestKit
 
           search_and_check_response(params_with_comparator)
 
-          fetch_all_bundled_resources
-            .each { |resource| check_resource_against_params(resource, params_with_comparator) }
+          fetch_all_bundled_resources.each do |resource|
+            check_resource_against_params(resource, params_with_comparator) if resource.resourceType == resource_type
+          end
         end
 
         search_variant_test_records[:comparator_searches] << name
@@ -245,6 +261,7 @@ module USCoreTestKit
 
       reference_with_type_resources = fetch_all_bundled_resources.select { |resource| resource.resourceType == resource_type }
 
+      filter_conditions(reference_with_type_resources) if resource_type == 'Condition' && metadata.version == 'v5.0.1'
       filter_devices(reference_with_type_resources) if resource_type == 'Device'
 
       new_resource_count = reference_with_type_resources.count

data/lib/us_core_test_kit/validation_test.rb

@@ -5,6 +5,7 @@ module USCoreTestKit
 
     def perform_validation_test(resources,
                                 profile_url,
+                                profile_version,
                                 skip_if_empty: true)
 
       skip_if skip_if_empty && resources.blank?,
@@ -13,14 +14,15 @@ module USCoreTestKit
       omit_if resources.blank?,
               "No #{resource_type} resources provided so the #{profile_url} profile does not apply"
 
+      profile_with_version = "#{profile_url}|#{profile_version}"
       resources.each do |resource|
-        resource_is_valid?(resource: resource, profile_url: profile_url)
+        resource_is_valid?(resource: resource, profile_url: profile_with_version)
         check_for_dar(resource)
       end
 
       errors_found = messages.any? { |message| message[:type] == 'error' }
 
-      assert !errors_found, "Resource does not conform to the profile #{profile_url}"
+      assert !errors_found, "Resource does not conform to the profile #{profile_with_version}"
     end
 
     def check_for_dar(resource)

data/lib/us_core_test_kit/version.rb

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

data/lib/us_core_test_kit.rb

@@ -1,3 +1,4 @@
 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'