davinci_crd_test_kit 0.14.0 → 0.14.2

data/lib/davinci_crd_test_kit/client/v2.2.1/verify_request/hook_request_prefetch_complete_test.rb

@@ -29,6 +29,12 @@ module DaVinciCRDTestKit
         During this test, Inferno will verify that each hook request body includes a `prefetch` field populated with
         valid JSON that contains exactly the requested prefetch keys and data sets described in the service description
         for the invoked service as calculated by Inferno based on the resources provided in the request.
+
+        Note that Inferno requires **all** requested prefetch keys to be present in the request even if there is no
+        data for that key. This because the [CDS Hook specification requires](https://cds-hooks.hl7.org/2026Jan/en/#example-of-pagination-in-prefetch)
+        that if "the CDS Client has no data to populate a template prefetch key, the prefetch template key MUST have a
+        value of null." For templates that request the results of a FHIR search interaction, an empty Bundle is also
+        acceptable.
       )
       verifies_requirements 'cds-hooks_3.0.0-ballot@30', 'cds-hooks_3.0.0-ballot@231', 'cds-hooks_3.0.0-ballot@45',
                             'cds-hooks_3.0.0-ballot@46', 'cds-hooks_3.0.0-ballot@47', 'cds-hooks_3.0.0-ballot@232',
@@ -83,7 +89,7 @@ module DaVinciCRDTestKit
       end
 
       run do
-        hook_requests = load_hook_requests
+        hook_requests = load_interaction_group_requests
 
         skip_if hook_requests.blank?, "No #{hook_name} hook requests received."
 

data/lib/davinci_crd_test_kit/client/v2.2.1/verify_request/hook_request_prefetch_profiles_test.rb

@@ -34,7 +34,7 @@ module DaVinciCRDTestKit
                             'hl7.fhir.us.davinci-crd_2.2.1@prof-10', 'hl7.fhir.us.davinci-crd_2.2.1@prof-11',
                             'hl7.fhir.us.davinci-crd_2.2.1@prof-12'
       run do
-        hook_requests = load_hook_requests
+        hook_requests = load_interaction_group_requests
 
         skip_if hook_requests.blank?, "No #{hook_name} hook requests received."
 

data/lib/davinci_crd_test_kit/client/v2.2.1/verify_request/hook_request_requested_version_test.rb

@@ -21,7 +21,7 @@ module DaVinciCRDTestKit
                             'hl7.fhir.us.davinci-crd_2.2.1@dev-12'
 
       run do
-        hook_requests = load_hook_requests
+        hook_requests = load_interaction_group_requests
 
         skip_if hook_requests.blank?, "No #{hook_name} hook requests received."
 

data/lib/davinci_crd_test_kit/client/v2.2.1/verify_request/hook_request_secured_transport_test.rb

@@ -18,7 +18,7 @@ module DaVinciCRDTestKit
                             'hl7.fhir.us.davinci-crd_2.2.1@sec-2'
 
       run do
-        hook_requests = load_hook_requests
+        hook_requests = load_interaction_group_requests
 
         skip_if hook_requests.blank?, "No #{hook_name} hook requests received."
 

data/lib/davinci_crd_test_kit/client/v2.2.1/verify_response/client_display_cards_attest.rb

@@ -10,40 +10,73 @@ module DaVinciCRDTestKit
       include DaVinciCRDTestKit::TaggedRequestLoadHelper
 
       id :crd_v221_card_display_attest_test
-      title 'Client displays returned decision support details to the user (Attestation)'
+      title 'Client displays returned decision support details to the user'
       description %(
         During this test, the tester will confirm that the received cards and actions in the
         hook responses have been displayed or otherwise made available to users of the client system
         in an appopriate way that allows for consideration and action if warranted.
       )
+      attestation
+
+      verifies_requirements 'hl7.fhir.us.davinci-crd_2.2.1@resp-49'
 
       def responded_card_types
-        list_card_types_in_requests(requests)
+        @responded_card_types ||= list_card_types_in_requests(requests)
       end
 
