qa_server 7.7.0 → 7.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 57808d7b02e3ca992f1d927f43dd6630025451e6fb6c7cebab7ed2882acd79c9
-  data.tar.gz: 3ab76c0ebda5fd6e1ebe9811ff522bf0a7d13e0461b28a4b7a421ac5bdd66a18
+  metadata.gz: 72d52211139ad972c160f1f7f320290945c9d1424d830897cf45d6b034077c8a
+  data.tar.gz: 33cb9b58a7db3c21f1a92f500981f2dcdce05e6e4dbac8cacc6cd1ee68109c14
 SHA512:
-  metadata.gz: 77d4103d2ff49636bf353f8d5ca93019fb2f477c90ff62e9f94832d9d7f387ed3be3f1577692025863882c53bbc38ae2020a1435a6d84379e73d1bee4bb06714
-  data.tar.gz: b99e3284b1e690236f83e088fd78ece19e743a995ad65342da4d8b75022e962b96478222529132d1965521a7a57e5c01a0b38cd5bc68e05fd6e709ea6c334970
+  metadata.gz: 34146029b2c72f667a3e587591527b60291691aaa0df77f165d912b65de6ed5589434a7d854fa43fcfbe2226521fd7a147be2263515e8845279974720dff7cb7
+  data.tar.gz: ee1158fb8fd498cc48895bd72792542dfc84eb817755e1139315ac0134053df62dce752f2f16d6963be1f8791494977108549a97ce4719ef363ffd071b480b9b

data/.rubocop_fixme.yml

@@ -15,3 +15,7 @@ Style/SpecialGlobalVars:
 
 Layout/AccessModifierIndentation:
   EnforcedStyle: outdent
+
+Layout/HashAlignment:
+  Exclude:
+    - 'spec/presenters/qa_server/monitor_status/history_presenter_spec.rb'

data/CHANGELOG.md

@@ -1,3 +1,24 @@
+### 7.9.2 (2021-06-10)
+
+* fix: only check for dogear if status is a Hash
+
+### 7.9.1 (2021-06-10)
+
+* fix compare accuracy fails if either has pending tests
+
+### 7.9.0 (2021-04-16)
+
+* Add chart showing simulated graph (in table) of the last 30 days of up-down connection data
+
+### 7.8.0 (2021-04-14)
+
+* add geographic subauth for Mesh-NLM
+* dogear expected and actual cells when accuracy test is pending
+
+### 7.7.1 (2021-04-14)
+
+* fix background colors in historical uptime table
+
 ### 7.7.0 (2021-04-13)
 
 * remove unused translations

data/app/assets/stylesheets/qa_server/_check-status.scss

@@ -88,6 +88,10 @@ td.bold-left-border {
   border-left: 2px solid black;
 }
 
