Skip to content

Fix position validation error when editing stratified sortitions with imported participants #23

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
RubenBlazquez merged 3 commits into from
Mar 9, 2026
Merged

Fix position validation error when editing stratified sortitions with imported participants #23

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5d43628
Fix false positive position
RubenBlazquez Mar 5, 2026
9a96998
Update line too long
RubenBlazquez Mar 5, 2026
4154c02
Fix lint
RubenBlazquez Mar 5, 2026
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
8 changes: 6 additions & 2 deletions app/forms/decidim/stratified_sortitions/admin/stratified_sortitions_form.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,9 @@ def validate_strata_attributes

errors.add(:strata, :cannot_change_stratum_kind_with_sample_participants) if existing_stratum.kind != stratum_form.kind

errors.add(:strata, :cannot_change_stratum_position_with_sample_participants) if existing_stratum.position != stratum_form.position.to_i
if existing_stratum.position.present? && existing_stratum.position != stratum_form.position.to_i
errors.add(:strata, :cannot_change_stratum_position_with_sample_participants)
end
end
end

Expand Down Expand Up @@ -119,7 +121,9 @@ def validate_substrata_attributes(existing_stratum, stratum_form)
errors.add(:strata, :cannot_change_substratum_range_with_sample_participants)
end

errors.add(:strata, :cannot_change_substratum_position_with_sample_participants) if existing_substratum.position != substratum_form.position.to_i
if existing_substratum.position.present? && existing_substratum.position != substratum_form.position.to_i
errors.add(:strata, :cannot_change_substratum_position_with_sample_participants)
end
end
end

Expand Down
15 changes: 15 additions & 0 deletions spec/forms/decidim/sortitions/admin/stratified_sortitions_form_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,6 +227,21 @@ module Admin

include_examples "blocks the change with error", "cannot_change_substratum_position_with_sample_participants"
end

context "when substratum position is nil in DB and form sends a position" do
let!(:substratum) { create(:substratum, stratum:, name: { en: "18-25" }, value: "young", range: nil, position: nil, max_quota_percentage: "10") }
let(:stratum_params) { base_stratum_params.merge(substrata: { substratum.id.to_s => base_substratum_params.merge(position: 0) }) }

include_examples "allows the change"
end
end

context "when stratum position is nil in DB and form sends a position" do
let!(:stratum) { create(:stratum, stratified_sortition:, name: { en: "Age" }, kind: "value", position: nil) }
let!(:substratum) { create(:substratum, stratum:, name: { en: "18-25" }, value: "young", range: nil, position: 0, max_quota_percentage: "10") }
let(:stratum_params) { base_stratum_params.merge(position: 0) }

include_examples "allows the change"
end
end
end
Expand Down
Loading