From 20fb28ca264aedeb122430ce013d4f5f8d51bb0a Mon Sep 17 00:00:00 2001
From: Martin Fenner <martin.fenner@datacite.org>
Date: Sat, 7 Mar 2020 06:13:04 +0100
Subject: [PATCH] support index option for activities and events

---
 app/models/activity.rb | 10 ++++++++--
 app/models/event.rb    |  9 +++++++--
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/app/models/activity.rb b/app/models/activity.rb
index 1fbb763e3..f86045d75 100644
--- a/app/models/activity.rb
+++ b/app/models/activity.rb
@@ -61,7 +61,7 @@ def self.import_by_ids(options={})
 
     # get every id between from_id and end_id
     (from_id..until_id).step(500).each do |id|
-      ActivityImportByIdJob.perform_later(id: id)
+      ActivityImportByIdJob.perform_later(options.merge(id: id))
     end
 
     (from_id..until_id).to_a.length
@@ -71,7 +71,13 @@ def self.import_by_id(options={})
     return nil if options[:id].blank?
 
     id = options[:id].to_i
-    index = Rails.env.test? ? "activities-test" : self.inactive_index
+    index = if Rails.env.test?
+      "activities-test"
+    elsif options[:index].present?
+      options[:index]
+    else
+      self.inactive_index
+    end
     errors = 0
     count = 0
 
diff --git a/app/models/event.rb b/app/models/event.rb
index 8d38b8983..8f03f2707 100644
--- a/app/models/event.rb
+++ b/app/models/event.rb
@@ -255,7 +255,7 @@ def self.import_by_ids(options = {})
 
     # get every id between from_id and until_id
     (from_id..until_id).step(500).each do |id|
-      EventImportByIdJob.perform_later(id: id)
+      EventImportByIdJob.perform_later(options.merge(id: id))
       Rails.logger.info "Queued importing for events with IDs starting with #{id}." unless Rails.env.test?
     end
   end
@@ -264,8 +264,13 @@ def self.import_by_id(options = {})
     return nil unless options[:id].present?
 
     id = options[:id].to_i
-    index = Rails.env.test? ? "events-test" : self.inactive_index
+    index = if Rails.env.test?
       "events-test"
+    elsif options[:index].present?
+      options[:index]
+    else
+      self.inactive_index
+    end
     errors = 0
     count = 0