Skip to content

Commit

Permalink
CV2-5129: apply same search for Explainer
Browse files Browse the repository at this point in the history
  • Loading branch information
melsawy committed Aug 28, 2024
1 parent 1598516 commit 1c75d6b
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 2 deletions.
6 changes: 5 additions & 1 deletion app/models/team.rb
Original file line number Diff line number Diff line change
Expand Up @@ -495,7 +495,11 @@ def filtered_explainers(filters = {})
query = query.where(updated_at: Range.new(*format_times_search_range_filter(JSON.parse(filters[:updated_at]), nil))) unless filters[:updated_at].blank?

# Filter by text
query = query.where('(title ILIKE ? OR url ILIKE ? OR description ILIKE ?)', *["%#{filters[:text]}%"]*3) if filters[:text].to_s.size > 2
if filters[:text].to_s.size > 2
tsquery = Team.sanitize_sql_array(["to_tsquery(?)", filters[:text].split(/\s+/).map(&:strip).join(' & ')]) # 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

# Exclude the ones already applied to a target item
target = ProjectMedia.find_by_id(filters[:target_id].to_i)
Expand Down
12 changes: 11 additions & 1 deletion test/models/team_2_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -1528,9 +1528,10 @@ def setup
assert_equal ['none', 'link_preview'], t.available_newsletter_header_types
end

test "should search for fact-checks by keywords" do
test "should search for fact-checks and explainers by keywords" do
Sidekiq::Testing.fake!
t = create_team
# Fact-checks
create_fact_check title: 'Some Other Test', claim_description: create_claim_description(project_media: create_project_media(team: t))
create_fact_check title: 'Bar Bravo Foo Test', claim_description: create_claim_description(project_media: create_project_media(team: t))
create_fact_check title: 'Foo Alpha Bar Test', claim_description: create_claim_description(project_media: create_project_media(team: t))
Expand All @@ -1539,5 +1540,14 @@ 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
# Explainer
create_explainer title: 'Some Other Test', team: t
create_explainer title: 'Bar Bravo Foo Test', team: t
create_explainer title: 'Foo Alpha Bar Test', team: t
assert_equal 3, t.filtered_explainers.count
assert_equal 3, t.filtered_explainers(text: 'Test').count
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
end
end

0 comments on commit 1c75d6b

Please sign in to comment.