Added inheritance option

Andrew
1 parent 3eac9fd5
Showing 7 changed files with 29 additions and 18 deletions Show diff stats
CHANGELOG.md
lib/searchkick/index.rb
lib/searchkick/index_options.rb
lib/searchkick/model.rb
lib/searchkick/query.rb
test/inheritance_test.rb
test/test_helper.rb
 ## 2.3.3 [unreleased]
 - Fixed `similar` for Elasticsearch 6
+- Added `inheritance` option
 - Added `_type` option
 - Fixed `Must specify fields to search` error when searching `*`
@@ -318,12 +318,14 @@ module Searchkick
       client.indices.analyze(body: {text: text}.merge(options), index: name)["tokens"].map { |t| t["token"] }
     end
-    def klass_document_type(klass)
-      @klass_document_type[klass] ||= begin
+    def klass_document_type(klass, inheritance = true)
+      @klass_document_type[[klass, inheritance]] ||= begin
         if klass.respond_to?(:document_type)
           klass.document_type
-        elsif klass.searchkick_klass.searchkick_options[:_type]
-          klass.searchkick_klass.searchkick_options[:_type]
+        elsif !inheritance && klass.searchkick_klass.searchkick_options[:_type]
+          type = klass.searchkick_klass.searchkick_options[:_type]
+          type = type.call if type.respond_to?(:call)
+          type
         else
           klass.model_name.to_s.underscore
         end
@@ -336,11 +338,11 @@ module Searchkick
       Searchkick.client
     end
-    def document_type(record)
+    def document_type(record, inheritance = false)
       if record.respond_to?(:search_document_type)
         record.search_document_type
       else
-        klass_document_type(record.class)
+        klass_document_type(record.class, inheritance)
       end
     end
@@ -388,6 +390,10 @@ module Searchkick
         end
       end
+      if !source.key?("type") && record.class.searchkick_klass.searchkick_options[:inheritance]
+        source["type"] = document_type(record, true)
+      end
+
       cast_big_decimal(source)
       source
@@ -277,6 +277,10 @@ module Searchkick
           mapping[field] = shape_options.merge(type: "geo_shape")
         end
+        if options[:inheritance]
+          mapping[:type] = keyword_mapping
+        end
+
         routing = {}
         if options[:routing]
           routing = {required: true}
@@ -2,7 +2,7 @@ module Searchkick
   module Model
     def searchkick(**options)
       unknown_keywords = options.keys - [:_all, :_type, :batch_size, :callbacks, :conversions, :default_fields,
-        :filterable, :geo_shape, :highlight, :ignore_above, :index_name, :index_prefix, :language,
+        :filterable, :geo_shape, :highlight, :ignore_above, :index_name, :index_prefix, :inheritance, :language,
         :locations, :mappings, :match, :merge_mappings, :routing, :searchable, :settings, :similarity,
         :special_characters, :stem_conversions, :suggest, :synonyms, :text_end,
         :text_middle, :text_start, :word, :wordnet, :word_end, :word_middle, :word_start]
@@ -12,6 +12,8 @@ module Searchkick
       Searchkick.models << self
+      options[:_type] ||= -> { searchkick_index.klass_document_type(self) } if options[:inheritance]
+
       class_eval do
         cattr_reader :searchkick_options, :searchkick_klass
@@ -449,8 +449,14 @@ module Searchkick
         # indices_boost
         set_boost_by_indices(payload)
+        # type when inheritance
+        where = (options[:where] || {}).dup
+        if searchkick_options[:inheritance] && (options[:type] || (klass != searchkick_klass && searchkick_index))
+          where[:type] = [options[:type] || klass].flatten.map { |v| searchkick_index.klass_document_type(v) }
+        end
+
         # filters
-        filters = where_filters(options[:where])
+        filters = where_filters(where)
         set_filters(payload, filters) if filters.any?
         # aggregations
@@ -480,7 +486,7 @@ module Searchkick
       end
       # type
-      if options[:type] || (klass != searchkick_klass && searchkick_index)
+      if !searchkick_options[:inheritance] && (options[:type] || (klass != searchkick_klass && searchkick_index))
         @type = [options[:type] || klass].flatten.map { |v| searchkick_index.klass_document_type(v) }
       end
@@ -17,8 +17,6 @@ class InheritanceTest &lt; Minitest::Test
   end
   def test_child_search
-    skip unless elasticsearch_below60?
-
     store_names ["Bear"], Dog
     store_names ["Bear"], Cat
     assert_equal 1, Dog.search("bear").size
@@ -31,16 +29,12 @@ class InheritanceTest &lt; Minitest::Test
   end
   def test_force_one_type
-    skip unless elasticsearch_below60?
-
     store_names ["Green Bear"], Dog
     store_names ["Blue Bear"], Cat
     assert_equal ["Blue Bear"], Animal.search("bear", type: [Cat]).map(&:name)
   end
   def test_force_multiple_types
-    skip unless elasticsearch_below60?
-
     store_names ["Green Bear"], Dog
     store_names ["Blue Bear"], Cat
     store_names ["Red Bear"], Animal
@@ -48,8 +42,6 @@ class InheritanceTest &lt; Minitest::Test
   end
   def test_child_autocomplete
-    skip unless elasticsearch_below60?
-
     store_names ["Max"], Cat
     store_names ["Mark"], Dog
     assert_equal ["Max"], Cat.search("ma", fields: [:name], match: :text_start).map(&:name)
@@ -505,7 +505,7 @@ end
 class Animal
   searchkick \
     default_fields: elasticsearch_below60? ? nil : [:name],
-    _type: elasticsearch_below60? ? nil : :animal,
+    inheritance: !elasticsearch_below60?,
     text_start: [:name],
     suggest: [:name],
     index_name: -> { "#{name.tableize}-#{Date.today.year}#{Searchkick.index_suffix}" },
1	## 2.3.3 [unreleased]	1	## 2.3.3 [unreleased]
2		2
3	- Fixed `similar` for Elasticsearch 6	3	- Fixed `similar` for Elasticsearch 6
		4	+- Added `inheritance` option
4	- Added `_type` option	5	- Added `_type` option
5	- Fixed `Must specify fields to search` error when searching `*`	6	- Fixed `Must specify fields to search` error when searching `*`
6		7
	@@ -505,7 +505,7 @@ end		@@ -505,7 +505,7 @@ end
505	class Animal	505	class Animal
506	searchkick \	506	searchkick \
507	default_fields: elasticsearch_below60? ? nil : [:name],	507	default_fields: elasticsearch_below60? ? nil : [:name],
508	- _type: elasticsearch_below60? ? nil : :animal,	508	+ inheritance: !elasticsearch_below60?,
509	text_start: [:name],	509	text_start: [:name],
510	suggest: [:name],	510	suggest: [:name],
511	index_name: -> { "#{name.tableize}-#{Date.today.year}#{Searchkick.index_suffix}" },	511	index_name: -> { "#{name.tableize}-#{Date.today.year}#{Searchkick.index_suffix}" },