qa_server 7.2.0 → 7.5.1

data/app/prepends/prepended_linked_data/search_query.rb

@@ -17,46 +17,46 @@ module PrependedLinkedData::SearchQuery
     requested_results(full_results)
   end
 
-  private
-
-    def setup_search(request_header: {}, language: nil, replacements: {}, subauth: nil, context: false, performance_data: false) # rubocop:disable Metrics/ParameterLists
-      QaServer.log_agent_info(request_header[:request])
-      @start_time_s = QaServer::TimeService.current_time_s
-      request_header = build_request_header(language: language, replacements: replacements, subauth: subauth, context: context, performance_data: performance_data) if request_header.empty?
-      @saved_performance_data = performance_data || request_header[:performance_data]
-      request_header[:performance_data] = true
-      request_header
-    end
+private
+
+  def setup_search(request_header: {}, language: nil, replacements: {}, subauth: nil, context: false, performance_data: false) # rubocop:disable Metrics/ParameterLists
+    QaServer.log_agent_info(request_header[:request])
+    @start_time_s = QaServer::TimeService.current_time_s
+    request_header = build_request_header(language: language, replacements: replacements, subauth: subauth, context: context, performance_data: performance_data) if request_header.empty?
+    @saved_performance_data = performance_data || request_header[:performance_data]
+    request_header[:performance_data] = true
+    request_header
+  end
 
-    def update_performance_history_record(full_results)
-      return QaServer.config.performance_cache.destroy(@phid) unless full_results.is_a?(Hash) && full_results.key?(:performance)
-      updates = { action_time_ms: (QaServer::TimeService.current_time_s - @start_time_s) * 1000,
-                  size_bytes: full_results[:performance][:fetched_bytes],
-                  retrieve_plus_graph_load_time_ms: full_results[:performance][:fetch_time_s] * 1000,
-                  normalization_time_ms: full_results[:performance][:normalization_time_s] * 1000 }
-      QaServer.config.performance_cache.update(id: @phid, updates: updates)
-      QaServer.config.performance_cache.complete_entry(id: @phid)
-    end
+  def update_performance_history_record(full_results)
+    return QaServer.config.performance_cache.destroy(@phid) unless full_results.is_a?(Hash) && full_results.key?(:performance)
+    updates = { action_time_ms: (QaServer::TimeService.current_time_s - @start_time_s) * 1000,
+                size_bytes: full_results[:performance][:fetched_bytes],
+                retrieve_plus_graph_load_time_ms: full_results[:performance][:fetch_time_s] * 1000,
+                normalization_time_ms: full_results[:performance][:normalization_time_s] * 1000 }
+    QaServer.config.performance_cache.update(id: @phid, updates: updates)
+    QaServer.config.performance_cache.complete_entry(id: @phid)
+  end
 
-    # Override to append performance history record id into the URL to allow access to the record in RDF::Graph
-    def load_graph(url:)
-      return super if QaServer.config.suppress_performance_gathering?
+  # Override to append performance history record id into the URL to allow access to the record in RDF::Graph
+  def load_graph(url:)
+    return super if QaServer.config.suppress_performance_gathering?
 
-      access_start_dt = QaServer::TimeService.current_time
+    access_start_dt = QaServer::TimeService.current_time
 
-      url += "&phid=#{@phid}"
-      @full_graph = graph_service.load_graph(url: url)
+    url += "&phid=#{@phid}"
+    @full_graph = graph_service.load_graph(url: url)
 
-      access_end_dt = QaServer::TimeService.current_time
-      @access_time_s = access_end_dt - access_start_dt
-      @fetched_size = full_graph.triples.to_s.size if performance_data?
-      Rails.logger.info("Time to receive data from authority: #{access_time_s}s")
-    end
+    access_end_dt = QaServer::TimeService.current_time
+    @access_time_s = access_end_dt - access_start_dt
+    @fetched_size = full_graph.triples.to_s.size if performance_data?
+    Rails.logger.info("Time to receive data from authority: #{access_time_s}s")
+  end
 
