davinci_dtr_test_kit 0.10.0 → 0.11.1

data/lib/davinci_dtr_test_kit/mock_ehr.rb

@@ -1,11 +1,13 @@
 # frozen_string_literal: true
 
+require_relative 'urls'
+
 module DaVinciDTRTestKit
   module MockEHR
     RESOURCE_SERVER_BASE = ENV.fetch('FHIR_REFERENCE_SERVER')
     RESOURCE_SERVER_BEARER_TOKEN = 'SAMPLE_TOKEN'
 
-    RESPONSE_HEADERS = { 'Content-Type': 'application/json', 'Access-Control-Allow-Origin': '*' }.freeze
+    RESPONSE_HEADERS = { 'Content-Type' => 'application/json', 'Access-Control-Allow-Origin' => '*' }.freeze
 
     def resource_server_client
       return @resource_server_client if @resource_server_client
@@ -18,13 +20,13 @@ module DaVinciDTRTestKit
     def metadata_handler(_env)
       cs = resource_server_client.capability_statement
       if cs.present?
-        [200, { 'Content-Type' => 'application/json', 'Access-Control-Allow-Origin' => '*' }, [cs.to_json]]
+        [200, RESPONSE_HEADERS, [cs.to_json]]
       else
         [500, {}, ['Unexpected error occurred while fetching metadata']]
       end
     end
 
-    def get_fhir_resource(request, _test = nil, _test_result = nil)
+    def get_fhir_resource(request, _test = nil, test_result = nil)
       resource_type, id = resource_type_and_id_from_url(request.url)
       request.response_headers = RESPONSE_HEADERS
 
@@ -34,15 +36,7 @@ module DaVinciDTRTestKit
         resource_type = nil
       end
 
-      if resource_type.present?
-        response = if id.present?
-                     resource_server_client.read(fhir_class, id)
-                   else
-                     resource_server_client.search(fhir_class, search: { parameters: request.query_parameters })
-                   end
-        request.status = response.code
-        request.response_body = response.body
-      else
+      if resource_type.blank?
         request.status = 400
         request.response_headers = { 'Content-Type': 'application/json' }
         request.response_body = FHIR::OperationOutcome.new(
@@ -51,7 +45,38 @@ module DaVinciDTRTestKit
                                                      text: 'No recognized resource type in URL'
                                                    ))
         ).to_json
+        return
+      end
+
+      # Respond with user-inputted resource if there is one that matches the request
+      begin
+        ehr_bundle_input = JSON.parse(test_result.input_json).find { |input| input['name'] == 'ehr_bundle' }
+        ehr_bundle_input_value = ehr_bundle_input_value = ehr_bundle_input['value'] if ehr_bundle_input.present?
+        ehr_bundle = FHIR.from_contents(ehr_bundle_input_value) if ehr_bundle_input_value.present?
+      rescue StandardError
+        ehr_bundle = nil
+      end
+
+      if id.present? && ehr_bundle.present? && ehr_bundle.is_a?(FHIR::Bundle)
+        matching_resource = ehr_bundle.entry&.find do |entry|
+          entry.resource.is_a?(fhir_class) && entry.resource&.id == id
+        end&.resource
+        if matching_resource.present?
+          request.status = 200
+          request.response_headers = { 'Content-Type': 'application/json' }
+          request.response_body = matching_resource.to_json
+          return
+        end
       end
+
+      # Proxy resource request to the reference server
+      response = if id.present?
+                   resource_server_client.read(fhir_class, id)
+                 else
+                   resource_server_client.search(fhir_class, search: { parameters: request.query_parameters })
+                 end
+      request.status = response.code
+      request.response_body = response.body
     end
 
     def questionnaire_response_response(request, _test = nil, _test_result = nil)

data/lib/davinci_dtr_test_kit/mock_payer.rb

@@ -6,13 +6,7 @@ module DaVinciDTRTestKit
   module MockPayer
     include Fixtures
 
-    RESPONSE_HEADERS = { 'Content-Type': 'application/json', 'Access-Control-Allow-Origin': '*' }.freeze
-
-    def token_response(request, _test = nil, _test_result = nil)
-      # Placeholder for a more complete mock token endpoint
-      request.response_body = { access_token: SecureRandom.hex, token_type: 'bearer', expires_in: 300 }.to_json
-      request.status = 200
-    end
+    RESPONSE_HEADERS = { 'Content-Type' => 'application/json', 'Access-Control-Allow-Origin' => '*' }.freeze
 
     def questionnaire_package_response(request, _test = nil, test_result = nil)
       request.status = 200
