No need to split, strip, and join with websearch_to_tsquery

meedan · Aug 28, 2024 · 0aef3e9 · 0aef3e9
1 parent 5012694
commit 0aef3e9
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/app/models/team.rb b/app/models/team.rb
@@ -496,7 +496,7 @@ def filtered_explainers(filters = {})
 
     # Filter by text
     if filters[:text].to_s.size > 2
-      tsquery = Team.sanitize_sql_array(["websearch_to_tsquery(?)", filters[:text].split(/\s+/).map(&:strip).join(' & ')]) # FIXME: May not work for all languages
+      tsquery = Team.sanitize_sql_array(["websearch_to_tsquery(?)", filters[:text]]) # FIXME: May not work for all languages
       tsvector = "to_tsvector('simple', coalesce(title, '') || ' ' || coalesce(url, '') || coalesce(description, ''))"
       query = query.where(Arel.sql("#{tsvector} @@ #{tsquery}"))
     end
@@ -540,7 +540,7 @@ def filtered_fact_checks(filters = {})
 
     # Filter by text
     if filters[:text].to_s.size > 2
-      tsquery = Team.sanitize_sql_array(["websearch_to_tsquery(?)", filters[:text].split(/\s+/).map(&:strip).join(' & ')]) # FIXME: May not work for all languages
+      tsquery = Team.sanitize_sql_array(["websearch_to_tsquery(?)", filters[:text]]) # FIXME: May not work for all languages
       tsvector = "to_tsvector('simple', coalesce(title, '') || ' ' || coalesce(summary, '') || coalesce(url, ''))"
       query = query.where(Arel.sql("#{tsvector} @@ #{tsquery}"))
     end

diff --git a/test/models/team_2_test.rb b/test/models/team_2_test.rb
@@ -1540,6 +1540,7 @@ def setup
     assert_equal 2, t.filtered_fact_checks(text: 'Foo Bar').count
     assert_equal 1, t.filtered_fact_checks(text: 'Foo Bar Bravo').count
     assert_equal 1, t.filtered_fact_checks(text: 'Foo Bar Alpha').count
+    assert_equal 0, t.filtered_fact_checks(text: 'Foo Bar Delta').count
     # Explainer
     create_explainer title: 'Some Other Test', team: t
     create_explainer title: 'Bar Bravo Foo Test', team: t
@@ -1549,5 +1550,6 @@ def setup
     assert_equal 2, t.filtered_explainers(text: 'Foo Bar').count
     assert_equal 1, t.filtered_explainers(text: 'Foo Bar Bravo').count
     assert_equal 1, t.filtered_explainers(text: 'Foo Bar Alpha').count
+    assert_equal 0, t.filtered_fact_checks(text: 'Foo Bar Delta').count
   end
 end