+.status-dogear {
+  background: linear-gradient(135deg, #333 0%, #333 10%, transparent 10%, transparent 100%);
+}
+
 .status-good {
   text-align: center;
   background-color: #ccffcc;

data/app/assets/stylesheets/qa_server/_monitor-status.scss

@@ -53,3 +53,48 @@ div#performance-by-the-day {
 div#performance-by-the-month {
   display: none;
 }
+
+table.up-down-history {
+  border: none;
+}
+
+td.up-down-history {
+  font-size: .8em;
+  font-style: italic;
+  border: none;
+}
+th.up-down-history {
+  width: 20px;
+  border: none;
+}
+
+td.connection-up-down {
+  border-right: 8px white solid;
+  border-left: 8px white solid;
+  border-top: none;
+  border-bottom: 3px white solid;
+}
+
+td.connection-no-data {
+  background-color: white;
+}
+
+td.connection-fully-up {
+  background-color: #19AE19;
+}
+
+td.connection-mostly-up {
+  background-color: #19AEA7;
+}
+
+td.connection-timeouts {
+  background-color: #EDF908;
+}
+
+td.connection-barely-up {
+  background-color: #AE7619;
+}
+
+td.connection-down {
+  background-color: #CE0303;
+}

data/app/cache_processors/concerns/qa_server/cache_keys.rb

@@ -5,6 +5,7 @@ module QaServer
     SCENARIO_RUN_SUMMARY_DATA_CACHE_KEY = "QaServer--CacheKeys--scenario_run_summary_data"
     SCENARIO_RUN_FAILURE_DATA_CACHE_KEY = "QaServer--CacheKeys--scenario_run_failure_data"
     SCENARIO_RUN_HISTORY_DATA_CACHE_KEY = "QaServer--CacheKeys--scenario_run_history_data"
+    SCENARIO_RUN_HISTORY_UP_DOWN_DATA_CACHE_KEY = "QaServer--CacheKeys--history_up_down_data"
 
     PERFORMANCE_DATATABLE_DATA_CACHE_KEY = "QaServer--Cache--performance_datatable_data"
   end

data/app/cache_processors/qa_server/scenario_history_cache.rb

@@ -2,8 +2,9 @@
 # Maintain a cache of data for Authority Connection History table displayed on Monitor Status page
 module QaServer
   class ScenarioHistoryCache
-    class_attribute :scenario_history_class
+    class_attribute :scenario_history_class, :scenario_up_down_class
     self.scenario_history_class = QaServer::ScenarioRunHistory
+    self.scenario_up_down_class = QaServer::HistoryUpDownService
 
     class << self
       include QaServer::CacheKeys
@@ -21,12 +22,29 @@ module QaServer
         end
       end
 
+      # Get a status for each of the last 30 days for queries that succeeded or failed.
+      # @param force [Boolean] if true, run the tests even if the cache hasn't expired; otherwise, use cache if not expired
+      # @returns [Hash<Array>] status for the last 30 days for each authority
+      # @example { auth_name => [:fully_up, :fully_up, :down, :mostly_up, ... ], ... }
+      #   { 'agrovoc' => [ :fully_up, :fully_up, :down, :mostly_up, ...],
+      #     'geonames_ld4l_cache' => [ :fully_up, :mostly_up, :down, :fully_up, :timeouts, ...] }
+      def historical_up_down_data(force: false)
+        Rails.cache.fetch(cache_key_for_historical_up_down_data, expires_in: next_expiry, race_condition_ttl: 30.seconds, force: force) do
+          QaServer.config.monitor_logger.debug("(QaServer::ScenarioHistoryCache) - CALCULATING UP-DOWN STATUS HISTORY of scenario runs (force: #{force})")
+          scenario_up_down_class.new.last_30_days
+        end
+      end
+
     private
 
       def cache_key_for_historical_data
         SCENARIO_RUN_HISTORY_DATA_CACHE_KEY
       end
 
+      def cache_key_for_historical_up_down_data
+        SCENARIO_RUN_HISTORY_UP_DOWN_DATA_CACHE_KEY
+      end
+
       def next_expiry
         QaServer::CacheExpiryService.cache_expiry
       end

data/app/controllers/qa_server/monitor_status_controller.rb

@@ -19,6 +19,7 @@ module QaServer
       @presenter = presenter_class.new(current_summary: latest_summary,
                                        current_failure_data: latest_failures,
                                        historical_summary_data: historical_data,
+                                       historical_up_down_data: historical_up_down_data,
                                        performance_data: performance_table_data)
       QaServer.config.monitor_logger.debug("~~~~~~~~ DONE rendering monitor status")
       render 'index', status: :internal_server_error if latest_summary&.failing_authority_count&.positive?
@@ -59,6 +60,13 @@ module QaServer
       @historical_data ||= QaServer::ScenarioHistoryCache.historical_summary(force: refresh_history?)
     end
 
+    # Get a summary level of historical data
+    # @returns [Array<Hash>] summary of passing/failing tests for each authority
+    # @see QaServer::ScenarioRunHistory#historical_summary for structure of output
+    def historical_up_down_data
+      @historical_up_down_data ||= QaServer::ScenarioHistoryCache.historical_up_down_data(force: refresh_history?)
+    end
+
     def update_historical_graph
       return unless QaServer.config.display_historical_graph?
       QaServer::ScenarioHistoryGraphCache.generate_graph(data: historical_data, force: refresh_history?)

data/app/presenters/qa_server/check_status_presenter.rb

@@ -81,7 +81,8 @@ module QaServer
 
     # @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}"
+      return "status-#{status}" unless status.is_a? Hash
+      status[:pending] ? "status-dogear 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.

data/app/presenters/qa_server/monitor_status/history_presenter.rb

@@ -7,6 +7,11 @@ module QaServer::MonitorStatus
 
     # @param parent [QaServer::MonitorStatusPresenter] parent presenter
     # @param historical_summary_data [Array<Hash>] summary of past failuring runs per authority to drive chart
+    # @example historical_summary_data
+    # {
+    #   "AGROVOC_DIRECT"=>{:good=>4, :bad=>0},
+    #   "AGROVOC_LD4L_CACHE"=>{:good=>4, :bad=>0}
+    # }
     def initialize(parent:, historical_summary_data:)
       @parent = parent
       @historical_summary_data = historical_summary_data
@@ -14,8 +19,10 @@ module QaServer::MonitorStatus
 
     # @return [Array<Hash>] historical test data to be displayed (authname, failing, passing)
     # @example
-    #   [ [ 'agrovoc', 0, 24 ],
-    #     [ 'geonames_ld4l_cache', 2, 22 ] ... ]
+    # {
+    #   "AGROVOC_DIRECT"=>{:good=>4, :bad=>0},
+    #   "AGROVOC_LD4L_CACHE"=>{:good=>4, :bad=>0}
+    # }
     def historical_summary
       @historical_summary_data
     end
@@ -72,47 +79,88 @@ module QaServer::MonitorStatus
       end
     end
 
+    # @param historical_entry [Array<String,Hash>] data for a single authority including name, # passing tests (good), # failing tests (bad)
+    # @return [String] name of the authority (e.g. 'AUTH_NAME')
+    # @example historical_entry
+    #   [ 'AUTH_NAME',  { good: 949, bad: 51 } ]
     def historical_data_authority_name(historical_entry)
       historical_entry[0]
     end
 
+    # @param historical_entry [Array<String,Hash>] data for a single authority including name, # passing tests (good), # failing tests (bad)
+    # @return [Integer] number of days with passing tests (e.g. 949)
+    # @example historical_entry
+    #   [ 'AUTH_NAME',  { good: 949, bad: 51 } ]
     def days_authority_passing(historical_entry)
       historical_entry[1][:good]
     end
 
+    # @param historical_entry [Array<String,Hash>] data for a single authority including name, # passing tests (good), # failing tests (bad)
+    # @return [Integer] number of days with failing tests (e.g. 51)
+    # @example historical_entry
+    #   [ 'AUTH_NAME',  { good: 949, bad: 51 } ]
     def days_authority_failing(historical_entry)
       historical_entry[1][:bad]
     end
 
+    # @param historical_entry [Array<String,Hash>] data for a single authority including name, # passing tests (good), # failing tests (bad)
+    # @return [Integer] number of days tested (e.g. 1000)
+    # @example historical_entry
+    #   [ 'AUTH_NAME',  { good: 949, bad: 51 } ]
     def days_authority_tested(historical_entry)
       days_authority_passing(historical_entry) + days_authority_failing(historical_entry)
     end
 
+    # @param historical_entry [Array<String,Hash>] data for a single authority including name, # passing tests (good), # failing tests (bad)
+    # @return [Float] percent of failing to passing tests (e.g. 0.05374 )
+    # @example historical_entry
+    #   [ 'AUTH_NAME',  { good: 949, bad: 51 } ]
     def percent_authority_failing(historical_entry)
       days_authority_failing(historical_entry).to_f / days_authority_tested(historical_entry)
     end
 
+    # @param historical_entry [Array<String,Hash>] data for a single authority including name, # passing tests (good), # failing tests (bad)
+    # @return [String] percent of failing to passing tests (e.g. '5.4%')
+    # @example historical_entry
+    #   [ 'AUTH_NAME',  { good: 949, bad: 51 } ]
     def percent_authority_failing_str(historical_entry)
       ActiveSupport::NumberHelper.number_to_percentage(percent_authority_failing(historical_entry) * 100, precision: 1)
     end
 
+    # @param historical_entry [Array<String,Hash>] data for a single authority including name, # passing tests (good), # failing tests (bad)
+    # @return [String] css class for background in Days Failing and Percent Failing columns (e.g. 'status-neutral', 'status-unknown', 'status-bad')
+    # @example historical_entry
+    #   [ 'AUTH_NAME',  { good: 949, bad: 51 } ]
     def failure_style_class(historical_entry)
-      return "status-neutral" if days_authority_failing(historical_entry) <= CAUTION_THRESHOLD
-      percent_authority_failing(historical_entry) < WARNING_THRESHOLD ? "status-unknown" : "status-bad"
+      case percent_authority_failing(historical_entry)
+      when 0.0...CAUTION_THRESHOLD
+        "status-neutral"
+      when CAUTION_THRESHOLD...WARNING_THRESHOLD
+        "status-unknown"
+      else
+        "status-bad"
+      end
     end
 
+    # @param historical_entry [Array<String,Hash>] data for a single authority including name, # passing tests (good), # failing tests (bad)
+    # @return [String] css class for background in Days Passing column (e.g. 'status-good', 'status-bad')
+    # @example historical_entry
+    #   [ 'AUTH_NAME',  { good: 949, bad: 51 } ]
     def passing_style_class(historical_entry)
       days_authority_passing(historical_entry) <= 0 ? "status-bad" : "status-good"
     end
 
+    # @return [Boolean] true if historical section should be visible; otherwise false
     def display_history_details?
       display_historical_graph? || display_historical_datatable?
     end
 
+    # @return [Boolean] true if historical graph should be visible; otherwise false
     def display_historical_graph?
       QaServer.config.display_historical_graph? && QaServer::HistoryGraphingService.history_graph_image_exists?
     end
 
+    # @return [Boolean] true if historical datatable should be visible; otherwise false
     def display_historical_datatable?
       QaServer.config.display_historical_datatable?
     end

data/app/presenters/qa_server/monitor_status/history_up_down_presenter.rb

@@ -0,0 +1,58 @@
+# frozen_string_literal: true
+# This presenter class provides historical testing data needed by the view that monitors status of authorities.
+module QaServer::MonitorStatus
+  class HistoryUpDownPresenter
+    attr_reader :historical_up_down_data
+
+    # @param parent [QaServer::MonitorStatusPresenter] parent presenter
+    # @param historical_up_down_data [Hash<Array>] recent connection status of queries (typically last 30 days)
+    # @example historical_up_down_data
+    #   { 'AGROVOC' = [
+    #       :FULLY_UP,   # 0 - today
+    #       :MOSTLY_UP,  # 1 - yesterday
+    #       :MOSTLY_UP,  # 2 - two days ago
+    #       :FULLY_UP,   # 3 - three days ago
+    #       :DOWN,       # 4 - four days ago
+    #       ...          # etc.
+    #     ],
+    #     'CERL' = [ ... ]
+    #   }
+    def initialize(parent:, historical_up_down_data:)
+      @parent = parent
+      @historical_up_down_data = historical_up_down_data
+    end
+
+    # Return the last date of data represented in the history graph and data table
+    # @return [ActiveSupport::TimeWithZone] date time stamp
+    def up_down_start
+      QaServer::TimeService.pretty_date(up_down_end_dt - 29.days)
+    end
+
+    def up_down_end
+      QaServer::TimeService.pretty_date(up_down_end_dt)
+    end
+
+    def up_down_end_dt
+      @parent.last_updated_dt
+    end
+
+    # @param status [Symbol] :fully_up, :mostly_up, :timeouts, :barely_up, :down
+    # @param day [Integer] retrieve the status for this day
+    # @return [String] name of the css class for the status
+    def historical_up_down_status_class(status, day) # rubocop:disable Metrics/CyclomaticComplexity
+      case status[day]
+      when :no_date then 'connection-no-date'
+      when :fully_up then 'connection-fully-up'
+      when :mostly_up then 'connection-mostly-up'
+      when :timeouts then 'connection-timeouts'
+      when :barely_up then 'connection-barely-up'
+      when :down then 'connection-down'
+      end
+    end
+
+    # @return [Boolean] true if historical datatable should be visible; otherwise false
+    def display_historical_up_down?
+      QaServer.config.display_historical_datatable? && @historical_up_down_data.present?
+    end
+  end
+end

data/app/presenters/qa_server/monitor_status_presenter.rb

@@ -5,12 +5,14 @@ module QaServer
     extend Forwardable
 
     # @param current_summary [ScenarioRunSummary] summary status of the latest run of test scenarios
-    # @param current_data [Array<Hash>] current set of failures for the latest test run, if any
+    # @param current_failure_data [Array<Hash>] current set of failures for the latest test run, if any
     # @param historical_summary_data [Array<Hash>] summary of past failuring runs per authority to drive chart
+    # @param historical_up_down_data [Hash<Array>] status of queries for the last 30 days
     # @param performance_data [Hash<Hash>] performance datatable data
-    def initialize(current_summary:, current_failure_data:, historical_summary_data:, performance_data:)
+    def initialize(current_summary:, current_failure_data:, historical_summary_data:, historical_up_down_data:, performance_data:)
       @current_status_presenter = QaServer::MonitorStatus::CurrentStatusPresenter.new(parent: self, current_summary: current_summary, current_failure_data: current_failure_data)
       @history_presenter = QaServer::MonitorStatus::HistoryPresenter.new(parent: self, historical_summary_data: historical_summary_data)
+      @history_up_down_presenter = QaServer::MonitorStatus::HistoryUpDownPresenter.new(parent: self, historical_up_down_data: historical_up_down_data)
       @performance_presenter = QaServer::MonitorStatus::PerformancePresenter.new(parent: self, performance_data: performance_data)
     end
 
@@ -23,6 +25,9 @@ module QaServer
                    :percent_authority_failing, :percent_authority_failing_str, :failure_style_class, :passing_style_class,
                    :display_history_details?, :display_historical_graph?, :display_historical_datatable?, :history_start, :history_end
 
+    def_delegators :@history_up_down_presenter, :historical_up_down_data, :display_historical_up_down?, :historical_up_down_status_class,
+                   :up_down_start, :up_down_end
+
     def_delegators :@performance_presenter, :performance_data, :performance_data?, :display_performance?, :display_performance_graph?,
                    :display_performance_datatable?, :performance_data_authority_name, :performance_for_day_graph, :performance_for_month_graph,
                    :performance_for_year_graph, :datatable_search_stats, :datatable_fetch_stats, :datatable_all_actions_stats,

data/app/services/qa_server/history_up_down_service.rb

@@ -0,0 +1,103 @@
+# frozen_string_literal: true
+# This class determines the state (e.g. fully_up, mostly_up, barely_up, down)of an authority during the last 30 days.
+module QaServer
+  class HistoryUpDownService
+    NO_DATA             = :no_data
+    FULLY_UP            = :fully_up
+    MOSTLY_UP           = :mostly_up
+    EXCESSIVE_TIMEOUTS  = :timeouts
+    BARELY_UP           = :barely_up
+    DOWN                = :down
+
+    MOSTLY_UP_THRESHOLD = QaServer.config.up_down_data_mostly_up_threshold
+    TIMEOUT_THRESHOLD   = QaServer.config.up_down_data_timeouts_max_threshold
+
+    class_attribute :authority_lister, :scenario_history_class, :time_service
+    self.authority_lister = QaServer::AuthorityListerService
+    self.scenario_history_class = QaServer::ScenarioRunHistory
+    self.time_service = QaServer::TimeService
+
+    def last_30_days
+      data = {}
+      authorities_list.each { |authority| data[authority] = last_30_days_for(authority.to_s) }
+      data
+    end
+
+  private
+
+    # @returns [Hash <Array<Hash>>] data for an authority for each of the last 30 days
+    # @example
+    #   { 'AGROVOC' = [
+    #       :FULLY_UP,   # 0 - today
+    #       :MOSTLY_UP,  # 1 - yesterday
+    #       :MOSTLY_UP,  # 2 - two days ago
+    #       :FULLY_UP,   # 3 - three days ago
+    #       :DOWN,       # 4 - four days ago
+    #       ...          # etc.
+    #     ]
+    #   }
+    def last_30_days_for(authority)
+      auth_data = []
+      0.upto(29) { |offset| auth_data[offset] = day_status(authority, offset) }
+      auth_data
+    end
+
+    # @returns [Symbol] status for a given day for an authority
+    def day_status(authority, offset)
+      day = offset_day(offset)
+      good_count = count_good(authority, day)
+      unknown_count = count_unknown(authority, day)
+      bad_count = count_bad(authority, day)
+      timeout_count = count_timeouts(authority, day)
+      status_determination(good_count, unknown_count, bad_count, timeout_count)
+    end
+
+    def status_determination(good_count, unknown_count, bad_count, timeout_count) # rubocop:disable Metrics/CyclomaticComplexity
+      total_count = good_count + unknown_count + bad_count
+      return NO_DATA if total_count.zero?
+      return FULLY_UP if good_count == total_count
+      return DOWN if bad_count == total_count
+      return BARELY_UP if unknown_count == total_count
+      return EXCESSIVE_TIMEOUTS if (timeout_count.to_f / total_count) > TIMEOUT_THRESHOLD
+      return MOSTLY_UP if (bad_count.to_f / total_count) < (1 - MOSTLY_UP_THRESHOLD)
+      BARELY_UP
+    end
+
+    def authorities_list
+      @authorities_list ||= authority_lister.authorities_list
+    end
+
+    def offset_day(offset)
+      @today ||= time_service.current_time
+      time_service.pretty_query_date(@today - offset.days)
+    end
+
+    def count_good(authority, day)
+      scenario_history_class.where(authority_name: authority)
+                            .where(date: day)
+                            .where(status: :good)
+                            .count(:id)
+    end
+
+    def count_unknown(authority, day)
+      scenario_history_class.where(authority_name: authority)
+                            .where(date: day)
+                            .where(status: :unknown)
+                            .count(:id)
+    end
+
+    def count_bad(authority, day)
+      scenario_history_class.where(authority_name: authority)
+                            .where(date: day)
+                            .where(status: :bad)
+                            .count(:id)
+    end
+
+    def count_timeouts(authority, day)
+      scenario_history_class.where(authority_name: authority)
+                            .where(date: day)
+                            .where('err_message LIKE ?', "%timeout%")
+                            .count(:id)
+    end
+  end
+end

data/app/services/qa_server/time_service.rb

@@ -24,6 +24,12 @@ module QaServer
       def pretty_date(dt)
         dt.in_time_zone(QaServer.config.preferred_time_zone_name).strftime("%m/%d/%Y")
       end
+
+      # @param dt [ActiveSupport::TimeWithZone] date time stamp
+      # @return [String] string version of date formatted with just date (e.g. "2020-02-01")
+      def pretty_query_date(dt)
+        dt.in_time_zone(QaServer.config.preferred_time_zone_name).strftime("%Y-%m-%d")
+      end
     end
   end
 end

data/app/views/qa_server/check_status/index.html.erb

@@ -44,8 +44,6 @@
       <select name="authority" id="authority" class="string optional form-control form-control" value="" aria-labelledby="authority" onchange="hide_data()">
         <option value=""><%= t('qa_server.check_status.select_authority') %></option>
         <option disabled>──────────</option>
-        <option value="<%= @presenter.value_all_collections %>"><%= t('qa_server.check_status.show_all') %></option>
-        <option disabled>──────────</option>
         <% @authorities_list.each do |auth_name| %>
           <option value="<%= auth_name %>"<%= " selected" if auth_name == selected_authority %>><%= auth_name.upcase %></option>
         <% end %>
@@ -77,7 +75,10 @@
   <% end %>
 
 
-<div id="status-loading-message" class="wait-message"><%= t('qa_server.check_status.wait_message') %></div>
+<div id="status-loading-message" class="wait-message">
+  <%= t('qa_server.check_status.wait_message_ln1') %><br>
+  <%= t('qa_server.check_status.wait_message_ln2') %>
+</div>
 
 <% if @presenter.connection_status_data? %>
 <div id="connection-status-section" class="status-section">
@@ -100,7 +101,7 @@
           </tr>
       <% end %>
       <tr>
-        <td class="<%= @presenter.status_style_class(status[:status]) %>"><%= @presenter.status_label(status[:status]) %></td>
+        <td class="<%= @presenter.status_style_class(status) %>"><%= @presenter.status_label(status[:status]) %></td>
         <td><%= status[:subauthority_name] %></td>
         <td><%= status[:service] %></td>
         <td><%= status[:action] %></td>
@@ -137,8 +138,8 @@
         </tr>
       <% end %>
     <tr>
-      <td class="position <%= @presenter.status_style_class(status[:status]) %>"><%= status[:expected] %></td>
-      <td class="position <%= @presenter.status_style_class(status[:status]) %>"><%= status[:actual] %></td>
+      <td class="position <%= @presenter.status_style_class(status) %>"><%= status[:expected] %></td>
+      <td class="position <%= @presenter.status_style_class(status) %>"><%= status[:actual] %></td>
       <td><%= status[:request_data] %></td>
       <td><a href="<%= status[:target] %>"><%= status[:target] %></a></td>
       <td><%= status[:authority_name] %></td>
@@ -150,6 +151,7 @@
     </tr>
     <% end %>
   </table>
+  <p><i>NOTE: Dogear means that the test is a known failure marked as pending.</i></p>
 </div>
 <% end %>
 

data/app/views/qa_server/monitor_status/_test_up_down_connection_history.html.erb

@@ -0,0 +1,30 @@
+  <% if @presenter.history? && @presenter.display_history_details?%>
+      <div id="availability-history" class="status-section">
+        <h3><%= t('qa_server.monitor_status.history.title') %></h3>
+        <% if @presenter.display_historical_graph? %>
+          <p class="status-update-dtstamp"><%= t('qa_server.monitor_status.history.range', from: @presenter.history_start, to: @presenter.history_end) %></p>
+          <%= image_tag(@presenter.historical_graph, alt: 'History Graph Unavailable') %>
+        <% end %>
+
+        <% if @presenter.display_historical_up_down? %>
+          <p class="status-update-dtstamp"><%= t('qa_server.monitor_status.history.range', from: @presenter.up_down_start, to: @presenter.up_down_end) %></p>
+          <table class="up-down-history">
+            <tr>
+              <th class="up-down-history"><%= t('qa_server.monitor_status.history.authority') %></th>
+              <% 0.upto(29) do %>
+              <th class='up-down-history'></th>
+              <% end %>
+              <td class='up-down-history'>Most Recent</td>
+            </tr>
+            <% @presenter.historical_up_down_data.each do |authority_name, status| %>
+                <tr>
+                  <td class="connection-up-down"><%= authority_name %></td>
+                  <% 29.downto(0) do |day| %>
+                    <td class="connection-up-down <%= @presenter.historical_up_down_status_class(status, day) %>"></td>
+                  <% end %>
+                </tr>
+            <% end %>
+          </table>
+        <% end %>
+      </div>
+  <% end %>

data/app/views/qa_server/monitor_status/index.html.erb

@@ -5,7 +5,8 @@
   <h2><%= t('qa_server.monitor_status.title') %></h2>
 
   <%= render 'test_summary' %>
-  <%= render 'test_history' %>
+  <%= render 'test_up_down_connection_history' %>
+  <% # = render 'test_history' %>
   <%= render 'performance' %>
 
 </div>

data/config/locales/qa_server.en.yml

@@ -25,12 +25,12 @@ en:
     check_status:
       title:             Check Status
       select_authority:  Select authority...
-      show_all:          ALL Authorities (SLOW)
       connections:       Check Connection Status only
       accuracy:          Check Accuracy only
       comparison:        Compare Accuracy
       all_checks:        Run all checks
-      wait_message:      "Please wait while the status is verified.  This will be slow if you selected ALL Authorities."
+      wait_message_ln1:  "Please wait while the status is verified."
+      wait_message_ln2:  "This may be slow for large authorities or ones with a lot of tests."
       connection_checks: Connection Checks
       accuracy_checks:   Accuracy Checks for Search Results
       comparison_checks: Comparison of Accuracy Checks

data/lib/generators/qa_server/templates/config/authorities/linked_data/mesh_nlm_ld4l_cache.json

@@ -206,6 +206,7 @@
       ]
     },
     "subauthorities": {
+      "geographic":       "Geographic",
       "subject":          "Subject",
       "publication_type": "FormOfWork"
     }

