inferno_core 0.4.19 → 0.4.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a9b06c0f0ce1702d3ba9662e4762e3174eb22527a19a3eb35a5ec0e01dbf57d3
-  data.tar.gz: 8c019f778c84c0926ef1705e256e0d3b27fd39a2c6af4f32bd8c4d1ad731ff84
+  metadata.gz: 13f75c775423384dd5bf4a2b13081bc05a155155fca9a6bcea1986d2baf09b15
+  data.tar.gz: 7b6c586b121fad54caa57fb5ae8d8c7300467b543ece25c4222c21cc65ac83c7
 SHA512:
-  metadata.gz: 39690b392f9e9997081cc5d58ee93c249a15be3eaeecca3927619f4d116e00cd85cdecc8a91693385420bb7b7bc07398b05b636d9be94713b23ad52c99bc9161
-  data.tar.gz: f2970277134ae396003da04b2ba09c19cd3dc02f70e513cbdbeaf7a7e014561cbf742a95fc8ed40cec034a23723ad54ed823637989628dd0661fc467b49db11a
+  metadata.gz: 7f0ab91414e4554a430972dd25543339cd39245c0d154dcc42d0a623c83b4aeaccf32709d08074abd4dcae07cf3deb75144a2db3cd3af548a37ddc552b0df909
+  data.tar.gz: 2f328c92cb3d66853eccde4aee267be6e8e668b778f75e1d278a3b5d4ba86840e4f0e260fbc5bf941017ee8bde1cd20699a53153cd9e26ee8e9bee8fa730ab7c

data/lib/inferno/dsl/fhir_client.rb

@@ -60,26 +60,64 @@ module Inferno
         @fhir_clients ||= {}
       end
 
+      # Wrapper for checking if parameter contents are primitive
+      #
+      # @param param [FHIR::Parameters::Parameter] Parameter to be checked
+      # @private
+      def primitive_parameter?(param)
+        param_val = param.to_hash.except('name')
+        param_val.any? { |datatype, param_value| FHIR.primitive?(datatype: datatype[5..], value: param_value) }
+      end
+
+      # Converts a list of FHIR Parameters into a query string for GET requests
+      #
+      # @param body [FHIR::Parameters] Must all be primitive if making GET request
+      # @private
+      def body_to_path(body)
+        query_hashes = body.parameter.map do |param|
+          if primitive_parameter?(param)
+            { param.name => param.to_hash.except('name').values[0] }
+          else
+            Inferno::Application[:logger].error "Cannot use GET request with non-primitive datatype #{param.name}"
+            raise ArgumentError, "Cannot use GET request with non-primitive datatype #{param.name}"
+          end
+        end
+        query_hashes.map(&:to_query).join('&')
+      end
+
       # Perform a FHIR operation
       #
       # @note This is a placeholder method until the FHIR::Client supports
-      #   general operations
+      #   general operations.  Note that while both POST and GET methods are allowed,
+      #   GET is only allowed when the operation does not affect the server's state.
+      #   See https://build.fhir.org/operationdefinition-definitions.html#OperationDefinition.affectsState
+      #
+      # @note Currently does not allow for repeated parameters if using GET
       #
       # @param path [String]
-      # @param body [FHIR::Parameters]
+      # @param body [FHIR::Parameters] Must all be primitive if making GET request
       # @param client [Symbol]
       # @param name [Symbol] Name for this request to allow it to be used by
       #   other tests
       # @param headers [Hash] custom headers for this operation
+      # @param operation_method [Symbol] indicates which request type to use for the operation
       # @return [Inferno::Entities::Request]
-      def fhir_operation(path, body: nil, client: :default, name: nil, headers: {})
+      def fhir_operation(path, body: nil, client: :default, name: nil, headers: {}, operation_method: :post)
         store_request_and_refresh_token(fhir_client(client), name) do
           tcp_exception_handler do
             operation_headers = fhir_client(client).fhir_headers
             operation_headers.merge!('Content-Type' => 'application/fhir+json') if body.present?
             operation_headers.merge!(headers) if headers.present?
