change aggregations

app/models/doi.rb

@@ -299,6 +299,10 @@ def as_indexed_json(options={})
   end
 
   def self.query_aggregations
+    beginning_of_year  = DateTime.current.beginning_of_year.strftime('%Y-%m-%d')
+    beginning_of_last_year  = DateTime.current.beginning_of_year.last_year.strftime('%Y-%m-%d')
+    beginning_of_month = DateTime.current.beginning_of_month.strftime('%Y-%m-%d')
+
     {
       resource_types: { terms: { field: 'types.resourceTypeGeneral', size: 15, min_doc_count: 1 } },
       states: { terms: { field: 'aasm_state', size: 15, min_doc_count: 1 } },
@@ -316,9 +320,9 @@ def self.query_aggregations
       link_checks_citation_doi: { value_count: { field: "landing_page.citationDoi" } },
       links_checked: { value_count: { field: "landing_page.checked" } },
       sources: { terms: { field: 'source', size: 15, min_doc_count: 1 } },
-      last_thirty_days: { date_range: { field: 'created', time_zone: "CET", ranges: {from: "now-30d/d", to: "now/d"} } },
-      last_year: { date_range: { field: 'created', time_zone: "CET", ranges: {from: "now-1y/y", to: "now/d"} } },
-      last_two_year: { date_range: { field: 'created', time_zone: "CET", ranges: {from: "now-2y/y", to: "now/d"} } },
+      this_month: { date_range: { field: 'created', time_zone: "CET", ranges: {from: beginning_of_month, to: "now/d"} } },
+      this_year: { date_range: { field: 'created', time_zone: "CET", ranges: {from: beginning_of_year, to: "now/d"} } },
+      last_year: { date_range: { field: 'created', time_zone: "CET", ranges: {from: beginning_of_last_year, to: beginning_of_year} } }
     }
   end