-    def requested_results(full_results)
-      return full_results if @saved_performance_data
-      return full_results[:results] unless full_results.key? :response_header
-      full_results.delete(:performance)
-      full_results
-    end
+  def requested_results(full_results)
+    return full_results if @saved_performance_data
+    return full_results[:results] unless full_results.key? :response_header
+    full_results.delete(:performance)
+    full_results
+  end
 end

data/app/prepends/prepended_rdf/rdf_graph.rb

@@ -46,12 +46,12 @@ module PrependedRdf::RdfGraph
     QaServer.config.performance_tracker.write "#{format('%.6f', end_time_s - start_time_s)}, " # load graph
   end
 
-  private
+private
 
-    def parse_phid(url)
-      i = url.rindex('&phid=')
-      phid = url[(i + 6)..url.length]
-      adjusted_url = url[0..(i - 1)]
-      [phid, adjusted_url]
-    end
+  def parse_phid(url)
+    i = url.rindex('&phid=')
+    phid = url[(i + 6)..url.length]
+    adjusted_url = url[0..(i - 1)]
+    [phid, adjusted_url]
+  end
 end

data/app/presenters/concerns/qa_server/monitor_status/performance_datatable_behavior.rb

@@ -116,44 +116,44 @@ module QaServer::MonitorStatus
       QaServer::TimeService.pretty_date(performance_data_end_dt)
     end
 
-    private
+  private
 
-      def expected_time_period
-        QaServer.config.performance_datatable_default_time_period
-      end
+    def expected_time_period
+      QaServer.config.performance_datatable_default_time_period
+    end
 
-      def data_table_for(authority_data, action)
-        authority_data[action]
-      end
+    def data_table_for(authority_data, action)
+      authority_data[action]
+    end
 
-      def unsupported_action?(stats)
-        values = stats.values
-        return true if values.all?(&:zero?)
-        values.any? { |v| v.respond_to?(:nan?) && v.nan? }
-      end
+    def unsupported_action?(stats)
+      values = stats.values
+      return true if values.all?(&:zero?)
+      values.any? { |v| v.respond_to?(:nan?) && v.nan? }
+    end
 
-      def format_stat(stats, idx)
-        return '' if stats[idx].nil? || unsupported_action?(stats)
-        format("%0.1f", stats[idx])
-      end
+    def format_stat(stats, idx)
+      return '' if stats[idx].nil? || unsupported_action?(stats)
+      format("%0.1f", stats[idx])
+    end
 
-      def performance_style_class(stats, stat_key)
-        return "status-not-supported" if unsupported_action?(stats)
-        return "status-bad" if max_threshold_exceeded(stats, stat_key)
-        return "status-unknown" if desired_threshold_not_met(stats, stat_key)
-        "status-good"
-      end
+    def performance_style_class(stats, stat_key)
+      return "status-not-supported" if unsupported_action?(stats)
+      return "status-bad" if max_threshold_exceeded(stats, stat_key)
+      return "status-unknown" if desired_threshold_not_met(stats, stat_key)
+      "status-good"
+    end
 
-      def max_threshold_exceeded(stats, stat_key)
-        return false if stats[stat_key].nil?
-        return true if stats[stat_key] > QaServer.config.performance_datatable_max_threshold
-        false
-      end
+    def max_threshold_exceeded(stats, stat_key)
+      return false if stats[stat_key].nil?
+      return true if stats[stat_key] > QaServer.config.performance_datatable_max_threshold
+      false
+    end
 
-      def desired_threshold_not_met(stats, stat_key)
-        return false if stats[stat_key].nil?
-        return true unless stats[stat_key] < QaServer.config.performance_datatable_warning_threshold
-        false
-      end
+    def desired_threshold_not_met(stats, stat_key)
+      return false if stats[stat_key].nil?
+      return true unless stats[stat_key] < QaServer.config.performance_datatable_warning_threshold
+      false
+    end
   end
 end

