Merge branch 'master' of https://github.com/datacite/lupo

datacite · Jul 2, 2019 · 5b4460e · 5b4460e
2 parents 1e6923c + 61134c2
commit 5b4460e
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 4 deletions.
diff --git a/app/controllers/clients_controller.rb b/app/controllers/clients_controller.rb
@@ -145,7 +145,8 @@ def totals
     page = { size: 0, number: 1}
     response = nil
     bmt = Benchmark.ms {
-      response = Doi.query(nil, provider_id: params[:provider_id], state: "findable,registered", page: page, totals_agg: true)
+      state =  current_user.present? && current_user.is_admin_or_staff? && params[:state].present? ? params[:state] : "registered,findable"
+      response = Doi.query(nil, provider_id: params[:provider_id], state: state, page: page, totals_agg: true)
     }
     if bmt > 10000
       logger.warn "[Benchmark Warning] clients totals " + bmt.to_s + " ms"

diff --git a/app/controllers/concerns/facetable.rb b/app/controllers/concerns/facetable.rb
@@ -276,6 +276,7 @@ def providers_totals(arr)
           "this_month" => facet_anual(hsh.this_month.buckets),
           "this_year" => facet_anual(hsh.this_year.buckets),
           "last_year" => facet_anual(hsh.last_year.buckets)},
+          "two_years_ago" => facet_anual(hsh.two_years_ago.buckets),
           "states"    => facet_by_key(hsh.states.buckets)
         }
       end
@@ -309,7 +310,8 @@ def clients_totals(arr)
           "temporal" => {
             "this_month" => facet_anual(hsh.this_month.buckets),
             "this_year" => facet_anual(hsh.this_year.buckets),
-            "last_year" => facet_anual(hsh.last_year.buckets)
+            "last_year" => facet_anual(hsh.last_year.buckets),
+            "two_years_ago" => facet_anual(hsh.two_years_ago.buckets)
           },
           "states"    => facet_by_key(hsh.states.buckets)
         }

diff --git a/app/controllers/providers_controller.rb b/app/controllers/providers_controller.rb
@@ -201,7 +201,8 @@ def totals
     page = { size: 0, number: 1 }
     response = nil
     bmt = Benchmark.ms {
-      response = Doi.query(nil, state: "findable,registered", page: page, totals_agg: true)
+      state =  current_user.present? && current_user.is_admin_or_staff? && params[:state].present? ? params[:state] : "registered,findable"
+      response = Doi.query(nil, state: state, page: page, totals_agg: true)
     }
 
     if bmt > 10000

diff --git a/app/models/doi.rb b/app/models/doi.rb
@@ -385,7 +385,8 @@ def self.sub_aggregations
       states: { terms: { field: 'aasm_state', size: 4, min_doc_count: 1 } },
       this_month: { date_range: { field: 'created', ranges: { from: "now/M", to: "now/d" } } },
       this_year: { date_range: { field: 'created', ranges: { from: "now/y", to: "now/d" } } },
-      last_year: { date_range: { field: 'created', ranges: { from: "now-1y/y", to: "now/y-1d" } } }
+      last_year: { date_range: { field: 'created', ranges: { from: "now-1y/y", to: "now/y-1d" } } },
+      two_years_ago: { date_range: { field: 'created', ranges: { from: "now-2y/y", to: "now-1y/y-1d" } } }
     }
   end