events are now accessed via elasticsearch

datacite · Jun 8, 2019 · 8baead3 · 8baead3
1 parent cb9ae87
commit 8baead3
Show file tree

Hide file tree

Showing 13 changed files with 17 additions and 17 deletions.
diff --git a/app/graphql/types/dataset_type.rb b/app/graphql/types/dataset_type.rb
@@ -8,7 +8,7 @@ class DatasetType < BaseObject
   end
 
   def usage_reports(**args)
-    ids = Event.query(nil, obj_id: object.id).fetch(:data, []).map do |e|
+    ids = Event.query(nil, obj_id: object.id).results.to_a.map do |e|
       e[:subj_id]
     end
     UsageReport.find_by_id(ids, page: { number: 1, size: args[:first] }).fetch(:data, [])

diff --git a/app/graphql/types/dataset_usage_report_connection_with_meta_type.rb b/app/graphql/types/dataset_usage_report_connection_with_meta_type.rb
@@ -7,6 +7,6 @@ class DatasetUsageReportConnectionWithMetaType < BaseConnection
   field :total_count, Integer, null: false, cache: true
 
   def total_count
-    Event.query(nil, obj_id: object.parent.id).dig(:meta, "total").to_i
+    Event.query(nil, obj_id: object.parent.id).results.total
   end
 end
diff --git a/app/graphql/types/event_data_edge.rb b/app/graphql/types/event_data_edge.rb
@@ -10,7 +10,7 @@ class EventDataEdge < GraphQL::Relay::Edge
 
   def event_data
     @event_data ||= begin
-      Event.query(nil, subj_id: self.node[:id], obj_id: self.parent[:id])[:data].first.to_h
+      Event.query(nil, subj_id: self.node[:id], obj_id: self.parent[:id]).results.first.to_h
     end
   end
 

diff --git a/app/graphql/types/funder_dataset_connection_with_meta_type.rb b/app/graphql/types/funder_dataset_connection_with_meta_type.rb
@@ -7,6 +7,6 @@ class FunderDatasetConnectionWithMetaType < BaseConnection
   field :total_count, Integer, null: false, cache: true
 
   def total_count
-    Event.query(nil, obj_id: object.parent[:id], citation_type: "Dataset-Funder").dig(:meta, "total").to_i
+    Event.query(nil, obj_id: object.parent[:id], citation_type: "Dataset-Funder").results.total
   end
 end
diff --git a/app/graphql/types/funder_publication_connection_with_meta_type.rb b/app/graphql/types/funder_publication_connection_with_meta_type.rb
@@ -7,6 +7,6 @@ class FunderPublicationConnectionWithMetaType < BaseConnection
   field :total_count, Integer, null: false, cache: true
 
   def total_count
-    Event.query(nil, obj_id: object.parent[:id], citation_type: "Funder-JournalArticle").dig(:meta, "total").to_i
+    Event.query(nil, obj_id: object.parent[:id], citation_type: "Funder-JournalArticle").results.total
   end
 end
diff --git a/app/graphql/types/funder_software_connection_with_meta_type.rb b/app/graphql/types/funder_software_connection_with_meta_type.rb
@@ -7,6 +7,6 @@ class FunderSoftwareConnectionWithMetaType < BaseConnection
   field :total_count, Integer, null: false, cache: true
 
   def total_count
-    Event.query(nil, obj_id: object.parent[:id], citation_type: "Funder-SoftwareSourceCode").dig(:meta, "total").to_i
+    Event.query(nil, obj_id: object.parent[:id], citation_type: "Funder-SoftwareSourceCode").results.total
   end
 end
diff --git a/app/graphql/types/funder_type.rb b/app/graphql/types/funder_type.rb
@@ -22,21 +22,21 @@ class FunderType < BaseObject
   end
 
   def datasets(**args)
-    ids = Event.query(nil, obj_id: object[:id], citation_type: "Dataset-Funder").fetch(:data, []).map do |e|
+    ids = Event.query(nil, obj_id: object[:id], citation_type: "Dataset-Funder").results.to_a.map do |e|
       doi_from_url(e[:subj_id])
     end
     ElasticsearchLoader.for(Doi).load_many(ids)
   end
 
   def publications(**args)
-    ids = Event.query(nil, obj_id: object[:id], citation_type: "Funder-ScholarlyArticle").fetch(:data, []).map do |e|
+    ids = Event.query(nil, obj_id: object[:id], citation_type: "Funder-ScholarlyArticle").results.to_a.map do |e|
       doi_from_url(e[:subj_id])
     end
     ElasticsearchLoader.for(Doi).load_many(ids)
   end
 
   def softwares(**args)
