Filter for synonym tags by presence of merger_id

Author: metallicity

app/models/search/tag_indexer.rb

@@ -69,8 +69,7 @@ def document(object)
       has_posted_works: object.has_posted_works?,
       tag_type: object.type,
       uses: object.taggings_count_cache,
-      unwrangled: object.unwrangled?,
-      canonical_or_synonymous: object.synonymous? || object.canonical
+      unwrangled: object.unwrangled?
     ).merge(parent_data(object))
   end
 

app/models/search/tag_query.rb

@@ -15,8 +15,7 @@ def document_type
   def filters
     [
       type_filter,
-      canonical_filter,
-      canonical_or_synonymous_filter,
+      wrangling_status_filter,
       unwrangleable_filter,
       posted_works_filter,
       media_filter,
@@ -32,6 +31,7 @@ def filters
   def exclusion_filters
     [
       wrangled_filter
+      # wrangling_status_exclude_filter
     ].compact
   end
 
@@ -78,12 +78,19 @@ def type_filter
     { term: { tag_type: options[:type] } } if options[:type]
   end
 
-  def canonical_filter
-    term_filter(:canonical, bool_value(options[:canonical])) if options[:canonical].present?
-  end
-
-  def canonical_or_synonymous_filter
-    term_filter(:canonical_or_synonymous, bool_value(options[:canonical_or_synonymous])) if options[:canonical_or_synonymous].present?
+  def wrangling_status_filter
+    case options[:wrangling_status]
+    when "canonical"
+      return term_filter(:canonical, true)
+    when "noncanonical"
+      return term_filter(:canonical, false)
+    when "synonymous"
+      return [{ exists: { field: "merger_id" } }, term_filter(:canonical, false)]
+    when "canonical_synonymous"
+      return { bool: { should: [{ exists: { field: "merger_id" } }, term_filter(:canonical, true)] } }
+    when "noncanonical_nonsynonymous"
+      return [{ bool: { must_not: { exists: { field: "merger_id" } } } }, term_filter(:canonical, false)]
+    end
   end
 
   def unwrangleable_filter

app/models/search/tag_search_form.rb

@@ -25,7 +25,6 @@ class TagSearchForm
   def initialize(options={})
     @options = options
     set_fandoms
-    set_wrangling_status
     @searcher = TagQuery.new(@options.delete_if { |_, v| v.blank? })
   end
 
@@ -37,22 +36,6 @@ def search_results
     @searcher.search_results
   end
 
-  def set_wrangling_status
-    case @options[:wrangling_status]
-    when "canonical"
-      @options[:canonical] = "T"
-    when "noncanonical"
-      @options[:canonical] = "F"
-    when "synonymous"
-      @options[:canonical] = "F"
-      @options[:canonical_or_synonymous] = "T"
-    when "canonical_synonymous"
-      @options[:canonical_or_synonymous] = "T"
-    when "noncanonical_nonsynonymous"
-      @options[:canonical_or_synonymous] = "F"
-    end
-  end
-
   def set_fandoms
     return if @options[:fandoms].blank?
 

app/models/tag.rb

@@ -635,11 +635,6 @@ def has_posted_works?
     self.works.posted.any?
   end
 
-  # Returns true if a tag is a synonym of a canonical tag
-  def synonymous?
-    !self.canonical? && self.merger_id.present?
-  end
-
   # sort tags by name
   def <=>(another_tag)
     name.downcase <=> another_tag.name.downcase

spec/models/tag_spec.rb

@@ -342,24 +342,6 @@ def expect_tag_update_flag_in_redis_to_be(flag)
     end
   end
 
-  describe "synonymous?" do
-    it "is false for a canonical tag" do
-      tag = create(:freeform, canonical: true)
-      expect(tag.synonymous?).to be_falsey
-    end
-
-    it "is false for a non-canonical, non-synonymous tag" do
-      tag = create(:freeform, canonical: false)
-      expect(tag.synonymous?).to be_falsey
-    end
-
-    it "is true for a synonymous tag" do
-      canonical_tag = create(:freeform, canonical: true)
-      synonym_tag = create(:freeform, canonical: false, merger: canonical_tag)
-      expect(synonym_tag.synonymous?).to be_truthy
-    end
-  end
-
   describe "has_posted_works?" do
     before do
       create(:work, fandom_string: "love live,jjba")