don't use source_id for usage report events. #260

datacite · May 17, 2019 · ce9f5ce · ce9f5ce
1 parent d697d5f
commit ce9f5ce
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
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], source_id: "datacite-usage").dig(:meta, "total").to_i
+    Event.query(nil, subj_id: object.parent[:id]).dig(:meta, "total").to_i
   end
 end
diff --git a/app/graphql/types/usage_report_type.rb b/app/graphql/types/usage_report_type.rb
@@ -11,9 +11,16 @@ class UsageReportType < BaseObject
   end
 
   def datasets(**args)
-    ids = Event.query(nil, subj_id: object[:id], source_id: "datacite-usage").fetch(:data, []).map do |e|
+    ids = Event.query(nil, subj_id: object[:id]).fetch(:data, []).map do |e|
       doi_from_url(e[:obj_id])
     end
     ElasticsearchLoader.for(Doi).load_many(ids)
   end
+
+  def doi_from_url(url)
+    if /\A(?:(http|https):\/\/(dx\.)?(doi.org|handle.test.datacite.org)\/)?(doi:)?(10\.\d{4,5}\/.+)\z/.match?(url)
+      uri = Addressable::URI.parse(url)
+      uri.path.gsub(/^\//, "").downcase
+    end
+  end
 end