inferno_core 0.4.22 → 0.4.23

data/lib/inferno/dsl/resume_test_route.rb

@@ -23,6 +23,11 @@ module Inferno
         self.class.singleton_class.instance_variable_get(:@test_run_identifier_block)
       end
 
+      # @private
+      def tags
+        self.class.singleton_class.instance_variable_get(:@tags)
+      end
+
       # @private
       def find_test_run(test_run_identifier)
         test_runs_repo.find_latest_waiting_by_identifier(test_run_identifier)
@@ -44,7 +49,8 @@ module Inferno
           request.to_hash.merge(
             test_session_id: test_run.test_session_id,
             result_id: waiting_result.id,
-            name: test.config.request_name(test.incoming_request_name)
+            name: test.config.request_name(test.incoming_request_name),
+            tags:
           )
         )
       end

data/lib/inferno/dsl/runnable.rb

@@ -318,7 +318,7 @@ module Inferno
       #
       # @see Inferno::DSL::Results#wait
       # @example
-      #   resume_test_route :get, '/launch' do
+      #   resume_test_route :get, '/launch', tags: ['launch'] do
       #     request.query_parameters['iss']
       #   end
       #
@@ -341,15 +341,17 @@ module Inferno
       #   [Any of the path options available in Hanami
       #   Router](https://github.com/hanami/router/tree/f41001d4c3ee9e2d2c7bb142f74b43f8e1d3a265#a-beautiful-dsl)
       #   can be used here.
+      # @param tags [Array<String>] a list of tags to assign to the request
       # @yield This method takes a block which must return the identifier
       #   defined when a test was set to wait for the test run that hit this
       #   route. The block has access to the `request` method which returns a
       #   {Inferno::Entities::Request} object with the information for the
       #   incoming request.
       # @return [void]
-      def resume_test_route(method, path, &block)
+      def resume_test_route(method, path, tags: [], &block)
         route_class = Class.new(ResumeTestRoute) do |klass|
           klass.singleton_class.instance_variable_set(:@test_run_identifier_block, block)
+          klass.singleton_class.instance_variable_set(:@tags, tags)
         end
 
         route(method, path, route_class)

data/lib/inferno/dsl.rb

@@ -1,6 +1,7 @@
 require_relative 'dsl/assertions'
 require_relative 'dsl/fhir_client'
 require_relative 'dsl/fhir_validation'
+require_relative 'dsl/fhir_resource_validation'
 require_relative 'dsl/http_client'
 require_relative 'dsl/results'
 require_relative 'dsl/runnable'
@@ -13,7 +14,8 @@ module Inferno
       FHIRClient,
       HTTPClient,
       Results,
-      FHIRValidation
+      FHIRValidation,
+      FHIRResourceValidation
     ].freeze
 
     EXTENDABLE_DSL_MODULES = [

data/lib/inferno/entities/request.rb

@@ -34,7 +34,7 @@ module Inferno
       ATTRIBUTES = [
         :id, :index, :verb, :url, :direction, :name, :status,
         :request_body, :response_body, :result_id, :test_session_id, :created_at,
-        :updated_at, :headers
+        :updated_at, :headers, :tags
       ].freeze
       SUMMARY_FIELDS = [
         :id, :index, :url, :verb, :direction, :name, :status, :result_id, :created_at, :updated_at
@@ -48,6 +48,18 @@ module Inferno
 
         @name = params[:name]&.to_sym
         @headers = params[:headers]&.map { |header| header.is_a?(Hash) ? Header.new(header) : header } || []
+        format_tags(params[:tags] || [])
+      end
+
+      def format_tags(raw_tags)
+        @tags = raw_tags.map do |tag|
+          case tag
+          when Hash
+            tag[:name]
+          when String
+            tag
+          end
+        end
       end
 
       # @return [Hash<String, String>]
@@ -124,6 +136,7 @@ module Inferno
           test_session_id:,
           request_headers: request_headers.map(&:to_hash),
           response_headers: response_headers.map(&:to_hash),
+          tags:,
           created_at:,
           updated_at:
         }.compact
@@ -138,7 +151,7 @@ module Inferno
 
       class << self
         # @private
-        def from_hanami_request(request, name: nil)
+        def from_hanami_request(request, name: nil, tags: [])
           url = "#{request.base_url}#{request.path}"
           url += "?#{request.query_string}" if request.query_string.present?
           request_headers =
@@ -153,12 +166,13 @@ module Inferno
             direction: 'incoming',
             name:,
             request_body: request.body.string,
-            headers: request_headers
+            headers: request_headers,
+            tags:
           )
         end
 
         # @private
-        def from_http_response(response, test_session_id:, direction: 'outgoing', name: nil)
+        def from_http_response(response, test_session_id:, direction: 'outgoing', name: nil, tags: [])
           request_headers =
             response.env.request_headers
               .map { |header_name, value| Header.new(name: header_name.downcase, value:, type: 'request') }
@@ -175,12 +189,13 @@ module Inferno
             request_body: response.env.request_body,
             response_body: response.body,
             test_session_id:,
-            headers: request_headers + response_headers
+            headers: request_headers + response_headers,
+            tags:
           )
         end
 
         # @private
-        def from_fhir_client_reply(reply, test_session_id:, direction: 'outgoing', name: nil)
+        def from_fhir_client_reply(reply, test_session_id:, direction: 'outgoing', name: nil, tags: [])
           request = reply.request
           response = reply.response
           request_headers = request[:headers]
@@ -203,7 +218,8 @@ module Inferno
             request_body:,
             response_body: response[:body],
             test_session_id:,
-            headers: request_headers + response_headers
+            headers: request_headers + response_headers,
+            tags:
           )
         end
       end

data/lib/inferno/entities/test_suite.rb

@@ -13,6 +13,7 @@ module Inferno
       extend DSL::FHIRClient::ClassMethods
       extend DSL::HTTPClient::ClassMethods
       include DSL::FHIRValidation
+      include DSL::FHIRResourceValidation
 
       class << self
         extend Forwardable

data/lib/inferno/jobs/invoke_validator_session.rb

@@ -0,0 +1,23 @@
+module Inferno
+  module Jobs
+    class InvokeValidatorSession
+      include Sidekiq::Worker
+
+      def perform(suite_id, validator_name, validator_index)
+        suite = Inferno::Repositories::TestSuites.new.find suite_id
+        validator = suite.fhir_validators[validator_name.to_sym][validator_index]
+
+        response_body = validator.validate(FHIR::Patient.new, 'http://hl7.org/fhir/StructureDefinition/Patient')
+
+        if response_body.start_with? '{'
+          res = JSON.parse(response_body)
+          session_id = res['sessionId']
+          # TODO: (FI-2311) store this session ID so it can be referenced as needed
+          validator.session_id = session_id
+        else
+          Inferno::Application['logger'].error("InvokeValidatorSession - error from validator: #{response_body}")
+        end
+      end
+    end
+  end
+end

data/lib/inferno/jobs.rb

@@ -2,6 +2,7 @@ require 'sidekiq'
 
 require_relative 'jobs/execute_test_run'
 require_relative 'jobs/resume_test_run'
+require_relative 'jobs/invoke_validator_session'
 
 module Inferno
   module Jobs