data/lib/generators/qa_server/templates/config/authorities/linked_data/scenarios/mesh_nlm_ld4l_cache_validation.yml

@@ -45,7 +45,7 @@ search:
   -
     pending: true
     query: Spain
-    subauth: subject
+    subauth: geographic
     subject_uri: "http://id.nlm.nih.gov/mesh/D013030"
     position: 3
     replacements:

data/lib/generators/qa_server/templates/config/initializers/qa_server.rb

@@ -24,6 +24,14 @@ QaServer.config do |config|
   # @param [Symbol] time period for calculating historical pass/fail (i.e., one of :month, :year, or :all)
   # config.historical_datatable_default_time_period = :year
 
+  # Threshold for percentage of queries that timed out after which it gets marked in the Authority Connection up-down History
+  # @param [Float] percentage of queries that are ok to timeout
+  # config.up_down_data_timeouts_max_threshold = 0.3
+
+  # Threshold for percentage of queries that are passing, below which are marked in the Authority Connection up-down History as barely_up
+  # @param [Float] required percentage of queries passing to be considered mostly-up when there are some failures
+  # config.up_down_data_mostly_up_threshold = 0.95
+
   # Displays a graph of performance test data when true
   # @param [Boolean] display performance graph when true
   # config.display_performance_graph = false