-      def format_responded_response_types
-        responded_card_types
+      def format_responded_response_types(response_types = responded_card_types)
+        response_types
           .map do |response_type|
-          response_type_string =
-            response_type.split('_')
-              .map(&:capitalize)
-              .join(' ')
+            DaVinciCRDTestKit::CardsIdentification.humanize_response_type(response_type)
               .prepend('- ')
-              .sub('Smart', 'SMART')
-              .sub('Create Update', 'Create/Update')
-              .sub('Companions Prerequisites', 'Companions/Prerequisites')
-              .sub('Card', '(card)')
-              .sub('Action', '(systemAction)')
-          response_type_string
+              .sub(' Card', '')
+              .sub(' Action', '')
+          end.join("\n")
+      end
+
+      def format_responded_card_types
+        @format_responded_card_types ||=
+          format_responded_response_types(responded_card_types.select do |type|
+            type.end_with?('_card')
+          end)
+      end
+
+      def format_responded_system_action_types
+        @format_responded_system_action_types ||=
+          format_responded_response_types(responded_card_types.select do |type|
+            type.end_with?('_action')
+          end)
+      end
+
+      CARD_AND_SYSTEM_ACTION_DISPLAY_PREFIX = "\n\n By attesting true, ".freeze
+      CARD_AND_SYSTEM_ACTION_DISPLAY_CLAUSE_PREFIX = 'you confirm that the following '.freeze
+      CARD_AND_SYSTEM_ACTION_DISPLAY_CLAUSE_CONNECTOR = "\n\n Additionally, ".freeze
+      CARD_AND_SYSTEM_ACTION_DISPLAY_CARD_CLAUSE =
+        'card types observed in Inferno\'s responses were displayed to users:'.freeze
+      CARD_AND_SYSTEM_ACTION_DISPLAY_SYSTEM_ACTION_CLAUSE =
+        'system action types observed in Inferno\'s responses were displayed to users ' \
+        'through standard card display, icons, flyovers, or another alternate mechanism:'.freeze
+
+      def card_and_system_action_details_display
+        if format_responded_card_types.present? && format_responded_system_action_types.present?
+          "#{CARD_AND_SYSTEM_ACTION_DISPLAY_PREFIX}#{CARD_AND_SYSTEM_ACTION_DISPLAY_CLAUSE_PREFIX}" \
+            "#{CARD_AND_SYSTEM_ACTION_DISPLAY_CARD_CLAUSE}\n#{format_responded_card_types}" \
+            "#{CARD_AND_SYSTEM_ACTION_DISPLAY_CLAUSE_CONNECTOR}#{CARD_AND_SYSTEM_ACTION_DISPLAY_CLAUSE_PREFIX}" \
+            "#{CARD_AND_SYSTEM_ACTION_DISPLAY_SYSTEM_ACTION_CLAUSE}\n#{format_responded_system_action_types}"
+        elsif format_responded_card_types.present?
+          "#{CARD_AND_SYSTEM_ACTION_DISPLAY_PREFIX}#{CARD_AND_SYSTEM_ACTION_DISPLAY_CLAUSE_PREFIX}" \
+            "#{CARD_AND_SYSTEM_ACTION_DISPLAY_CARD_CLAUSE}\n#{format_responded_card_types}"
+        else
+          "#{CARD_AND_SYSTEM_ACTION_DISPLAY_PREFIX}#{CARD_AND_SYSTEM_ACTION_DISPLAY_CLAUSE_PREFIX}" \
+            "#{CARD_AND_SYSTEM_ACTION_DISPLAY_SYSTEM_ACTION_CLAUSE}\n#{format_responded_system_action_types}"
         end
-          .join("\n")
       end
 
       output :attest_true_url
       output :attest_false_url
 
       run do
-        load_hook_requests
+        load_interaction_group_requests
         skip_if responded_card_types.blank?, 'No responses sent to the client.'
 
         identifier = SecureRandom.hex(32)
@@ -56,12 +89,12 @@ module DaVinciCRDTestKit
           message: <<~MESSAGE
             **Card Display Attestation**:
 