data/app/presenters/concerns/qa_server/monitor_status/performance_graph_behavior.rb

@@ -83,73 +83,73 @@ module QaServer::MonitorStatus
       false
     end
 
-    private
-
-      def default_graph?(graph_info) # rubocop:disable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
-        return false unless performance_all_actions_graph?(graph_info)
-        return true if QaServer.config.performance_graph_default_time_period == :day && performance_day_graph?(graph_info)
-        return true if QaServer.config.performance_graph_default_time_period == :month && performance_month_graph?(graph_info)
-        return true if QaServer.config.performance_graph_default_time_period == :year && performance_year_graph?(graph_info)
-        false
-      end
-
-      def performance_graphs_for_authority(graphs, auth_name)
-        [:search, :fetch, :all_actions].each do |action|
-          day_graph = performance_for_day_graph(auth_name, action)
-          month_graph = performance_for_month_graph(auth_name, action)
-          year_graph = performance_for_year_graph(auth_name, action)
-          add_graphs(graphs, day_graph, month_graph, year_graph)
-        end
-      end
+  private
 
-      # only add the graphs if all 3 exist
-      def add_graphs(graphs, day_graph, month_graph, year_graph)
-        return unless day_graph[:exists] && month_graph[:exists] && year_graph[:exists]
-        graphs << day_graph
-        graphs << month_graph
-        graphs << year_graph
-      end
-
-      def performance_for_day_graph(auth_name, action)
-        filepath = QaServer::PerformanceGraphingService.performance_graph_image_path(authority_name: auth_name, action: action, time_period: :day)
-        exists = QaServer::PerformanceGraphingService.performance_graph_image_exists?(authority_name: auth_name, action: action, time_period: :day)
-        {
-          action: action,
-          time_period: :day,
-          graph: filepath,
-          exists: exists,
-          label: "Performance data for the last 24 hours.",
-          authority_name: auth_name,
-          base_id: "performance-of-#{auth_name}"
-        }
-      end
+    def default_graph?(graph_info) # rubocop:disable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
+      return false unless performance_all_actions_graph?(graph_info)
+      return true if QaServer.config.performance_graph_default_time_period == :day && performance_day_graph?(graph_info)
+      return true if QaServer.config.performance_graph_default_time_period == :month && performance_month_graph?(graph_info)
+      return true if QaServer.config.performance_graph_default_time_period == :year && performance_year_graph?(graph_info)
+      false
+    end
 
-      def performance_for_month_graph(auth_name, action)
-        filepath = QaServer::PerformanceGraphingService.performance_graph_image_path(authority_name: auth_name, action: action, time_period: :month)
-        exists = QaServer::PerformanceGraphingService.performance_graph_image_exists?(authority_name: auth_name, action: action, time_period: :month)
-        {
-          action: action,
-          time_period: :month,
-          graph: filepath,
-          exists: exists,
-          label: "Performance data for the last 30 days.",
-          authority_name: auth_name,
-          base_id: "performance-of-#{auth_name}"
-        }
+    def performance_graphs_for_authority(graphs, auth_name)
+      [:search, :fetch, :all_actions].each do |action|
+        day_graph = performance_for_day_graph(auth_name, action)
+        month_graph = performance_for_month_graph(auth_name, action)
+        year_graph = performance_for_year_graph(auth_name, action)
+        add_graphs(graphs, day_graph, month_graph, year_graph)
       end
+    end
 