data/lib/qa_server/configuration.rb

@@ -73,6 +73,20 @@ module QaServer
       @historical_datatable_default_time_period ||= :year
     end
 
+    # Threshold for percentage of queries that timed out after which it gets marked in the Authority Connection up-down History
+    # @param [Float] percentage of queries that are ok to timeout
+    attr_writer :up_down_data_timeouts_max_threshold
+    def up_down_data_timeouts_max_threshold
+      @up_down_data_timeouts_max_threshold ||= 0.3
+    end
+
+    # Threshold for percentage of queries that are passing, below which are marked in the Authority Connection up-down History as barely_up
+    # @param [Float] required percentage of queries passing to be considered mostly-up when there are some failures
+    attr_writer :up_down_data_mostly_up_threshold
+    def up_down_data_mostly_up_threshold
+      @up_down_data_mostly_up_threshold ||= 0.95
+    end
+
     # Displays a graph of performance test data when true
     # @param [Boolean] display performance graph when true
     attr_writer :display_performance_graph

data/lib/qa_server/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module QaServer
-  VERSION = '7.7.0'
+  VERSION = '7.9.2'
 end

data/spec/lib/configuration_spec.rb

@@ -86,6 +86,28 @@ RSpec.describe QaServer::Configuration do
     end
   end
 
