From 7bc3d4b7bc28d210e75d72257dfb170160c93de0 Mon Sep 17 00:00:00 2001
From: Andrew Kane <andrew@ankane.org>
Date: Sun, 20 Feb 2022 01:40:50 -0800
Subject: [PATCH] Improved split [skip ci]

---
 lib/searchkick/bulk_record_indexer.rb |  6 ++----
 lib/searchkick/process_batch_job.rb   | 11 +++++++++--
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/lib/searchkick/bulk_record_indexer.rb b/lib/searchkick/bulk_record_indexer.rb
index 57f83ac..e3793d0 100644
--- a/lib/searchkick/bulk_record_indexer.rb
+++ b/lib/searchkick/bulk_record_indexer.rb
@@ -31,10 +31,8 @@ module Searchkick
       end
     end
 
-    # TODO figure out better place for logic
-    def import_queue(klass, record_ids)
-      # separate routing from id
-      routing = Hash[record_ids.map { |r| r.split(/(?<!\|)\|(?!\|)/, 2).map { |v| v.gsub("||", "|") } }]
+    def reindex_items(klass, items)
+      routing = items.to_h { |r| [r[:id], r[:routing]] }
       record_ids = routing.keys
 
       scope = Searchkick.load_records(klass, record_ids)
diff --git a/lib/searchkick/process_batch_job.rb b/lib/searchkick/process_batch_job.rb
index 8c7ecf7..ef5db57 100644
--- a/lib/searchkick/process_batch_job.rb
+++ b/lib/searchkick/process_batch_job.rb
@@ -5,8 +5,15 @@ module Searchkick
     def perform(class_name:, record_ids:, index_name: nil)
       klass = class_name.constantize
       index = klass.searchkick_index(name: index_name)
-      # TODO move import_queue logic
-      index.send(:bulk_record_indexer).import_queue(klass, record_ids)
+
+      items =
+        record_ids.map do |r|
+          parts = r.split(/(?<!\|)\|(?!\|)/, 2)
+            .map { |v| v.gsub("||", "|") }
+          {id: parts[0], routing: parts[1]}
+        end
+
+      index.send(:bulk_record_indexer).reindex_items(klass, items)
     end
   end
 end
--
libgit2 0.21.0