Merge pull request #1231 from ctti-clinicaltrials/dev

Hot Fix

Author: akabishau

app/models/background_job/db_query.rb

@@ -8,6 +8,10 @@ def process
     begin
       # run the SQL Query
       db = Util::DbManager.new
+      timeout = Support::Setting.playground_query_limit
+      Rails.logger.info("Setting query timeout to #{timeout}ms")
+      
+      db.public_connection.execute("SET statement_timeout = '#{timeout}'")
       @results = db.public_connection.execute(data['query'])
 
       # write out the query result to a csv file
@@ -41,6 +45,13 @@ def process
         completed_at: Time.now,
         url: result.service.send(:object_for, result.key).public_url
       )
+
+    rescue ActiveRecord::QueryCanceled => e
+      update(
+        status: "error", 
+        logs: "Query timeout after #{timeout/1000} seconds: #{e.message}",
+        user_error_message: "Query exceeded maximum execution time of #{timeout/1000} seconds. Please optimize your query."
+      )
 
     # if there is an error in the SQL Query, show the error message
     rescue ActiveRecord::StatementInvalid => e
@@ -50,6 +61,9 @@ def process
     # if the background job status is "error", show the user error message
     rescue StandardError => e
       update(status: "error", logs: e.message, user_error_message: "There was an error, please contact us.")
-    end    
+
+    ensure
+      Rails.logger.info("DB Query job #{id} completed with status: #{status}")
+    end
   end  
 end    

app/models/support/setting.rb

@@ -2,12 +2,22 @@ module Support
   class Setting < ApplicationRecord
     self.table_name = 'support.settings'
 
+    REGISTRY = {
+      export_search_results: false,
+      playground_query_limit: 120_000
+    }.freeze
+
     validates :key, presence: true, uniqueness: true
     validates :value, presence: true
 
     def self.get(key)
       setting = find_by(key: key)
-      setting&.value
+      return setting.value if setting.present?
+      
+      symbolized_key = key.to_sym
+      raise KeyError, "Unknown Setting Key: #{key}" unless REGISTRY.key?(symbolized_key)
+      
+      REGISTRY[symbolized_key]
     end
 
     def self.set(key, value)
@@ -18,8 +28,11 @@ def self.set(key, value)
 
     # helper settings methods
     def self.export_search_results?
-      get('export_search_results').to_s == 'true'
+      get(:export_search_results).to_s == 'true'
+    end
+
+    def self.playground_query_limit
+      get(:playground_query_limit).to_i
     end
-    
   end
 end