-            I attest that the following CRD response types returned by Inferno's simulated
-            CRD servers were processed by the client system and displayed or otherwise made
-            available to users of the client system in an appropriate way that allows for
-            consideration and action if warranted:
+            I attest that the simulated CRD responses returned by Inferno during this
+            group were successfully processed by the client system and that they were
+            made available to users of the system in an appropriate way that allowed for
+            user review and action if warranted.
 
-            #{format_responded_response_types}
+            #{card_and_system_action_details_display}
 
             [Click here](#{attest_true_url}) if the above statement is **true**.
 

data/lib/davinci_crd_test_kit/client/v2.2.1/verify_response/hook_response_support_coverage_information_test.rb

@@ -18,7 +18,7 @@ module DaVinciCRDTestKit
       DESCRIPTION
 
       run do
-        hook_requests = load_hook_requests
+        hook_requests = load_interaction_group_requests
         skip_if hook_requests.blank?, "No #{hook_name} hook requests received."
 
         sorted_cards = sorted_cards_from_requests(hook_requests)

data/lib/davinci_crd_test_kit/client/v2.2.1/verify_response/inferno_response_validation.rb

@@ -14,6 +14,8 @@ module DaVinciCRDTestKit
         During this test, Inferno will verify that each hook response built by Inferno's simulated CRD servers
         and returned to the client conforms to CDS Hooks and CRD requirements. These responses must be conformant
         for the client to demonstrate its ability to accept and process valid CRD responses.
+        To prevent the injection of non-standard information into Inferno responses, these validations will
+        strictly check that all extensions are allowed at the locations they appear by the CRD specification.
 
         If this test fails when the tester provided a custom response template, adjust the
         provided template and the submitted requests so that the response built by Inferno
@@ -29,7 +31,7 @@ module DaVinciCRDTestKit
       simulation_verification
 
       verifies_requirements 'cds-hooks_3.0.0-ballot@3', 'cds-hooks_3.0.0-ballot@222', 'cds-hooks_3.0.0-ballot@223',
-                            'cds-hooks_3.0.0-ballot@224'
+                            'cds-hooks_3.0.0-ballot@224', 'hl7.fhir.us.davinci-crd_2.2.1@conf-10'
 
       input :custom_response_template, optional: true
 
@@ -45,7 +47,7 @@ module DaVinciCRDTestKit
       end
 
       run do
-        load_hook_requests
+        load_interaction_group_requests
 
         skip_if request.blank?, "No #{response_label.downcase}s to verify."
 
@@ -62,7 +64,8 @@ module DaVinciCRDTestKit
                                                     response_hash['systemActions'],
                                                     request_hash,
                                                     index,
-                                                    '2.2.1')
+                                                    '2.2.1',
+                                                    validator: :no_custom_extensions)
         rescue JSON::ParserError
           next
         end

data/lib/davinci_crd_test_kit/cross_suite/cards_identification.rb

@@ -35,6 +35,15 @@ module DaVinciCRDTestKit
       NutritionOrder ServiceRequest VisionPrescription
     ].freeze
 
+    def self.humanize_response_type(response_type)
+      response_type.split('_')
+        .map(&:capitalize)
+        .join(' ')
+        .sub('Smart', 'SMART')
+        .sub('Create Update', 'Create/Update')
+        .sub('Companions Prerequisites', 'Companions/Prerequisites')
+    end
+
     def identify_card_type(card) # rubocop:disable Metrics/CyclomaticComplexity
       return nil if card['type'].present? # action, not a card
       return ADDITIONAL_ORDERS_RESPONSE_TYPE if additional_orders_response_type?(card)
@@ -88,6 +97,14 @@ module DaVinciCRDTestKit
       [cards, actions]
     end
 
+    def coverage_info_system_action_response?(response_body)
+      return false unless response_body.is_a?(Hash)
+
+      return false unless response_body['systemActions'].is_a?(Array)
+
+      response_body['systemActions'].any? { |action| coverage_information_response_type?(action) }
+    end
+
     def coverage_info_response?(response_body)
       cards, actions = coverage_info_content(response_body)
 
