diff --git a/lib/searchkick/record_indexer.rb b/lib/searchkick/record_indexer.rb index c73f786..ded1931 100644 --- a/lib/searchkick/record_indexer.rb +++ b/lib/searchkick/record_indexer.rb @@ -37,18 +37,10 @@ module Searchkick raise Searchkick::Error, "Active Job not found" end - if method_name - # TODO support Mongoid and NoBrainer and non-id primary keys - Searchkick::BulkReindexJob.perform_later( - class_name: record.class.name, - record_ids: [record.id.to_s], - method_name: method_name ? method_name.to_s : nil - ) - else - Searchkick::ReindexV2Job.perform_later(record.class.name, record.id.to_s) - end + Searchkick::ReindexV2Job.perform_later(record.class.name, record.id.to_s, method_name) else # bulk, true reindex_record(method_name) + index.refresh if refresh end end @@ -64,7 +56,7 @@ module Searchkick end else if method_name - index.update_record(record) + index.update_record(record, method_name) else index.store(record) end diff --git a/lib/searchkick/reindex_v2_job.rb b/lib/searchkick/reindex_v2_job.rb index bb1b0e2..bab9a8b 100644 --- a/lib/searchkick/reindex_v2_job.rb +++ b/lib/searchkick/reindex_v2_job.rb @@ -9,7 +9,7 @@ module Searchkick queue_as { Searchkick.queue_name } - def perform(klass, id) + def perform(klass, id, method_name = nil) model = klass.constantize record = begin @@ -26,7 +26,7 @@ module Searchkick record.id = id end - RecordIndexer.new(record).reindex(mode: true) + RecordIndexer.new(record).reindex(method_name, mode: true) end end end -- libgit2 0.21.0