github / searchkick

Download as
Browse Code ยป

Commit 22fe3a0a64a2b3ba5016b26d46019ff7a2c8e9f6

Authored by Andrew
1 parent 16ea9723
Exists in master and in 19 other branches allow_missing, conversions_period, conversions_v2, eager_load, find_in_batches, highlighted, index_name, lazy_index_name, less_deps, nested, reindex_refactor, relation, relation_search, routing_queue, scope_attributes, search_as_you_type, synonyms_ci, test_language, wildcard

Fixed tests

Showing 2 changed files with 5 additions and 13 deletions   Show diff stats
lib/searchkick/record_indexer.rb
  Diff comments   View file @22fe3a0
... ... @@ -37,18 +37,10 @@ module Searchkick
37 37 raise Searchkick::Error, "Active Job not found"
38 38 end
39 39  
40   - if method_name
41   - # TODO support Mongoid and NoBrainer and non-id primary keys
42   - Searchkick::BulkReindexJob.perform_later(
43   - class_name: record.class.name,
44   - record_ids: [record.id.to_s],
45   - method_name: method_name ? method_name.to_s : nil
46   - )
47   - else
48   - Searchkick::ReindexV2Job.perform_later(record.class.name, record.id.to_s)
49   - end
  40 + Searchkick::ReindexV2Job.perform_later(record.class.name, record.id.to_s, method_name)
50 41 else # bulk, true
51 42 reindex_record(method_name)
  43 +
52 44 index.refresh if refresh
53 45 end
54 46 end
... ... @@ -64,7 +56,7 @@ module Searchkick
64 56 end
65 57 else
66 58 if method_name
67   - index.update_record(record)
  59 + index.update_record(record, method_name)
68 60 else
69 61 index.store(record)
70 62 end
... ...
lib/searchkick/reindex_v2_job.rb
  Diff comments   View file @22fe3a0
... ... @@ -9,7 +9,7 @@ module Searchkick
9 9  
10 10 queue_as { Searchkick.queue_name }
11 11  
12   - def perform(klass, id)
  12 + def perform(klass, id, method_name = nil)
13 13 model = klass.constantize
14 14 record =
15 15 begin
... ... @@ -26,7 +26,7 @@ module Searchkick
26 26 record.id = id
27 27 end
28 28  
29   - RecordIndexer.new(record).reindex(mode: true)
  29 + RecordIndexer.new(record).reindex(method_name, mode: true)
30 30 end
31 31 end
32 32 end
... ...