Skip to content

Commit

Permalink
Do not display unpublished spaces in linked spaces
Browse files Browse the repository at this point in the history
* Do not display unpublished spaces in linked spaces

* implement review recommendations
  • Loading branch information
alecslupu committed Feb 6, 2023
1 parent 05b32fd commit b99274c
Show file tree
Hide file tree
Showing 3 changed files with 33 additions and 2 deletions.
14 changes: 14 additions & 0 deletions decidim-assemblies/spec/commands/create_assembly_spec.rb
Expand Up @@ -204,6 +204,20 @@ module Decidim::Assemblies
expect(linked_processes.first).to eq(process_two)
end
end

context "when linking draft processes" do
let!(:process_one) { create :participatory_process, :unpublished, organization: organization, weight: 2 }
let!(:process_two) { create :participatory_process, organization: organization, weight: 1 }
let(:related_process_ids) { [process_one.id, process_two.id] }

it "links processes in right way" do
subject.call

linked_processes = assembly.linked_participatory_space_resources(:participatory_process, "included_participatory_processes")
expect(linked_processes.size).to eq(1)
expect(linked_processes.first).to eq(process_two)
end
end
end
end
end
19 changes: 18 additions & 1 deletion decidim-conferences/spec/commands/create_conference_spec.rb
Expand Up @@ -165,13 +165,30 @@ module Decidim::Conferences
expect(linked_processes.first).to eq(consultation_two)
end

it "sorts by weigth" do
it "sorts by weight" do
subject.call

linked_processes = conference.linked_participatory_space_resources(:participatory_process, "included_participatory_processes")
expect(linked_processes.first).to eq(process_two)
end
end

context "when linking unpublished linked_participatory_space_resources" do
let!(:process_one) { create :participatory_process, :unpublished, organization: organization, weight: 2 }
let!(:process_two) { create :participatory_process, organization: organization, weight: 1 }
let(:related_process_ids) { [process_one.id, process_two.id] }
let!(:consultation_one) { create :consultation, :unpublished, organization: organization }
let!(:consultation_two) { create :consultation, organization: organization }
let(:related_consultation_ids) { [consultation_one.id, consultation_two.id] }

it "does not include unpublished meetings" do
subject.call

linked_processes = conference.linked_participatory_space_resources("Consultations", "included_consultations")
expect(linked_processes.first).to eq(consultation_two)
expect(linked_processes.size).to eq(1)
end
end
end
end
end
Expand Up @@ -47,7 +47,7 @@ def linked_participatory_space_resources(resource_name, link_name)
.joins(:participatory_space_resource_links_to)
.where(decidim_participatory_space_links: { name: link_name, from_id: id, from_type: self.class.name })

query = klass.where(id: from).or(klass.where(id: to))
query = klass.where(id: from).or(klass.where(id: to)).published

if klass.column_names.include?("weight")
query.order(:weight)
Expand Down

0 comments on commit b99274c

Please sign in to comment.