Merge branch 'master' of https://github.com/datacite/lupo

app/jobs/event_registrant_update_by_id_job.rb

@@ -12,22 +12,28 @@ def perform(id, options={})
 
     item = Event.where(uuid: id).first
     return false unless item.present?
-    logger.info "djdjdj"
-    logger.info id
-    logger.info item.source_id
+
 
 
     case item.source_id 
     when "datacite-crossref"
-      registrant_id = get_crossref_member_id(item.obj_id) if get_doi_ra(item.obj_id) == "Crossref"
+      registrant_id = cached_get_crossref_member_id(item.obj_id) if cached_get_doi_ra(item.obj_id) == "Crossref"
       logger.info registrant_id
+      if registrant_id == "crossref.citations" 
+        sleep(0.50)
+        registrant_id = get_crossref_member_id(item.obj_id)
+      end
 
       obj = item.obj.merge("registrant_id" => registrant_id) unless registrant_id.nil?
       logger.info obj
       item.update_attributes(obj: obj) if obj.present?
     when "crossref"
-      registrant_id = get_crossref_member_id(item.subj) if get_doi_ra(item.subj) == "Crossref"
+      registrant_id = cached_get_crossref_member_id(item.subj_id) if cached_get_doi_ra(item.subj_id) == "Crossref"
       logger.info registrant_id
+      if registrant_id == "crossref.citations" 
+        sleep(0.50)
+        registrant_id = get_crossref_member_id(item.subj_id)
+      end
 
       subj = item.subj.merge("registrant_id" => registrant_id) unless registrant_id.nil?
       logger.info subj
@@ -44,7 +50,7 @@ def get_crossref_member_id(id, options={})
     # return "crossref.citations" unless doi.present?
 
     url = "https://api.crossref.org/works/#{Addressable::URI.encode(doi)}[email protected]"	
-    sleep(0.01) # to avoid crossref rate limitting
+    sleep(0.24) # to avoid crossref rate limitting
     response =  Maremma.get(url, host: true)	
     logger.info "[Crossref Response] [#{response.status}] for DOI #{doi} metadata"
     return "" if response.status == 404  ### for cases when DOI is not in the crossreaf api 
@@ -55,6 +61,20 @@ def get_crossref_member_id(id, options={})
     "crossref.#{message["member"]}"
   end 
 
+  def cached_get_doi_ra(doi)
+    Rails.cache.fetch("ras/#{doi}") do
+      puts "#{doi} [RA] did not find key in cache, executing block ..."
+      get_doi_ra(doi)
+    end
+  end
+
+  def cached_get_crossref_member_id(doi)
+    Rails.cache.fetch("members_ids/#{doi}") do
+      puts "#{doi} [Crossref Member] did not find key in cache, executing block ..."
+      get_crossref_member_id(doi)
+    end
+  end
+
   def get_doi_ra(doi)
     prefix = validate_prefix(doi)
     return nil if prefix.blank?

app/models/event.rb

@@ -453,15 +453,17 @@ def self.update_registrant(options={})
     size = (options[:size] || 1000).to_i
     cursor = (options[:cursor] || [])
     # ra = options[:ra] || "crossref"
-    source_id = "datacite-crossref,crossref"
+    source_id = options[:source_id] || "datacite-crossref,crossref"
+    citation_type = options[:citation_type] || "Dataset-ScholarlyArticle"
+    query = options[:query] || "registrant_id:*crossref.citations"
 
-    response = Event.query(nil, source_id: source_id, page: { size: 1, cursor: cursor })
+    response = Event.query(query, source_id: source_id, citation_type: citation_type, page: { size: 1, cursor: cursor })
     logger.info "[Update] #{response.results.total} events for sources #{source_id}."
 
     # walk through results using cursor
     if response.results.total > 0
       while response.results.results.length > 0 do
-        response = Event.query(nil, source_id: source_id, page: { size: size, cursor: cursor })
+        response = Event.query(query, source_id: source_id, citation_type: citation_type, page: { size: size, cursor: cursor })
         break unless response.results.results.length > 0
 
         logger.info "[Update] Updating #{response.results.results.length} #{source_id} events starting with _id #{response.results.to_a.first[:_id]}."