+  describe '#up_down_data_timeouts_max_threshold' do
+    it 'return default as 0.3 (e.g. 30%)' do
+      expect(config.up_down_data_timeouts_max_threshold).to eq 0.3
+    end
+
+    it 'returns set value' do
+      config.up_down_data_timeouts_max_threshold = 0.25
+      expect(config.up_down_data_timeouts_max_threshold).to eq 0.25
+    end
+  end
+
+  describe '#up_down_data_mostly_up_threshold' do
+    it 'return default as 0.95 (e.g. 95%)' do
+      expect(config.up_down_data_mostly_up_threshold).to eq 0.95
+    end
+
+    it 'returns set value' do
+      config.up_down_data_mostly_up_threshold = 0.98
+      expect(config.up_down_data_mostly_up_threshold).to eq 0.98
+    end
+  end
+
   describe '#display_performance_graph?' do
     it 'return default as false' do
       expect(config.display_performance_graph?).to eq false

data/spec/presenters/qa_server/monitor_status/history_presenter_spec.rb

@@ -0,0 +1,81 @@
+# frozen_string_literal: true
+require 'spec_helper'
+
+RSpec.describe QaServer::MonitorStatus::HistoryPresenter do
+  let(:presenter) { described_class.new(parent: nil, historical_summary_data: historical_summary_data) }
+  # rubocop:disable Layout/ExtraSpacing
+  let(:historical_summary_data) do
+    # { 'auth_name' => { good: count_of_passing_tests, bad: count_of_failing_tests } }
+    {
+      'GOOD_AUTH'   => { good:    0, bad: 1000 },
+      'BARELY_GOOD' => { good:   49, bad:  951 },
+      'OK_AUTH'     => { good:   50, bad:  950 },
+      'STILL_OK'    => { good:   51, bad:  949 },
+      'BARELY_OK'   => { good:   99, bad:  901 },
+      'BAD_AUTH'    => { good:  100, bad:  900 },
+      'STILL_BAD'   => { good:  101, bad:  899 },
+      'REALLY_BAD'  => { good:  500, bad:  500 },
+      'HORRIBLE'    => { good: 1000, bad:    0 }
+    }
+    # rubocop:enable Layout/ExtraSpacing
+  end
+
+  describe '.failure_style_class' do
+    context 'returns NEUTRAL style' do
+      let(:expected_css_style) { "status-neutral" }
+      let(:zero_failure_entry) { ['GOOD_AUTH',   { good: 1000, bad:  0 }] } # rubocop:disable Layout/ExtraSpacing
+      let(:just_below_caution) { ['BARELY_GOOD', { good:  951, bad: 49 }] } # rubocop:disable Layout/ExtraSpacing
+
+      it 'when no failures' do
+        expect(presenter.failure_style_class(zero_failure_entry)).to eq expected_css_style
+      end
+
+      it 'when percent of failures is just below the CAUTION_THRESHOLD' do
+        expect(presenter.failure_style_class(just_below_caution)).to eq expected_css_style
+      end
+    end
+
+    context 'returns CAUTION style' do
+      let(:expected_css_style) { "status-unknown" }
+      let(:equal_caution)      { ['OK_AUTH',   { good: 950, bad: 50 }] }
+      let(:just_above_caution) { ['STILL_OK',  { good: 949, bad: 51 }] }
+      let(:just_below_warning) { ['BARELY_OK', { good: 901, bad: 99 }] }
+
+      it 'when percent of failures is equal to CAUTION_THRESHOLD' do
+        expect(presenter.failure_style_class(equal_caution)).to eq expected_css_style
+      end
+
+      it 'when percent of failures is just above CAUTION_THRESHOLD' do
+        expect(presenter.failure_style_class(just_above_caution)).to eq expected_css_style
+      end
+
+      it 'when percent of failures is just below WARNING_THRESHOLD' do
+        expect(presenter.failure_style_class(just_below_warning)).to eq expected_css_style
+      end
+    end
+
+    context 'returns WARNING style' do
+      let(:expected_css_style) { "status-bad" }
+      let(:equal_warning)      { ['BAD_AUTH',   { good: 900, bad:  100 }] }
+      let(:just_above_warning) { ['STILL_BAD',  { good: 899, bad:  101 }] }
+      let(:well_above_warning) { ['REALLY_BAD', { good: 500, bad:  500 }] }
+      let(:all_failures)       { ['HORRIBLE',   { good:   0, bad: 1000 }] }
+
+      it 'when percent of failures is equal to WARNING_THRESHOLD' do
+        expect(presenter.failure_style_class(equal_warning)).to eq expected_css_style
+      end
+
+      it 'when percent of failures is just above WARNING_THRESHOLD' do
+        expect(presenter.failure_style_class(just_above_warning)).to eq expected_css_style
+      end
+
+      it 'when percent of failures is well above WARNING_THRESHOLD' do
+        expect(presenter.failure_style_class(well_above_warning)).to eq expected_css_style
+      end
+
+      it 'when percent of failures is 100%' do
+        expect(presenter.failure_style_class(all_failures)).to eq expected_css_style
+      end
+    end
+  end
+end

