Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Search for fact-checks by multiple keywords regardless the order. #2012

Merged
merged 5 commits into from
Aug 28, 2024
+37 −2
Merged

Search for fact-checks by multiple keywords regardless the order. #2012

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1598516
Search by multiple keywords regardless the order.
caiosba Aug 28, 2024
1c75d6b
CV2-5129: apply same search for Explainer
melsawy Aug 28, 2024
5012694
CV2-5129: apply PR comment
melsawy Aug 28, 2024
0aef3e9
No need to split, strip, and join with websearch_to_tsquery
Aug 28, 2024
902189e
CV2-5129: fix CC
melsawy Aug 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions app/models/team.rb
View file
Open in desktop
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(["websearch_to_tsquery(?)", filters[:text].split(/\s+/).map(&:strip).join(' & ')]) # FIXME: May not work for all languages
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

My reading of the websearch_to_tsquery documentation is that we can simply use:
tsquery = Team.sanitize_sql_array(["websearch_to_tsquery(?)", filters[:text]])
and do not need to split, strip, and join. I've tried the unit test with this alternative and it passes. I'm building the full app to try it end-to-end.

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 Expand Up @@ -535,7 +539,11 @@ def filtered_fact_checks(filters = {})
query = query.where('fact_checks.report_status' => filters[:report_status].to_a.map(&:to_s)) unless filters[:report_status].blank?

# Filter by text
query = query.where('(fact_checks.title ILIKE ? OR fact_checks.url ILIKE ? OR fact_checks.summary ILIKE ?)', *["%#{filters[:text]}%"]*3) if filters[:text].to_s.size > 2
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
tsvector = "to_tsvector('simple', coalesce(title, '') || ' ' || coalesce(summary, '') || coalesce(url, ''))"
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
23 changes: 23 additions & 0 deletions test/models/team_2_test.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1527,4 +1527,27 @@ def setup
tbi.save!
assert_equal ['none', 'link_preview'], t.available_newsletter_header_types
end

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))
assert_equal 3, t.filtered_fact_checks.count
assert_equal 3, t.filtered_fact_checks(text: 'Test').count
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
Loading