@@ -123,6 +140,7 @@ module DaVinciCRDTestKit
 
     def coverage_information_response_type?(action) # rubocop:disable Metrics/CyclomaticComplexity
       return false unless action.respond_to?(:[])
+      return false unless action['type'] == 'update'
 
       resource = action['resource']&.to_hash
       return false unless COVERAGE_INFO_EXPECTED_RESOURCE_TYPES.include? resource&.dig('resourceType')

data/lib/davinci_crd_test_kit/cross_suite/logical_models_override_helper.rb

@@ -13,27 +13,44 @@ module DaVinciCRDTestKit
       end
     end
 
+    def filter_logical_model_extension_issues(issues, validator)
+      return if validator == :no_custom_extensions
+
+      issues.each { |issue| issue.filtered = issue.filtered || logical_model_extension_issue?(issue) }
+    end
+
+    # Logical models validation doesn't currently respect the `"extensions": ["any"]`
+    # validator flag
+    def logical_model_extension_issue?(issue)
+      issue.message.match(/\.extension: Unrecognized property/).present?
+    end
+
     # -------------------------------------------------------------------------
     # Check resource conformance outside the logical models
     # -------------------------------------------------------------------------
 
-    def check_resource_conformance_to_coverage_profile(resource_hash, error_prefix, ig_semver)
-      check_resource_type_and_validate(resource_hash, error_prefix, ig_semver, FHIR::Coverage)
+    def check_resource_conformance_to_coverage_profile(resource_hash, error_prefix, ig_semver, validator: :default)
+      check_resource_type_and_validate(resource_hash, error_prefix, ig_semver, FHIR::Coverage, validator:)
     end
 
-    def check_resource_conformance_to_questionnaire_task_profile(resource_hash, error_prefix, ig_semver)
-      check_resource_type_and_validate(resource_hash, error_prefix, ig_semver, FHIR::Task)
+    def check_resource_conformance_to_questionnaire_task_profile(resource_hash, error_prefix, ig_semver,
+                                                                 validator: :default)
+      check_resource_type_and_validate(resource_hash, error_prefix, ig_semver, FHIR::Task, validator:)
     end
 
-    def check_resource_conformance_to_order_or_encounter_profile(resource_hash, request_body, error_prefix, ig_semver)
+    def check_resource_conformance_to_order_or_encounter_profile(resource_hash, request_body, error_prefix, ig_semver,
+                                                                 validator: :default)
       check_order_like_resource_conformance(resource_hash, request_body, error_prefix, ig_semver,
+                                            validator:,
                                             allowed_types: ProfilesAndResourceTypes::ORDER_OR_ENCOUNTER_RESOURCE_CLASSES,
                                             disallowed_message: 'is not allowed as a target ' \
                                                                 'for a coverage-information action')
     end
 
-    def check_resource_conformance_to_order_profile(resource_hash, request_body, error_prefix, ig_semver)
+    def check_resource_conformance_to_order_profile(resource_hash, request_body, error_prefix, ig_semver,
+                                                    validator: :default)
       check_order_like_resource_conformance(resource_hash, request_body, error_prefix, ig_semver,
+                                            validator:,
                                             allowed_types: ProfilesAndResourceTypes::ORDER_RESOURCE_CLASSES,
                                             disallowed_message: 'is not allowed for CRD orders')
     end
@@ -51,11 +68,11 @@ module DaVinciCRDTestKit
       yield resource
     end
 
-    def check_resource_type_and_validate(resource_hash, error_prefix, ig_semver, expected_class)
+    def check_resource_type_and_validate(resource_hash, error_prefix, ig_semver, expected_class, validator: :default)
       parse_action_resource(resource_hash, error_prefix) do |resource|
         if resource.is_a?(expected_class)
           resource_is_valid?(resource:, profile_url: structure_definition_map(ig_semver)[resource.resourceType],
-                             message_prefix: error_prefix)
+                             message_prefix: error_prefix, validator:)
         else
           add_message('error', "#{error_prefix}found resource type '#{resource.resourceType}' " \
                                "expected '#{expected_class.name.split('::').last}'.")