data/spec/services/qa_server/history_up_down_service_spec.rb

@@ -0,0 +1,86 @@
+# frozen_string_literal: true
+require 'spec_helper'
+
+RSpec.describe QaServer::HistoryUpDownService do
+  let(:service) { described_class.new }
+
+  context 'when total_count is 0' do
+    let(:good_count) { 0 }
+    let(:unknown_count) { 0 }
+    let(:bad_count) { 0 }
+    let(:timeout_count) { 0 }
+    it 'returns :no_data' do
+      status = service.send(:status_determination, good_count, unknown_count, bad_count, timeout_count)
+      expect(status).to eq :no_data
+    end
+  end
+
+  context 'when all queries failed' do
+    let(:good_count) { 0 }
+    let(:unknown_count) { 0 }
+    let(:bad_count) { 5 }
+    let(:timeout_count) { 0 }
+    it 'returns :down' do
+      status = service.send(:status_determination, good_count, unknown_count, bad_count, timeout_count)
+      expect(status).to eq :down
+    end
+  end
+
+  context 'when all queries passed' do
+    let(:good_count) { 5 }
+    let(:unknown_count) { 0 }
+    let(:bad_count) { 0 }
+    let(:timeout_count) { 0 }
+    it 'returns :fully_up' do
+      status = service.send(:status_determination, good_count, unknown_count, bad_count, timeout_count)
+      expect(status).to eq :fully_up
+    end
+  end
+
+  context 'when all queries are unknown' do
+    let(:good_count) { 0 }
+    let(:unknown_count) { 5 }
+    let(:bad_count) { 0 }
+    let(:timeout_count) { 0 }
+    it 'returns :barely_up' do
+      status = service.send(:status_determination, good_count, unknown_count, bad_count, timeout_count)
+      expect(status).to eq :barely_up
+    end
+  end
+
+  context 'when too many queries timed out' do
+    let(:threshold) { 0.5 }
+    let(:good_count) { 100 - bad_count }
+    let(:unknown_count) { 0 }
+    let(:bad_count) { timeout_count + 2 }
+    let(:timeout_count) { threshold * 100 + 1 }
+    it 'returns :good' do
+      status = service.send(:status_determination, good_count, unknown_count, bad_count, timeout_count)
+      expect(status).to eq :timeouts
+    end
+  end
+
+  context 'when almost all queries pass' do
+    let(:threshold) { 0.95 }
+    let(:good_count) { threshold * 100 + 1 }
+    let(:unknown_count) { 0 }
+    let(:bad_count) { 100 - good_count }
+    let(:timeout_count) { 0 }
+    it 'returns :good' do
+      status = service.send(:status_determination, good_count, unknown_count, bad_count, timeout_count)
+      expect(status).to eq :mostly_up
+    end
+  end
+
+  context 'when too many queries fail' do
+    let(:threshold) { 0.95 }
+    let(:good_count) { threshold * 100 - 1 }
+    let(:unknown_count) { 0 }
+    let(:bad_count) { 100 - good_count }
+    let(:timeout_count) { 0 }
+    it 'returns :good' do
+      status = service.send(:status_determination, good_count, unknown_count, bad_count, timeout_count)
+      expect(status).to eq :barely_up
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: qa_server
 version: !ruby/object:Gem::Version
