linting

inferno-framework · Feb 26, 2024 · 1204d22 · 1204d22
1 parent 88ee9d4
commit 1204d22
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 15 deletions.
diff --git a/lib/inferno/db/migrations/010_add_validator_sessions.rb b/lib/inferno/db/migrations/010_add_validator_sessions.rb
@@ -2,7 +2,7 @@
   change do
     create_table :validator_sessions do
       column :id, String, primary_key: true, null: false, size: 36
-      column :validator_session_id,  String, null: false, size: 255#, unique: true
+      column :validator_session_id,  String, null: false, size: 255 # , unique: true
       column :test_suite_id, String, null: false, size: 255
       column :validator_name, String, null: false, size: 255
       column :suite_options, String, text: true

diff --git a/lib/inferno/dsl/fhir_resource_validation.rb b/lib/inferno/dsl/fhir_resource_validation.rb
@@ -284,7 +284,6 @@ def operation_outcome_from_hl7_wrapped_response(response)
                                         validator_name: name.to_s, suite_options: requirements)
             @session_id = res['sessionId']
           end
-
 
           # assume for now that one resource -> one request
           issues = res['outcomes'][0]['issues']&.map do |i|

diff --git a/lib/inferno/repositories/validator_sessions.rb b/lib/inferno/repositories/validator_sessions.rb
@@ -20,14 +20,13 @@ def save(params)
 
         db.insert_conflict(
           target: [:test_suite_id,
-                  :suite_options,
-                  :validator_name],
+                   :suite_options,
+                   :validator_name],
           update: { validator_session_id:,
                     test_suite_id:,
                     suite_options:,
-                    validator_name: 
-                    }
-          ).insert(
+                    validator_name: }
+        ).insert(
           id: "#{validator_session_id}_#{validator_name}",
           validator_session_id:,
           test_suite_id:,
@@ -42,6 +41,7 @@ def find_validator_session_id(test_suite_id, validator_name, suite_options)
         session = self.class::Model
           .find(test_suite_id:, validator_name:, suite_options:)
         return nil if session.nil?
+
         time = Time.now
         session.update(last_accessed: time)
         session[:validator_session_id]

diff --git a/spec/inferno/repositories/validator_sessions_spec.rb b/spec/inferno/repositories/validator_sessions_spec.rb
@@ -5,9 +5,9 @@
   let(:validator_session_id1) { 'basic_validator1' }
   let(:validator_session_id2) { 'basic_validator2' }
   let(:validator_session_id3) { 'basic_validator3' }
-  let(:suite_options1) { {:ig_version => '1', :us_core_version => '4'} }
-  let(:suite_options2) { {:ig_version => '2'} }
-  let(:suite_options_alt) { {:us_core_version => '4', :ig_version => '1'} }
+  let(:suite_options1) { { ig_version: '1', us_core_version: '4' } }
+  let(:suite_options2) { { ig_version: '2' } }
+  let(:suite_options_alt) { { us_core_version: '4', ig_version: '1' } }
   let(:session1_params) do
     {
       validator_session_id: validator_session_id1,
@@ -32,7 +32,7 @@
       suite_options: suite_options1
     }
   end
-  let(:session_params_alt_1) do
+  let(:session_params_alt1) do
     {
       validator_session_id: validator_session_id2,
       validator_name:,
@@ -117,12 +117,13 @@
     end
 
     it 'updated validator session id, when reverse order suite options cause overwrite' do
-      repo.save(session_params_alt_1)
+      repo.save(session_params_alt1)
       record = repo.db.first
       validator_id = repo.find_validator_session_id(session1_params[:test_suite_id],
                                                     session1_params[:validator_name], session1_params[:suite_options])
-      validator_id_alt = repo.find_validator_session_id(session_params_alt_1[:test_suite_id],
-                                                     session_params_alt_1[:validator_name], session_params_alt_1[:suite_options])
+      validator_id_alt = repo.find_validator_session_id(session_params_alt1[:test_suite_id],
+                                                        session_params_alt1[:validator_name],
+                                                        session_params_alt1[:suite_options])
       expect(validator_session_id2).to eq(validator_id)
       expect(validator_session_id2).to eq(validator_id_alt)
       expect(validator_session_id2).to eq(record[:validator_session_id])
@@ -135,7 +136,7 @@
       validator_id = repo.find_validator_session_id(session1_params[:test_suite_id],
                                                     session1_params[:validator_name], session1_params[:suite_options])
       validator_id4 = repo.find_validator_session_id(session4_params[:test_suite_id],
-                                                    session4_params[:validator_name], session4_params[:suite_options])
+                                                     session4_params[:validator_name], session4_params[:suite_options])
       expect(record[:validator_session_id]).to eq(validator_id)
       expect(record4[:validator_session_id]).to eq(validator_id4)
     end