@@ -64,14 +81,14 @@ module DaVinciCRDTestKit
     end
 
     def check_order_like_resource_conformance(resource_hash, request_body, error_prefix, ig_semver,
-                                              allowed_types:, disallowed_message:)
+                                              allowed_types:, disallowed_message:, validator: :default)
       parse_action_resource(resource_hash, error_prefix) do |resource|
         case resource
         when FHIR::Appointment
-          check_appointment_conformance(resource, request_body, error_prefix, ig_semver)
+          check_appointment_conformance(resource, request_body, error_prefix, ig_semver, validator:)
         when *allowed_types
           resource_is_valid?(resource:, profile_url: structure_definition_map(ig_semver)[resource.resourceType],
-                             message_prefix: error_prefix)
+                             message_prefix: error_prefix, validator:)
         else
           add_message('error', "#{error_prefix}resource type '#{resource.resourceType}' #{disallowed_message}.")
         end
@@ -82,7 +99,7 @@ module DaVinciCRDTestKit
     # Appointment conformance (requires extra help to decide profile and check profile-based slicing)
     # -------------------------------------------------------------------------
 
-    def check_appointment_conformance(appointment, request_body, error_prefix, ig_semver)
+    def check_appointment_conformance(appointment, request_body, error_prefix, ig_semver, validator: :default)
       target_appointment_profile =
         if appointment.basedOn.present?
           'http://hl7.org/fhir/us/davinci-crd/StructureDefinition/profile-appointment-with-order'
@@ -92,7 +109,7 @@ module DaVinciCRDTestKit
 
       validation_issues = []
       resource_is_valid?(resource: appointment, profile_url: "#{target_appointment_profile}|#{ig_semver}",
-                         add_messages_to_runnable: false, validator_response_details: validation_issues)
+                         add_messages_to_runnable: false, validator_response_details: validation_issues, validator:)
 
       manually_check_appointment_validation_errors(validation_issues, appointment, request_body)
         .each do |issue|

data/lib/davinci_crd_test_kit/cross_suite/prefetch_completeness_checker.rb

@@ -172,12 +172,16 @@ module DaVinciCRDTestKit
       end
 
       check_is_fhir_resource(prefetched_value, target_resource_type: 'Bundle')
-      unless prefetched_value['entry'].size == 1
-        errors << "#{error_prefix} exactly one Coverage must be provided."
-        return
-      end
+      if prefetched_value['resourceType'] == 'Bundle'
+        unless prefetched_value['entry']&.size == 1
+          errors << "#{error_prefix} exactly one Coverage must be provided."
+          return
+        end
 
-      check_coverage(prefetched_value.dig('entry', 0, 'resource'))
+        check_coverage(prefetched_value.dig('entry', 0, 'resource'))
+      elsif prefetched_value['resourceType'] == 'Coverage'
+        check_coverage(prefetched_value)
+      end
     end
 
     def check_coverage(prefetched_coverage)
@@ -197,16 +201,26 @@ module DaVinciCRDTestKit
                   "expected active, got #{prefetched_coverage['status']}."
       end
 
-      target_patient_id = hook_request.dig('context', 'patientId')
-      unless prefetched_coverage.dig('beneficiary', 'reference') == "Patient/#{target_patient_id}"
-        errors << "#{error_prefix} prefetched Coverage has an unexpected beneficiary reference: " \
-                  "expected Patient/#{target_patient_id}, got #{prefetched_coverage.dig('beneficiary',
-                                                                                        'reference')}."
-      end
+      check_coverage_beneficiary(prefetched_coverage)
 
       nil
     end
 