-  version: 7.7.0
+  version: 7.9.2
 platform: ruby
 authors:
 - E. Lynette Rayle
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-04-13 00:00:00.000000000 Z
+date: 2021-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -418,6 +418,7 @@ files:
 - app/presenters/qa_server/fetch_presenter.rb
 - app/presenters/qa_server/monitor_status/current_status_presenter.rb
 - app/presenters/qa_server/monitor_status/history_presenter.rb
+- app/presenters/qa_server/monitor_status/history_up_down_presenter.rb
 - app/presenters/qa_server/monitor_status/performance_presenter.rb
 - app/presenters/qa_server/monitor_status_presenter.rb
 - app/presenters/qa_server/navmenu_presenter.rb
@@ -427,6 +428,7 @@ files:
 - app/services/qa_server/authority_validator_service.rb
 - app/services/qa_server/database_migrator.rb
 - app/services/qa_server/history_graphing_service.rb
+- app/services/qa_server/history_up_down_service.rb
 - app/services/qa_server/performance_calculator_service.rb
 - app/services/qa_server/performance_datatable_service.rb
 - app/services/qa_server/performance_graph_data_service.rb
@@ -447,6 +449,7 @@ files:
 - app/views/qa_server/monitor_status/_performance.html.erb
 - app/views/qa_server/monitor_status/_test_history.html.erb
 - app/views/qa_server/monitor_status/_test_summary.html.erb
+- app/views/qa_server/monitor_status/_test_up_down_connection_history.html.erb
 - app/views/qa_server/monitor_status/index.html.erb
 - app/views/qa_server/usage/index.html.erb
 - app/views/shared/_footer.html.erb
@@ -546,7 +549,9 @@ files:
 - spec/i18n_spec.rb
 - spec/lib/configuration_spec.rb
 - spec/lib/qa_server_spec.rb
+- spec/presenters/qa_server/monitor_status/history_presenter_spec.rb
 - spec/rails_helper.rb
+- spec/services/qa_server/history_up_down_service_spec.rb
 - spec/services/qa_server/time_period_service_spec.rb
 - spec/services/qa_server/time_service_spec.rb
 - spec/spec_helper.rb
@@ -584,7 +589,9 @@ test_files:
 - spec/i18n_spec.rb
 - spec/lib/configuration_spec.rb
 - spec/lib/qa_server_spec.rb
+- spec/presenters/qa_server/monitor_status/history_presenter_spec.rb
 - spec/rails_helper.rb
+- spec/services/qa_server/history_up_down_service_spec.rb
 - spec/services/qa_server/time_period_service_spec.rb
 - spec/services/qa_server/time_service_spec.rb
 - spec/spec_helper.rb