Skip to content

Fix decklist filtering error #405

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

Merged
merged 4 commits into from
Jul 27, 2025
Merged

Fix decklist filtering error #405

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f4e7251
Fix decklist filtering error
migueldlr Jul 26, 2025
b87e4d9
Re-add missing end
migueldlr Jul 26, 2025
bcee272
Fix tests
migueldlr Jul 26, 2025
63f1115
Merge branch 'main' into migueldlr/decklist-filtering
migueldlr Jul 27, 2025
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
2 changes: 1 addition & 1 deletion app/controllers/decklists_controller.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
class DecklistsController < ApplicationController
def index
add_total_stat(params)
base_scope = Decklist.includes(:identity_card, :cards)
base_scope = Decklist.preload(:identity_card, :cards)
decklists = DecklistResource.all(params, base_scope)
respond_with(decklists)
end
Expand Down
20 changes: 20 additions & 0 deletions spec/resources/decklist_resource_reads_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,26 @@
end
end

context 'with card_id and faction_id combined' do
it 'returns a result with matching card_id and faction_id' do
params[:filter] = { card_id: { eq: 'pennyshaver' }, faction_id: { eq: 'criminal' } }
render
expect(d.size).to eq(1)
end

it 'returns no results when faction_id does not match' do
params[:filter] = { card_id: { eq: 'pennyshaver' }, faction_id: { eq: 'shaper' } }
render
expect(d.size).to eq(0)
end

it 'returns a result with matching exclude_card_id and faction_id' do
params[:filter] = { exclude_card_id: { eq: 'hermes' }, faction_id: { eq: 'criminal' } }
render
expect(d.size).to eq(1)
end
end

context 'with exclude_card_id' do
let!(:corp_decklist) { Decklist.find('11111111-1111-1111-1111-111111111111') }
let!(:runner_decklist) { Decklist.find('22222222-2222-2222-2222-222222222222') }
Expand Down