inferno_core 0.0.8 → 0.1.1

data/lib/inferno/repositories/session_data.rb

@@ -4,22 +4,33 @@ module Inferno
       def save(params)
         name = params[:name].to_s.downcase
         test_session_id = params[:test_session_id]
+
+        value = value_to_persist(params)
+
         db
           .insert_conflict(
             target: :id,
-            update: { value: params[:value] }
+            update: { value: value }
           ).insert(
             id: "#{test_session_id}_#{name}",
             name: name,
-            value: params[:value],
+            value: value,
             test_session_id: test_session_id
           )
       end
 
-      def load(test_session_id:, name:)
-        self.class::Model
-          .find(test_session_id: test_session_id, name: name.to_s.downcase)
-          &.value
+      def load(test_session_id:, name:, type: 'text')
+        raw_value =
+          self.class::Model
+            .find(test_session_id: test_session_id, name: name.to_s.downcase)
+            &.value
+
+        case type.to_s
+        when 'oauth_credentials'
+          DSL::OAuthCredentials.new(JSON.parse(raw_value))
+        else
+          raw_value
+        end
       end
 
       def get_all_from_session(test_session_id)
@@ -39,6 +50,29 @@ module Inferno
         'SessionData'
       end
 
+      def value_to_persist(params)
+        return nil if params[:value].blank?
+
+        case params[:type]&.to_s
+        when 'text', 'textarea', 'radio'
+          params[:value].to_s
+        when 'oauth_credentials'
+          credentials =
+            if params[:value].is_a? String
+              DSL::OAuthCredentials.new(JSON.parse(params[:value]))
+            elsif !params[:value].is_a? DSL::OAuthCredentials
+              raise Exceptions::BadSessionDataType.new(params[:name], DSL::OAuthCredentials, params[:value].class)
+            else
+              params[:value]
+            end
+
+          credentials.name = params[:name]
+          credentials.to_s
+        else
+          raise Exceptions::UnknownSessionDataType, params
+        end
+      end
+
       class Model < Sequel::Model(db)
         many_to_one :test_session, class: 'Inferno::Repositories::TestSessions::Model', key: :test_session_id
       end

data/lib/inferno/result_summarizer.rb

@@ -0,0 +1,40 @@
+module Inferno
+  # @private
+  # This class takes an array of results and determines the overall result. This
+  # is used to determine the result of a TestGroup/TestSuite based on the
+  # results of it's children.
+  class ResultSummarizer
+    attr_reader :results
+
+    def initialize(results)
+      @results = results
+    end
+
+    def summarize
+      prioritized_result_strings.find { |result_string| unique_result_strings.include? result_string }
+    end
+
+    private
+
+    def prioritized_result_strings
+      Entities::Result::RESULT_OPTIONS
+    end
+
+    def required_results
+      @required_results ||= results.select(&:required?)
+    end
+
+    def all_optional_results?
+      required_results.blank?
+    end
+
+    def results_for_summary
+      all_optional_results? ? results : required_results
+    end
+
+    def unique_result_strings
+      @unique_result_strings ||=
+        results_for_summary.map(&:result).uniq
+    end
+  end
+end

data/lib/inferno/spec_support.rb

@@ -1,5 +1,5 @@
 module Inferno
-  # @private
+  # @api private
   # This module provides constants so that unit tests in suite repositories can
   # load the factories defined in inferno.
   module SpecSupport

data/lib/inferno/test_runner.rb

@@ -1,3 +1,4 @@
+require_relative './result_summarizer'
 require_relative './utils/markdown_formatter'
 
 module Inferno
@@ -120,7 +121,9 @@ module Inferno
 
       children = parent.children
       child_results = results_repo.current_results_for_test_session_and_runnables(test_session.id, children)
-      return if children.length != child_results.length
+      required_children = children.select(&:required?)
+      required_results = child_results.select(&:required?)
+      return if required_children.length != required_results.length
 
       old_result = results_repo.current_result_for_test_session(test_session.id, parent.reference_hash)&.result
       new_result = roll_up_result(child_results)
@@ -137,16 +140,21 @@ module Inferno
     def load_inputs(runnable)
       runnable.inputs.each_with_object({}) do |input_identifier, input_hash|
         input_alias = runnable.config.input_name(input_identifier)
-        input_hash[input_identifier] = session_data_repo.load(test_session_id: test_session.id, name: input_alias)
+        input_type = runnable.config.input_type(input_identifier)
+        input_hash[input_identifier] =
+          session_data_repo.load(test_session_id: test_session.id, name: input_alias, type: input_type)
       end
     end
 
     def save_outputs(runnable_instance)
       outputs =
         runnable_instance.outputs_to_persist.map do |output_identifier, value|
