Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
17 changes: 17 additions & 0 deletions app/models/card/searchable.rb
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,23 @@ module Card::Searchable
end
end

class_methods do
def mentioning_all(terms, user:)
query = combined_terms_fts_query(terms)
mentioning(query, user: user)
end

private

def combined_terms_fts_query(terms)
terms.map { |term| sanitize_fts_term(term) }.join(' AND ')
end

def sanitize_fts_term(term)
term.gsub('"', '""').then { |t| "\"#{t}\"*" }
end
end

def search_title
title
end
Expand Down
5 changes: 1 addition & 4 deletions app/models/filter.rb
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,7 @@ def cards
result = result.where(cards: { created_at: creation_window }) if creation_window
result = result.closed_at_window(closure_window) if closure_window
result = result.closed_by(closers) if closers.present?
result = terms.reduce(result) do |result, term|
result.mentioning(term, user: creator)
end

result = result.mentioning_all(terms, user: creator) if terms.present?
result.distinct
end
end
Expand Down
9 changes: 7 additions & 2 deletions test/controllers/cards_controller_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,13 @@ class CardsControllerTest < ActionDispatch::IntegrationTest
assert_response :success
end

test "filtered index" do
get cards_path(filters(:jz_assignments).as_params.merge(term: "haggis"))
test "filtered index with single term" do
get cards_path(filters(:jz_assignments).as_params.merge(terms: ["haggis"]))
assert_response :success
end

test "filtered index with several terms" do
get cards_path(filters(:jz_assignments).as_params.merge(terms: ["haggis", "other"]))
assert_response :success
end

Expand Down