-
-            fhir_client(client).send(:post, path, body, operation_headers)
+            case operation_method
+            when :post
+              fhir_client(client).send(:post, path, body, operation_headers)
+            when :get
+              path = "#{path}?#{body_to_path(body)}" if body.present?
+              fhir_client(client).send(:get, path, operation_headers)
+            else
+              Inferno::Application[:logger].error "Cannot perform #{operation_method} requests, use GET or POST"
+              raise ArgumentError, "Cannot perform #{operation_method} requests, use GET or POST"
+            end
           end
         end
       end

data/lib/inferno/dsl/fhir_validation.rb

@@ -116,14 +116,22 @@ module Inferno
         def resource_is_valid?(resource, profile_url, runnable)
           profile_url ||= FHIR::Definitions.resource_definition(resource.resourceType).url
 
-          outcome, http_status = validate(resource, profile_url, runnable)
+          begin
+            response = call_validator(resource, profile_url)
+          rescue StandardError => e
+            # This could be a complete failure to connect (validator isn't running)
+            # or a timeout (validator took too long to respond).
+            runnable.add_message('error', e.message)
+            raise Inferno::Exceptions::ErrorInValidatorException, "Unable to connect to validator at #{url}."
+          end
+          outcome = operation_outcome_from_validator_response(response.body, runnable)
 
           message_hashes = message_hashes_from_outcome(outcome, resource, profile_url)
 
           message_hashes
             .each { |message_hash| runnable.add_message(message_hash[:type], message_hash[:message]) }
 
-          unless http_status == 200
+          unless response.status == 200
             raise Inferno::Exceptions::ErrorInValidatorException,
                   'Error occurred in the validator. Review Messages tab or validator service logs for more information.'
           end
@@ -191,21 +199,17 @@ module Inferno
         #
         # @param resource [FHIR::Model]
         # @param profile_url [String]
-        # @param runnable [Inferno::Entities::Test]
-        # @return [[Array(FHIR::OperationOutcome, Number)] the validation response and HTTP status code
-        def validate(resource, profile_url, runnable)
-          begin
-            response = Faraday.new(
-              url,
-              params: { profile: profile_url }
-            ).post('validate', resource.source_contents)
-          rescue StandardError => e
-            runnable.add_message('error', e.message)
-            raise Inferno::Exceptions::ErrorInValidatorException, "Unable to connect to validator at #{url}."
-          end
-          outcome = operation_outcome_from_validator_response(response.body, runnable)
+        # @return [String] the body of the validation response
+        def validate(resource, profile_url)
+          call_validator(resource, profile_url).body
+        end
 
-          [outcome, response.status]
+        # @private
+        def call_validator(resource, profile_url)
+          Faraday.new(
+            url,
+            params: { profile: profile_url }
+          ).post('validate', resource.source_contents)
         end
 
         # @private
@@ -213,7 +217,7 @@ module Inferno
           if response.start_with? '{'
             FHIR::OperationOutcome.new(JSON.parse(response))
           else
-            runnable.add_message('error', "Validator Response: #{response}")
+            runnable.add_message('error', "Validator Response:\n#{response}")
             raise Inferno::Exceptions::ErrorInValidatorException,
                   'Validator response was an unexpected format. '\
                   'Review Messages tab or validator service logs for more information.'

data/lib/inferno/exceptions.rb

@@ -39,11 +39,14 @@ module Inferno
       end
     end
 
+    # ErrorInValidatorException is used when an exception occurred in
+    # calling the validator service, for example a connection timeout
+    # or an unexpected response format.
+    # Note: This class extends TestResultException instead of RuntimeError
+    # to bypass printing the stack trace in the UI, since
+    # the stack trace of this exception is not likely be useful.
+    # Instead the message should point to where in the validator an error occurred.
     class ErrorInValidatorException < TestResultException
-      # This extends TestResultException instead of RuntimeError
-      # to bypass printing the stack trace in the UI.
-      # (The stack trace of this exception may not be useful,
-      # instead the message should point to where in the validator an error occurred)
       def result
         'error'
       end