-      def performance_for_year_graph(auth_name, action)
-        filepath = QaServer::PerformanceGraphingService.performance_graph_image_path(authority_name: auth_name, action: action, time_period: :year)
-        exists = QaServer::PerformanceGraphingService.performance_graph_image_exists?(authority_name: auth_name, action: action, time_period: :year)
-        {
-          action: action,
-          time_period: :year,
-          graph: filepath,
-          exists: exists,
-          label: "Performance data for the last 12 months.",
-          authority_name: auth_name,
-          base_id: "performance-of-#{auth_name}"
-        }
-      end
+    # only add the graphs if all 3 exist
+    def add_graphs(graphs, day_graph, month_graph, year_graph)
+      return unless day_graph[:exists] && month_graph[:exists] && year_graph[:exists]
+      graphs << day_graph
+      graphs << month_graph
+      graphs << year_graph
+    end
+
+    def performance_for_day_graph(auth_name, action)
+      filepath = QaServer::PerformanceGraphingService.performance_graph_image_path(authority_name: auth_name, action: action, time_period: :day)
+      exists = QaServer::PerformanceGraphingService.performance_graph_image_exists?(authority_name: auth_name, action: action, time_period: :day)
+      {
+        action: action,
+        time_period: :day,
+        graph: filepath,
+        exists: exists,
+        label: "Performance data for the last 24 hours.",
+        authority_name: auth_name,
+        base_id: "performance-of-#{auth_name}"
+      }
+    end
+
+    def performance_for_month_graph(auth_name, action)
+      filepath = QaServer::PerformanceGraphingService.performance_graph_image_path(authority_name: auth_name, action: action, time_period: :month)
+      exists = QaServer::PerformanceGraphingService.performance_graph_image_exists?(authority_name: auth_name, action: action, time_period: :month)
+      {
+        action: action,
+        time_period: :month,
+        graph: filepath,
+        exists: exists,
+        label: "Performance data for the last 30 days.",
+        authority_name: auth_name,
+        base_id: "performance-of-#{auth_name}"
+      }
+    end
+
+    def performance_for_year_graph(auth_name, action)
+      filepath = QaServer::PerformanceGraphingService.performance_graph_image_path(authority_name: auth_name, action: action, time_period: :year)
+      exists = QaServer::PerformanceGraphingService.performance_graph_image_exists?(authority_name: auth_name, action: action, time_period: :year)
+      {
+        action: action,
+        time_period: :year,
+        graph: filepath,
+        exists: exists,
+        label: "Performance data for the last 12 months.",
+        authority_name: auth_name,
+        base_id: "performance-of-#{auth_name}"
+      }
+    end
   end
 end

data/app/presenters/qa_server/check_status_presenter.rb

@@ -4,10 +4,11 @@ module QaServer
   class CheckStatusPresenter
     # @param authorities_list [Array<String>] a list of all loaded authorities' names
     # @param status_data [Array<Hash>] a list of status data for each scenario tested
-    def initialize(authorities_list:, connection_status_data:, accuracy_status_data:)
+    def initialize(authorities_list:, connection_status_data:, accuracy_status_data:, comparison_status_data:)
       @authorities_list = authorities_list
       @connection_status_data = connection_status_data
       @accuracy_status_data = accuracy_status_data
+      @comparison_status_data = comparison_status_data
     end
 
     # @return [Array<String>] A list of all loaded authorities' names
@@ -19,10 +20,10 @@ module QaServer
     # @example
     #   [ { status: :PASS,
     #       status_label: '√',
-    #       authority_name: 'LOCNAMES_LD4L_CACHE',
-    #       subauthority_name: 'person',
     #       service: 'ld4l_cache',
     #       action: 'search',
+    #       authority_name: 'LOCNAMES_LD4L_CACHE',
+    #       subauthority_name: 'person',
     #       url: '/qa/search/linked_data/locnames_ld4l_cache/person?q=mark twain&maxRecords=4',
     #       err_message: '' }, ... ]
     attr_reader :connection_status_data
@@ -33,10 +34,10 @@ module QaServer
     # @example
     #   [ { status: :PASS,
     #       status_label: '√',
-    #       authority_name: 'LOCNAMES_LD4L_CACHE',
-    #       subauthority_name: 'person',
     #       service: 'ld4l_cache',
     #       action: 'search',
