don't override default import method. #288

datacite · Jun 9, 2019 · 0d60347 · 0d60347
1 parent ead1144
commit 0d60347
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 6 deletions.
diff --git a/app/models/activity.rb b/app/models/activity.rb
@@ -181,7 +181,7 @@ def self.query_aggregations
     {}
   end
 
-  def self.import(options={})
+  def self.import_by_ids(options={})
     from_id = (options[:from_id] || 1).to_i
     until_id = (options[:until_id] || Activity.maximum(:id)).to_i
 

diff --git a/app/models/doi.rb b/app/models/doi.rb
@@ -376,7 +376,7 @@ def self.find_by_id(ids, options={})
     })
   end
 
-  def self.import(options={})
+  def self.import_by_ids(options={})
     from_id = (options[:from_id] || 1).to_i
     until_id = (options[:until_id] || Doi.maximum(:id)).to_i
 

diff --git a/app/models/event.rb b/app/models/event.rb
@@ -287,7 +287,7 @@ def self.find_by_id(ids, options={})
     })
   end
 
-  def self.import(options={})
+  def self.import_by_ids(options={})
     from_id = (options[:from_id] || 1).to_i
     until_id = (options[:until_id] || Event.maximum(:id)).to_i
 

diff --git a/lib/tasks/activity.rake b/lib/tasks/activity.rake
@@ -19,6 +19,6 @@ namespace :activity do
     from_id = (ENV['FROM_ID'] || 1).to_i
     until_id = (ENV['UNTIL_ID'] || Activity.maximum(:id)).to_i
 
-    Activity.import(from_id: from_id, until_id: until_id)
+    Activity.import_by_ids(from_id: from_id, until_id: until_id)
   end
 end
diff --git a/lib/tasks/doi.rake b/lib/tasks/doi.rake
@@ -19,7 +19,7 @@ namespace :doi do
     from_id = (ENV['FROM_ID'] || 1).to_i
     until_id = (ENV['UNTIL_ID'] || Doi.maximum(:id)).to_i
 
-    Doi.import(from_id: from_id, until_id: until_id)
+    Doi.import_by_ids(from_id: from_id, until_id: until_id)
   end
 
   desc 'Import one DOI'

diff --git a/lib/tasks/event.rake b/lib/tasks/event.rake
@@ -19,6 +19,6 @@ namespace :event do
     from_id = (ENV['FROM_ID'] || 1).to_i
     until_id = (ENV['UNTIL_ID'] || Event.maximum(:id)).to_i
 
-    Event.import(from_id: from_id, until_id: until_id)
+    Event.import_by_ids(from_id: from_id, until_id: until_id)
   end
 end