-    ids = Event.query(nil, obj_id: object[:id], citation_type: "Funder-SoftwareSourceCode").fetch(:data, []).map do |e|
+    ids = Event.query(nil, obj_id: object[:id], citation_type: "Funder-SoftwareSourceCode").results.to_a.map do |e|
       doi_from_url(e[:subj_id])
     end
     ElasticsearchLoader.for(Doi).load_many(ids)

diff --git a/app/graphql/types/researcher_dataset_connection_with_meta_type.rb b/app/graphql/types/researcher_dataset_connection_with_meta_type.rb
@@ -7,7 +7,7 @@ class ResearcherDatasetConnectionWithMetaType < BaseConnection
   field :total_count, Integer, null: false, cache: true
 
   def total_count
-    Event.query(nil, obj_id: https_to_http(object.parent[:id]), citation_type: "Dataset-Person").dig(:meta, "total").to_i
+    Event.query(nil, obj_id: https_to_http(object.parent[:id]), citation_type: "Dataset-Person").results.total
   end
 
   def https_to_http(url)

diff --git a/app/graphql/types/researcher_publication_connection_with_meta_type.rb b/app/graphql/types/researcher_publication_connection_with_meta_type.rb
@@ -7,7 +7,7 @@ class ResearcherPublicationConnectionWithMetaType < BaseConnection
   field :total_count, Integer, null: false, cache: true
 
   def total_count
-    Event.query(nil, obj_id: https_to_http(object.parent[:id]), citation_type: "Person-ScholarlyArticle").dig(:meta, "total").to_i
+    Event.query(nil, obj_id: https_to_http(object.parent[:id]), citation_type: "Person-ScholarlyArticle").results.total
   end
 
   def https_to_http(url)

diff --git a/app/graphql/types/researcher_software_connection_with_meta_type.rb b/app/graphql/types/researcher_software_connection_with_meta_type.rb
@@ -7,7 +7,7 @@ class ResearcherSoftwareConnectionWithMetaType < BaseConnection
   field :total_count, Integer, null: false, cache: true
 
   def total_count
-    Event.query(nil, obj_id: https_to_http(object.parent[:id]), citation_type: "Person-SoftwareSourceCode").dig(:meta, "total").to_i
+    Event.query(nil, obj_id: https_to_http(object.parent[:id]), citation_type: "Person-SoftwareSourceCode").results.total
   end
 
   def https_to_http(url)

diff --git a/app/graphql/types/researcher_type.rb b/app/graphql/types/researcher_type.rb
@@ -26,21 +26,21 @@ def id
   end
 
   def datasets(**args)
-    ids = Event.query(nil, obj_id: https_to_http(object[:id]), citation_type: "Dataset-Person").fetch(:data, []).map do |e|
+    ids = Event.query(nil, obj_id: https_to_http(object[:id]), citation_type: "Dataset-Person").results.to_a.map do |e|
       doi_from_url(e[:subj_id])
     end
     ElasticsearchLoader.for(Doi).load_many(ids)
   end
 
   def publications(**args)
-    ids = Event.query(nil, obj_id: https_to_http(object[:id]), citation_type: "Person-ScholarlyArticle").fetch(:data, []).map do |e|
+    ids = Event.query(nil, obj_id: https_to_http(object[:id]), citation_type: "Person-ScholarlyArticle").results.to_a.map do |e|
       doi_from_url(e[:subj_id])
     end
     ElasticsearchLoader.for(Doi).load_many(ids)
   end
 
   def softwares(**args)
-    ids = Event.query(nil, obj_id: https_to_http(object[:id]), citation_type: "Person-SoftwareSourceCode").fetch(:data, []).map do |e|
+    ids = Event.query(nil, obj_id: https_to_http(object[:id]), citation_type: "Person-SoftwareSourceCode").results.to_a.map do |e|
       doi_from_url(e[:subj_id])
     end
     ElasticsearchLoader.for(Doi).load_many(ids)

diff --git a/app/graphql/types/usage_report_dataset_connection_with_meta_type.rb b/app/graphql/types/usage_report_dataset_connection_with_meta_type.rb
@@ -7,6 +7,6 @@ class UsageReportDatasetConnectionWithMetaType < BaseConnection
   field :total_count, Integer, null: false, cache: true
 
   def total_count
-    Event.query(nil, subj_id: object.parent[:id]).dig(:meta, "total").to_i
+    Event.query(nil, subj_id: object.parent[:id]).results.total
   end
 end
diff --git a/app/graphql/types/usage_report_type.rb b/app/graphql/types/usage_report_type.rb
@@ -12,7 +12,7 @@ class UsageReportType < BaseObject
   end
 
   def datasets(**args)
-    ids = Event.query(nil, subj_id: object[:id]).fetch(:data, []).map do |e|
+    ids = Event.query(nil, subj_id: object[:id]).results.to_a.map do |e|
       doi_from_url(e[:obj_id])
     end
     ElasticsearchLoader.for(Doi).load_many(ids)