+    #       authority_name: 'LOCNAMES_LD4L_CACHE',
+    #       subauthority_name: 'person',
     #       expected: 10,
     #       actual: 8,
     #       url: '/qa/search/linked_data/locnames_ld4l_cache/person?q=mark twain&maxRecords=20',
@@ -44,6 +45,25 @@ module QaServer
     attr_reader :accuracy_status_data
     # rubocop:enable Style/AsciiComments
 
+    # rubocop:disable Style/AsciiComments
+    # @return [Array<Hash>] A list of status data for each comparison of accuracy scenarios tested.
+    # @example
+    #   [ { status: [:PASS, :FAIL],
+    #       status_label: ['√', 'X'],
+    #       service: ['ld4l_cache', 'ld4l_cache'],
+    #       action: 'search',
+    #       authority_name: ['LOCNAMES_LD4L_CACHE', 'LOCNAMES_NEW_LD4L_CACHE']
+    #       subauthority_name: 'imprint',
+    #       request_data: 'Plantin'
+    #       target: 'http://thesaurus.cerl.org/record/cni00007649',
+    #       expected: [1, 1]
+    #       actual: [1, 2]
+    #       url: ['/qa/search/linked_data/cerl_ld4l_cache/imprint?q=Plantin&maxRecords=8',
+    #             '/qa/search/linked_data/cerl_new_ld4l_cache/imprint?q=Plantin&maxRecords=8']
+    #       err_message: ['',''] }, ... ]
+    attr_reader :comparison_status_data
+    # rubocop:enable Style/AsciiComments
+
     # @return [Boolean] true if status data exists; otherwise false
     def connection_status_data?
       @connection_status_data.present?
@@ -54,14 +74,19 @@ module QaServer
       @accuracy_status_data.present?
     end
 
+    # @return [Boolean] true if status data exists; otherwise false
+    def comparison_status_data?
+      @comparison_status_data.present?
+    end
+
     # @return [String] the name of the css style class to use for the status cell based on the status of the scenario test.
     def status_style_class(status)
-      "status-#{status[:status]}"
+      "status-#{status}"
     end
 
     # @return [String] the name of the css style class to use for the status cell based on the status of the scenario test.
     def status_label(status)
-      case status[:status]
+      case status
       when :good
         QaServer::ScenarioRunHistory::GOOD_MARKER
       when :bad
@@ -71,6 +96,17 @@ module QaServer
       end
     end
 
+    def selected_authority
+      return comparison_status_data.first[:authority_name][0].to_sym if comparison_status_data?
+      return connection_status_data.first[:authority_name].to_sym if connection_status_data?
+      return accuracy_status_data.first[:authority_name].to_sym if accuracy_status_data?
+      ""
+    end
+
+    def selected_comparison
+      comparison_status_data? ? comparison_status_data.first[:authority_name][1].to_sym : ""
+    end
+
     def value_all_collections
       QaServer::CheckStatusController::ALL_AUTHORITIES
     end
@@ -87,6 +123,10 @@ module QaServer
       "#{value_check_param}_#{value_check_connections}".downcase.to_sym
     end
 
+    def connection_tests_checked
+      connection_status_data?
+    end
+
     def value_check_accuracy
       QaServer::AuthorityValidationBehavior::VALIDATE_ACCURACY
     end
@@ -95,6 +135,22 @@ module QaServer
       "#{value_check_param}_#{value_check_accuracy}".downcase.to_sym
     end
 
+    def accuracy_tests_checked
+      accuracy_status_data?
+    end
+
+    def value_check_comparison
+      QaServer::AuthorityValidationBehavior::VALIDATE_ACCURACY_COMPARISON
+    end
+
+    def label_check_comparison
+      "#{value_check_param}_#{value_check_comparison}".downcase.to_sym
+    end
+
+    def comparison_tests_checked
+      comparison_status_data?
+    end
+
     def value_all_checks
       QaServer::AuthorityValidationBehavior::ALL_VALIDATIONS
     end