@@ -47,19 +41,6 @@ module DaVinciDTRTestKit
       request.response_body = payer_response.response[:body]
     end
 
-    def extract_client_id(request)
-      URI.decode_www_form(request.request_body).to_h['client_id']
-    end
-
-    # Header expected to be a bearer token of the form "Bearer: <token>"
-    def extract_bearer_token(request)
-      request.request_header('Authorization')&.value&.split&.last
-    end
-
-    def extract_token_from_query_params(request)
-      request.query_parameters['token']
-    end
-
     def test_resumes?(test)
       !test.config.options[:accepts_multiple_requests]
     end

data/lib/davinci_dtr_test_kit/payer_server_groups/static_form_request_validation_test.rb

@@ -37,6 +37,7 @@ module DaVinciDTRTestKit
       else
         # TODO: fix redundant logic here
         skip_if initial_static_questionnaire_request.nil?, 'No request resource was provided - required for manual flow'
+        assert_valid_json(initial_static_questionnaire_request)
         request = FHIR.from_contents(initial_static_questionnaire_request)
         assert assert_valid_resource(resource: request, profile_url: 'http://hl7.org/fhir/us/davinci-dtr/StructureDefinition/dtr-qpackage-input-parameters')
       end

data/lib/davinci_dtr_test_kit/payer_server_groups/static_form_response_validation_test.rb

@@ -36,6 +36,7 @@ module DaVinciDTRTestKit
         request = fhir_operation("#{url}/Questionnaire/$questionnaire-package",
                                  body: JSON.parse(initial_static_questionnaire_request),
                                  headers: { 'Content-Type': 'application/json' })
+        assert_valid_json(request.response[:body])
         resource = FHIR.from_contents(request.response[:body])
         scratch[:output_parameters] = resource
         assert_response_status([200, 201], response: request.response)

data/lib/davinci_dtr_test_kit/urls.rb

@@ -1,7 +1,10 @@
 # frozen_string_literal: true
 
 module DaVinciDTRTestKit
-  TOKEN_PATH = '/mock_auth/token'
+  SMART_CONFIG_PATH = '/fhir/.well-known/smart-configuration'
+  EHR_AUTHORIZE_PATH = '/mock_ehr_auth/authorize'
+  EHR_TOKEN_PATH = '/mock_ehr_auth/token'
+  PAYER_TOKEN_PATH = '/mock_payer_auth/token'
   QUESTIONNAIRE_PACKAGE_PATH = '/fhir/Questionnaire/$questionnaire-package'
   NEXT_PATH = '/fhir/Questionnaire/$next-question'
   QUESTIONNAIRE_RESPONSE_PATH = '/fhir/QuestionnaireResponse'
@@ -15,8 +18,16 @@ module DaVinciDTRTestKit
       @base_url ||= "#{Inferno::Application['base_url']}/custom/#{suite_id}"
     end
 
-    def token_url
-      @token_url ||= base_url + TOKEN_PATH
+    def ehr_authorize_url
+      @ehr_authorize_url ||= base_url + EHR_AUTHORIZE_PATH
+    end
+
+    def ehr_token_url
+      @ehr_token_url ||= base_url + EHR_TOKEN_PATH
+    end
+
+    def payer_token_url
+      @payer_token_url ||= base_url + PAYER_TOKEN_PATH
     end
 
     def questionnaire_package_url

data/lib/davinci_dtr_test_kit/validation_test.rb

@@ -60,6 +60,7 @@ module DaVinciDTRTestKit
       omit_if resources.blank?,
               "No #{resource_type} resources provided so the #{profile_url} profile does not apply"
       resources.each_with_index do |resource, index|
+        assert_valid_json(resource.response[:body])
         fhir_resource = FHIR.from_contents(resource.response[:body])
         assert_response_status([200, 202], request: resource, response: resource.response)
         validate_resource(fhir_resource, resource_type, profile_url, index)