+    def check_coverage_beneficiary(prefetched_coverage)
+      target_patient_id = hook_request.dig('context', 'patientId')
+      patient_id = target_patient_id&.delete_prefix('Patient/')
+      relative_ref = "Patient/#{patient_id}"
+      fhir_server = hook_request['fhirServer']&.chomp('/')
+      absolute_ref = "#{fhir_server}/#{relative_ref}" if fhir_server.present?
+
+      actual_ref = prefetched_coverage.dig('beneficiary', 'reference')
+      return if actual_ref == relative_ref || (absolute_ref && actual_ref == absolute_ref)
+
+      expected_refs = [relative_ref, absolute_ref].compact.join(' or ')
+      errors << "#{error_prefix} prefetched Coverage has an unexpected beneficiary reference: " \
+                "expected #{expected_refs}, got #{actual_ref}."
+    end
+
     def check_read(prefetched_value, instantiated_request)
       resource_type, resource_id = instantiated_request.split('/')
 

data/lib/davinci_crd_test_kit/cross_suite/prefetch_profile_validation.rb

@@ -34,6 +34,8 @@ module DaVinciCRDTestKit
                          profile_url: target_crd_profile,
                          validator_response_details: validation_details, add_messages_to_runnable: false)
       validation_details.each do |issue|
+        next if issue.filtered
+
         prefix = prefetch_profile_error_prefix(request_index, bundle_entry_index)
         add_message(issue.severity, "#{prefix}#{issue.message}")
       end

data/lib/davinci_crd_test_kit/cross_suite/requests_logical_model_validation.rb

@@ -13,15 +13,10 @@ module DaVinciCRDTestKit
       'Practitioner', 'PractitionerRole'
     ].freeze
 
-    def validate_request_against_logical_model(request_body, request_index, ig_semver)
-      if ig_semver == '2.2.1'
-        check_logical_model_conformance_no_resource_checks(request_body, request_index, ig_semver)
-      else
-        conforms_to_logical_model?(request_body, "#{CRD_CDS_HOOK_REQUEST_MODEL_URL}|#{ig_semver}",
-                                   message_prefix: "(Request #{request_index + 1}) ")
-      end
+    def validate_request_against_logical_model(request_body, request_index, ig_semver, validator: :default)
+      check_logical_model_conformance_no_resource_checks(request_body, request_index, ig_semver, validator:)
 
-      perform_version_specific_additional_verification(request_body, request_index, ig_semver)
+      perform_version_specific_additional_verification(request_body, request_index, ig_semver, validator:)
     end
 
     private
@@ -30,83 +25,88 @@ module DaVinciCRDTestKit
     # Additional Validation to cover areas not checked or checked incorrectly by the logical models
     # -------------------------------------------------------------------------
 
-    def perform_version_specific_additional_verification(request_body, request_index, ig_semver)
+    def perform_version_specific_additional_verification(request_body, request_index, ig_semver, validator: :default)
       case ig_semver
       when '2.2.1'
-        perform_v221_additional_verification(request_body, request_index)
+        perform_v221_additional_verification(request_body, request_index, validator:)
       end
     end
 
-    def perform_v221_additional_verification(request_body, request_index)
+    def perform_v221_additional_verification(request_body, request_index, validator: :default)
       check_context_resources_for_ids(request_body, request_index)
       check_relative_references(request_body, request_index)
-      check_context_resource_profiles(request_body, request_index, '2.2.1')
+      check_context_resource_profiles(request_body, request_index, '2.2.1', validator:)
     end
 
     # -------------------------------------------------------------------------
     # Context resources profile check (not working in v2.2.1 logical models)
     # -------------------------------------------------------------------------
 
-    def check_logical_model_conformance_no_resource_checks(request_body, request_index, ig_semver)
+    def check_logical_model_conformance_no_resource_checks(request_body, request_index, ig_semver, validator: :default)
       validation_issues = []
       conforms_to_logical_model?(request_body, "#{CRD_CDS_HOOK_REQUEST_MODEL_URL}|#{ig_semver}",
-                                 add_messages_to_runnable: false, validator_response_details: validation_issues)
+                                 add_messages_to_runnable: false, validator_response_details: validation_issues,
+                                 validator:)
 
-      reject_resource_issues(validation_issues).each do |issue|
+      filtered_issues = reject_resource_issues(validation_issues)
+      filter_logical_model_extension_issues(filtered_issues, validator)
+      filtered_issues.each do |issue|
         next if issue.filtered
 
         add_message(issue.severity, "(Request #{request_index + 1}) #{issue.message}")
       end
     end
 