+          output_name = runnable_instance.class.config.output_name(output_identifier)
+          output_type = runnable_instance.class.config.output_type(output_identifier)
           {
-            name: runnable_instance.class.config.output_name(output_identifier),
-            value: value
+            name: output_name,
+            type: output_type,
+            value: value.to_s
           }
         end
 
@@ -165,11 +173,7 @@ module Inferno
     end
 
     def roll_up_result(results)
-      result_priority = Entities::Result::RESULT_OPTIONS
-      unique_results = results.map(&:result).uniq
-      result_priority.find do |result|
-        unique_results.include? result
-      end
+      ResultSummarizer.new(results).summarize
     end
   end
 end

data/lib/inferno/version.rb

@@ -1,3 +1,3 @@
 module Inferno
-  VERSION = '0.0.8'.freeze
+  VERSION = '0.1.1'.freeze
 end

data/spec/factories/request.rb

@@ -1,7 +1,7 @@
 FactoryBot.define do
   factory :request, class: 'Inferno::Entities::Request' do
     transient do
-      result
+      result { repo_create(:result, request_count: 0) }
       header_count { 2 }
     end
 

data/spec/factories/result.rb

@@ -2,7 +2,7 @@ FactoryBot.define do
   factory :result, class: 'Inferno::Entities::Result' do
     transient do
       runnable { test_run.runnable.reference_hash }
-      test_run
+      test_run { repo_create(:test_run) }
       test_session { test_run.test_session }
       message_count { 0 }
       request_count { 0 }
@@ -23,7 +23,7 @@ FactoryBot.define do
     before(:create) do |instance, evaluator|
       instance.instance_variable_set(
         :@requests,
-        repo_create_list(:request, evaluator.request_count, result_id: instance.id)
+        build_list(:request, evaluator.request_count, result: instance)
       )
     end
 

data/spec/fixtures/basic_test_group.rb

@@ -2,6 +2,7 @@ module BasicTestSuite
   class AbcGroup < Inferno::Entities::TestGroup
     title 'ABC Group'
 
+    input :input1, :input2
     test 'demo_test' do
       1 + 1
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: inferno_core
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.1.1
 platform: ruby
 authors:
 - Stephen MacVicar
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-10 00:00:00.000000000 Z
+date: 2022-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -502,6 +502,7 @@ files:
 - lib/inferno/db/migrations/003_update_session_data.rb
 - lib/inferno/db/migrations/004_add_request_results_table.rb
 - lib/inferno/db/migrations/005_add_updated_at_index_to_results.rb
+- lib/inferno/db/migrations/006_remove_unused_tables.rb
 - lib/inferno/db/schema.rb
 - lib/inferno/dsl.rb
 - lib/inferno/dsl/assertions.rb
@@ -511,6 +512,7 @@ files:
 - lib/inferno/dsl/fhir_validation.rb
 - lib/inferno/dsl/http_client.rb
 - lib/inferno/dsl/http_client_builder.rb
+- lib/inferno/dsl/oauth_credentials.rb
 - lib/inferno/dsl/request_storage.rb
 - lib/inferno/dsl/results.rb
 - lib/inferno/dsl/resume_test_route.rb
@@ -518,6 +520,7 @@ files:
 - lib/inferno/entities.rb
 - lib/inferno/entities/attributes.rb
 - lib/inferno/entities/entity.rb
+- lib/inferno/entities/has_runnable.rb
 - lib/inferno/entities/header.rb
 - lib/inferno/entities/message.rb
 - lib/inferno/entities/request.rb
@@ -529,6 +532,7 @@ files:
 - lib/inferno/entities/test_session.rb
 - lib/inferno/entities/test_suite.rb
 - lib/inferno/exceptions.rb
+- lib/inferno/ext/fhir_client.rb
 - lib/inferno/jobs.rb
 - lib/inferno/jobs/execute_test_run.rb
 - lib/inferno/jobs/resume_test_run.rb
@@ -554,6 +558,7 @@ files:
 - lib/inferno/repositories/test_suites.rb
 - lib/inferno/repositories/tests.rb
 - lib/inferno/repositories/validate_runnable_reference.rb
+- lib/inferno/result_summarizer.rb
 - lib/inferno/spec_support.rb
 - lib/inferno/test_runner.rb
 - lib/inferno/utils/markdown_formatter.rb