data/lib/davinci_dtr_test_kit/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module DaVinciDTRTestKit
-  VERSION = '0.10.0'
+  VERSION = '0.11.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: davinci_dtr_test_kit
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.11.1
 platform: ruby
 authors:
 - Karl Naden
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-07-08 00:00:00.000000000 Z
+date: 2024-07-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: inferno_core
@@ -26,6 +26,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.4.37
+- !ruby/object:Gem::Dependency
+  name: jwt
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.6'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.6'
 description: Test Kit for the Da Vinci Documentation Templates and Rules (DTR) FHIR
   Implementation Guide
 email:
@@ -40,6 +54,7 @@ files:
 - lib/davinci_dtr_test_kit/auth_groups/token_request_test.rb
 - lib/davinci_dtr_test_kit/auth_groups/token_validation_test.rb
 - lib/davinci_dtr_test_kit/client_groups/dinner_adaptive/dtr_smart_app_questionnaire_workflow_group.rb
+- lib/davinci_dtr_test_kit/client_groups/dinner_static/dtr_dinner_questionnaire_package_request_test.rb
 - lib/davinci_dtr_test_kit/client_groups/dinner_static/dtr_questionnaire_response_save_test.rb
 - lib/davinci_dtr_test_kit/client_groups/dinner_static/dtr_smart_app_questionnaire_workflow_group.rb
 - lib/davinci_dtr_test_kit/client_groups/dinner_static/prepopulation_attestation_test.rb
@@ -51,8 +66,8 @@ files:
 - lib/davinci_dtr_test_kit/client_groups/resp_assist_device/dtr_questionnaire_rendering_group.rb
 - lib/davinci_dtr_test_kit/client_groups/resp_assist_device/dtr_questionnaire_response_group.rb
 - lib/davinci_dtr_test_kit/client_groups/resp_assist_device/dtr_questionnaire_response_save_test.rb
+- lib/davinci_dtr_test_kit/client_groups/resp_assist_device/dtr_resp_questionnaire_package_request_test.rb
 - lib/davinci_dtr_test_kit/client_groups/resp_assist_device/dtr_smart_app_questionnaire_workflow_group.rb
-- lib/davinci_dtr_test_kit/client_groups/shared/dtr_questionnaire_package_request_test.rb
 - lib/davinci_dtr_test_kit/client_groups/shared/dtr_questionnaire_package_request_validation_test.rb
 - lib/davinci_dtr_test_kit/client_groups/shared/dtr_questionnaire_response_basic_conformance_test.rb
 - lib/davinci_dtr_test_kit/client_groups/shared/dtr_questionnaire_response_pre_population_test.rb
@@ -77,6 +92,7 @@ files:
 - lib/davinci_dtr_test_kit/fixtures/dinner_static/questionnaire_response_dinner_order_static.json
 - lib/davinci_dtr_test_kit/fixtures/pre_populated_questionnaire_response.json
 - lib/davinci_dtr_test_kit/fixtures/questionnaire_package.json
+- lib/davinci_dtr_test_kit/mock_auth_server.rb
 - lib/davinci_dtr_test_kit/mock_ehr.rb
 - lib/davinci_dtr_test_kit/mock_payer.rb
 - lib/davinci_dtr_test_kit/payer_server_groups/adaptive_form_libraries_test.rb

data/lib/davinci_dtr_test_kit/client_groups/shared/dtr_questionnaire_package_request_test.rb

@@ -1,36 +0,0 @@
-require_relative '../../urls'
-
-module DaVinciDTRTestKit
-  class DTRQuestionnairePackageRequestTest < Inferno::Test
-    include URLs
-
-    id :dtr_questionnaire_package_request
-    title 'Invoke the DTR Questionnaire Package operation'
-    description %(
-      Inferno will wait for a DTR questionnaire package request from the client. Upon receipt, Inferno will generate and
-      send a response.
-    )
-    input :access_token
-
-    run do
-      wait(
-        identifier: access_token,
-        message: %(
-          Invoke the DTR Questionnaire Package operation by sending a POST request to
-
-          `#{questionnaire_package_url}`
-
-          A questionnaire package generated by Inferno will be returned.
-
-          Inferno will wait for the client to complete Questionnaire pre-population. The client should make FHIR GET
-          requests using service base path:
-
-          `#{fhir_base_url}`
-
-          When the DTR application has finished loading the Questionnaire,
-          [Click here](#{resume_pass_url}?token=#{access_token}) to continue.
-        )
-      )
-    end
-  end
-end