Merge pull request #364 from datacite/refractor_multiple_dois_in_events

Refractor multiple dois in events

.gitignore

@@ -54,3 +54,4 @@ doc/dependencies*
 docker-compose.override.yml
 .ruby-version
 .vscode
+.solargraph

app/controllers/events_controller.rb

@@ -123,7 +123,7 @@ def index
     dois_usage = total.positive? && aggregations.blank? || aggregations.include?("query_aggregations") ? facet_by_dois(response.response.aggregations.dois_usage.dois.buckets) : nil
     dois_citations = total.positive? && aggregations.blank? || aggregations.include?("query_aggregations") ? facet_citations_by_year_v1(response.response.aggregations.dois_citations) : nil
     citations_histogram = total.positive? && params[:doi].present? && aggregations.include?("citations_aggregations") ? facet_citations_by_year(response.response.aggregations.citations_histogram) : nil
-    citations = total.positive? && params[:doi].present? &&  aggregations.include?("citations_aggregations") ? facet_citations_by_dois(response.response.aggregations.citations.dois.buckets) : nil
+    citations = params[:doi].present? ? EventsQuery.new.citations(params[:doi]) : []
     references = total.positive? && params[:doi].present? &&  aggregations.include?("citations_aggregations") ? facet_citations_by_dois(response.response.aggregations.references.dois.buckets) : nil
     relations = total.positive? && params[:doi].present? &&  aggregations.include?("citations_aggregations") ? facet_citations_by_dois(response.response.aggregations.relations.dois.buckets) : nil
     views_histogram = total.positive? && aggregations.include?("metrics_aggregations") ? facet_counts_by_year_month(response.response.aggregations.views_histogram) : nil

app/graphql/types/metric_interface.rb

@@ -29,8 +29,7 @@ def download_count
   end
 
   def citation_count
-    meta = citations_aggs
-    meta.first.fetch("total", {}).fetch("value", nil) if meta.any?
+    EventsQuery.new.doi_citations(doi_from_url(object.identifier))
   end
 
   def reference_count

app/queries/events_query.rb

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+class EventsQuery
+
+  include Facetable
+
+  ACTIVE_RELATION_TYPES = [
+    "cites",
+    "is-supplement-to",
+    "references"
+  ]
+
+  PASSIVE_RELATION_TYPES = [
+     "is-cited-by",
+     "is-supplemented-by",
+     "is-referenced-by"
+  ]
+
+  def initialize()
+  end
+
+  def doi_citations(doi)
+    pid = Event.new.normalize_doi(doi)
+    query = "(subj_id:\"#{pid}\" AND (relation_type_id:#{PASSIVE_RELATION_TYPES.join(' OR relation_type_id:')})) OR (obj_id:\"#{pid}\" AND (relation_type_id:#{ACTIVE_RELATION_TYPES.join(' OR relation_type_id:')}))"
+    results = Event.query(query, doi:doi, aggregations: "citation_count_aggregation", page: { size: 1, cursor: [] }).response.aggregations.citations.buckets
+    results.any? ? results.first.total.value : 0
+  end
+
+  def citations(doi)
+    doi.downcase.split(",").map do |item|
+      { id: item, count: EventsQuery.new.doi_citations(item) }
+    end
+  end
+end

spec/queries/events_query_spec.rb

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+require "rails_helper"
+
+describe EventsQuery, elasticsearch: true do
+
+  context "citation events" do
+    let!(:event) { create(:event_for_datacite_related,  subj_id:"http://doi.org/10.0260/co.2004960.v2", obj_id:"http://doi.org/10.0260/co.2004960.v1") }
+    let!(:event_references) { create_list(:event_for_datacite_related, 3, obj_id:"10.5061/dryad.47sd5/2", relation_type_id: "references") }
+    let!(:copies) { create(:event_for_datacite_related,  subj_id:"http://doi.org/10.0260/co.2004960.v2", obj_id:"http://doi.org/10.0260/co.2004960.v1", relation_type_id: "cites") }
+
+    before do
+      Event.import
+      sleep 1
+    end
+
+    it "doi_citations" do
+      expect(EventsQuery.new.doi_citations("10.0260/co.2004960.v1")).to eq(1)
+    end
+
+    it "doi_citations wiht 0 citations" do
+      expect(EventsQuery.new.doi_citations("10.5061/dryad.dd47sd5/1")).to eq(0)
+    end
+
+    it "citations" do
+      results = EventsQuery.new.citations("10.5061/dryad.47sd5/1,10.5061/dryad.47sd5/2,10.0260/co.2004960.v1")
+      citations = results.select { |item| item[:id] == "10.5061/dryad.47sd5/2" }.first
+      no_citations = results.select { |item| item[:id] == "10.5061/dryad.47sd5/1" }.first
+      expect(citations[:count]).to eq(3)
+      expect(no_citations[:count]).to eq(0)
+    end
+  end
+end