Merge pull request #493 from ncbo/bugfix/statistics/492

Refactor home page statistics for slices

Author: jvendetti

app/controllers/application_controller.rb

@@ -642,24 +642,6 @@ def get_recent_mappings
     return recent_mappings
   end
 
-  def total_mapping_count
-    total_count = 0
-    
-    begin
-      stats = LinkedData::Client::HTTP.get("#{REST_URI}/mappings/statistics/ontologies")
-      unless stats.blank?
-        stats = stats.to_h.compact
-        # Some of the mapping counts are erroneously stored as strings
-        stats.transform_values!(&:to_i)
-        total_count = stats.values.sum
-      end
-    rescue
-      Log.add :error, e.message
-    end
-    
-    return total_count
-  end
-
   def determine_layout
     if Rails.env.appliance?
       'appliance'

app/controllers/concerns/mapping_statistics.rb

@@ -3,7 +3,7 @@
 module MappingStatistics
   extend ActiveSupport::Concern
 
-  MAPPING_STATISTICS_URL = "#{LinkedData::Client.settings.rest_url}/mappings/statistics/ontologies/"
+  MAPPING_STATISTICS_URL = "#{LinkedData::Client.settings.rest_url}/mappings/statistics/ontologies"
 
   def mapping_counts(source_acronym)
     mapping_counts = []
@@ -13,10 +13,11 @@ def mapping_counts(source_acronym)
       display_links: false,
       display_context: false
     )
+    ontologies_by_acronym = ontologies.index_by(&:acronym)
 
-    statistics = LinkedData::Client::HTTP.get(MAPPING_STATISTICS_URL + source_acronym)
+    statistics = LinkedData::Client::HTTP.get("#{MAPPING_STATISTICS_URL}/#{source_acronym}")
     statistics&.each_pair do |target_acronym, count|
-      ont = ontologies.find { |o| o.acronym.eql? target_acronym.to_s }
+      ont = ontologies_by_acronym[target_acronym.to_s]
       # Handle the case where statistics are still present for a deleted ontology
       next if ont.nil? || ont.summaryOnly
 
@@ -25,4 +26,17 @@ def mapping_counts(source_acronym)
 
     mapping_counts.sort! { |a, b| a[:target_ontology].name.downcase <=> b[:target_ontology].name.downcase }
   end
+
+  def total_mapping_count(ont_acronyms)
+    stats = LinkedData::Client::HTTP.get(MAPPING_STATISTICS_URL)
+    return 0 if stats.blank?
+
+    stats = stats.to_h.compact
+    stats = stats.select { |k, _| ont_acronyms.include?(k.to_s) }
+    stats.transform_values!(&:to_i)
+    stats.values.sum
+  rescue StandardError => e
+    Log.add :error, e.message
+    0
+  end
 end

app/controllers/home_controller.rb

@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
 class HomeController < ApplicationController
+  include MappingStatistics
+
   layout :determine_layout
 
   def index
@@ -12,10 +14,10 @@ def index
     organize_groups
 
     # Calculate BioPortal summary statistics
-    @ont_count = @ontologies.length
-    @cls_count = LinkedData::Client::Models::Metrics.all.map { |m| m.classes.to_i }.sum
-    @prop_count = 36286
-    @map_count = total_mapping_count
+    ont_acronyms = @ontologies.map(&:acronym)
+    @statistics = OntologyStatisticsService.call(ont_acronyms)
+    @map_count = total_mapping_count(ont_acronyms)
+
     @analytics = LinkedData::Client::Analytics.last_month
 
     @ontology_names = @ontologies.map { |ont| ["#{ont.name} (#{ont.acronym})", ont.acronym] }

app/services/ontology_statistics_service.rb

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+class OntologyStatisticsService < ApplicationService
+  def initialize(ont_acronyms)
+    @ont_acronyms = ont_acronyms
+    @metrics = ontology_metrics(@ont_acronyms)
+  end
+
+  def call
+    {
+      ontology_count: @ont_acronyms.size,
+      class_count: @metrics[:classes],
+      property_count: @metrics[:properties],
+      individual_count: @metrics[:individuals]
+    }
+  end
+
+  private
+
+  def ontology_metrics(ont_acronyms)
+    query_string = { include: 'classes,properties,individuals', display_links: false, display_context: false }
+    metrics = LinkedData::Client::Models::Metrics.all(query_string)
+
+    metrics.select! do |m|
+      acronym = m.id.split('/ontologies/').last.split('/').first
+      ont_acronyms.include?(acronym)
+    end
+
+    metrics.each_with_object({ classes: 0, properties: 0, individuals: 0 }) do |m, sums|
+      sums[:classes] += m.classes
+      sums[:properties] += m.properties
+      sums[:individuals] += m.individuals
+    end
+  end
+end

app/views/home/index.html.haml

@@ -75,17 +75,22 @@
               %div.d-flex.justify-content-between.align-items-center
                 Ontologies
                 %h4
-                  %span.badge.text-bg-secondary= number_with_delimiter(@ont_count)
+                  %span.badge.text-bg-secondary= number_with_delimiter(@statistics[:ontology_count])
             %li.list-group-item
               %div.d-flex.justify-content-between.align-items-center
                 Classes
                 %h4
-                  %span.badge.text-bg-secondary= number_with_delimiter(@cls_count)
+                  %span.badge.text-bg-secondary= number_with_delimiter(@statistics[:class_count])
             %li.list-group-item
               %div.d-flex.justify-content-between.align-items-center
                 Properties
                 %h4
-                  %span.badge.text-bg-secondary= number_with_delimiter(@prop_count)
+                  %span.badge.text-bg-secondary= number_with_delimiter(@statistics[:property_count])
+            %li.list-group-item
+              %div.d-flex.justify-content-between.align-items-center
+                Individuals
+                %h4
+                  %span.badge.text-bg-secondary= number_with_delimiter(@statistics[:individual_count])
             %li.list-group-item
               %div.d-flex.justify-content-between.align-items-center
                 Mappings