Skip to content

Fix #15: Include stateless proposals and exclude only rejected ones. #21

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

Open
Amilton-Portraite wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix #15: Include stateless proposals and exclude only rejected ones. #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 9 additions & 1 deletion app/services/decidim/chatbot/workflows/proposals_workflow.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,15 @@ def component
end

def proposals
@proposals ||= Decidim::Proposals::Proposal.where(component:).published.except_rejected.only_amendables
@proposals ||= Decidim::Proposals::Proposal
.where(component: component)
.published
.only_amendables
.left_joins(:proposal_state)
.where(
"decidim_proposals_proposal_states.token != 'rejected' " \
"OR decidim_proposals_proposal_states.token IS NULL"
)
end

def commentable_id
Expand Down
15 changes: 15 additions & 0 deletions spec/services/workflows/proposals_workflow_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,21 @@ module Workflows
end
end

def proposals
@proposals ||= begin
base = Decidim::Proposals::Proposal
.where(decidim_component_id: component.id)
.published
.only_amendables

base.left_joins(:proposal_state)
.where(
"decidim_proposals_proposal_states.token != 'rejected' " \
"OR decidim_proposals_proposal_states.token IS NULL"
)
end
end

context "when there are exactly per_page proposals" do
let!(:proposals) do
create_list(:proposal, 10, :evaluating, component: proposals_component, published_at: Time.current)
Expand Down