-    def check_context_resource_profiles(request_body, request_index, ig_semver)
+    def check_context_resource_profiles(request_body, request_index, ig_semver, validator: :default)
       case request_body['hook']
       when 'order-sign', 'order-select'
-        draft_orders_conform_to_profiles?(request_body, request_index, ig_semver)
+        draft_orders_conform_to_profiles?(request_body, request_index, ig_semver, validator:)
       when 'order-dispatch'
         request_body.dig('context', 'fulfillmentTasks')&.each_with_index do |task, index|
           resource = FHIR.from_contents(task.to_json)
           resource_is_valid?(resource:, profile_url: "http://hl7.org/fhir/us/davinci-crd/StructureDefinition/profile-task-dispatch|#{ig_semver}",
-                             message_prefix: "(Request #{request_index + 1}) " \
-                                             "context.fulfillmentTasks entry #{index + 1} - ")
+                             validator:, message_prefix: "(Request #{request_index + 1}) " \
+                                                         "context.fulfillmentTasks entry #{index + 1} - ")
         end
       when 'appointment-book'
-        check_appointments_profiles(request_body, request_index, ig_semver)
+        check_appointments_profiles(request_body, request_index, ig_semver, validator:)
       end
     rescue JSON::ParserError
       nil # no resource to validate - error found elsewhere
     end
 
-    def draft_orders_conform_to_profiles?(request_body, request_index, ig_semver)
-      resource = FHIR.from_contents(request_body.dig('context', 'draftOrders')&.to_json)
+    def draft_orders_conform_to_profiles?(request_body, request_index, ig_semver, validator: :default)
+      draft_orders = request_body.dig('context', 'draftOrders').to_json
+      resource = FHIR.from_contents(draft_orders)
       resource_is_valid?(resource:, profile_url: "http://hl7.org/fhir/us/davinci-crd/StructureDefinition/profile-bundle-request|#{ig_semver}",
-                         message_prefix: "(Request #{request_index + 1}) context.draftOrders - ")
+                         message_prefix: "(Request #{request_index + 1}) context.draftOrders - ", validator:)
     end
 
     # -------------------------------------------------------------------------
     # Appointment conformance (requires extra help to decide profile and check profile-based slicing)
     # -------------------------------------------------------------------------
 
-    def check_appointments_profiles(request_body, request_index, ig_semver)
+    def check_appointments_profiles(request_body, request_index, ig_semver, validator: :default)
       resource = FHIR.from_contents(request_body.dig('context', 'appointments')&.to_json)
       return unless resource.is_a?(FHIR::Bundle)
 
       check_bundle_non_entry_resource_conformance(resource,
                                                   "(Request #{request_index + 1}) context.appointments - ",
-                                                  ig_semver)
+                                                  ig_semver,
+                                                  validator:)
 
       resource.entry.each_with_index do |entry, entry_index|
         next unless entry.resource.present? # error caught on Bundle validation
 
         error_prefix = "(Request #{request_index + 1}) context.appointments entry #{entry_index + 1} - "
-        check_appointment_conformance(entry.resource, request_body, error_prefix, ig_semver)
+        check_appointment_conformance(entry.resource, request_body, error_prefix, ig_semver, validator:)
       end
     end
 
-    def check_bundle_non_entry_resource_conformance(bundle, error_prefix, ig_semver)
+    def check_bundle_non_entry_resource_conformance(bundle, error_prefix, ig_semver, validator: :default)
       validation_issues = []
       resource_is_valid?(resource: bundle, profile_url: "http://hl7.org/fhir/us/davinci-crd/StructureDefinition/profile-bundle-base|#{ig_semver}",
-                         add_messages_to_runnable: false, validator_response_details: validation_issues)
+                         add_messages_to_runnable: false, validator_response_details: validation_issues, validator:)
 
       reject_entry_resource_issues(validation_issues).each do |issue|
         add_message(issue.severity, "#{error_prefix}#{issue.message}")