Merge pull request #760 from datacite/pr_create_agg

added created aggregation for events endpoint
datacite · Feb 8, 2022 · b01ad5a · b01ad5a
2 parents 202f8da + 037d3ba
commit b01ad5a
Show file tree

Hide file tree

Showing 4 changed files with 127 additions and 0 deletions.
diff --git a/app/controllers/events_controller.rb b/app/controllers/events_controller.rb
@@ -185,6 +185,10 @@ def index
         if total > 0
           facet_by_year(response.aggregations.occurred.buckets)
         end
+      created =
+        if total > 0
+          facet_by_year(response.aggregations.created.buckets)
+        end
       prefixes =
         if total.positive?
           facet_by_key(response.response.aggregations.prefixes.buckets)
@@ -219,6 +223,7 @@ def index
           page[:cursor].nil? && page[:number].present? ? page[:number] : nil,
         sources: sources,
         occurred: occurred,
+        created: created,
         prefixes: prefixes,
         "citationTypes" => citation_types,
         "relationTypes" => relation_types,

diff --git a/app/models/event.rb b/app/models/event.rb
@@ -263,6 +263,16 @@ def self.query_aggregations
           },
           aggs: { bucket_truncate: { bucket_sort: { size: 10 } } },
       },
+      created: {
+        date_histogram: {
+          field: "created_at",
+          interval: "year",
+          format: "year",
+          order: { _key: "desc" },
+          min_doc_count: 1,
+        },
+        aggs: { bucket_truncate: { bucket_sort: { size: 10 } } },
+    },
       registrants: {
         terms: { field: "registrant_id", size: 10, min_doc_count: 1 },
         aggs: {

diff --git a/...cassettes/EventsController/create/with_registrant_information/has_created_aggregation.yml b/...cassettes/EventsController/create/with_registrant_information/has_created_aggregation.yml
diff --git a/spec/requests/events_spec.rb b/spec/requests/events_spec.rb
@@ -364,6 +364,17 @@
           "datacite.crossref.citations",
         )
       end
+
+      it "has created aggregation" do
+        post uri, params, headers
+
+        Event.import
+        sleep 2
+        get uri, nil, headers
+
+        expect(json.dig("meta", "created", 0, "count")).to eq(1)
+        expect(json.dig("meta", "occurred", 0, "count")).to eq(1)
+      end
     end
 
     context "with nested attributes" do