decidim-elections 0.27.8 → 0.28.0.rc4

data/lib/decidim/votings/participatory_space.rb

@@ -3,12 +3,15 @@
 Decidim.register_participatory_space(:votings) do |participatory_space|
   participatory_space.icon = "media/images/decidim_votings.svg"
   participatory_space.model_class_name = "Decidim::Votings::Voting"
+  participatory_space.content_blocks_scope_name = "voting_landing_page"
   participatory_space.permissions_class_name = "Decidim::Votings::Permissions"
   participatory_space.stylesheet = "decidim/votings/votings"
   participatory_space.query_type = "Decidim::Votings::VotingType"
 
+  participatory_space.breadcrumb_cell = "decidim/votings/voting_dropdown_metadata"
+
   participatory_space.participatory_spaces do |organization|
-    Decidim::Votings::Voting.where(organization: organization)
+    Decidim::Votings::Voting.where(organization:)
   end
 
   participatory_space.register_resource(:voting) do |resource|
@@ -39,196 +42,9 @@ Decidim.register_participatory_space(:votings) do |participatory_space|
   end
 
   participatory_space.seeds do
-    organization = Decidim::Organization.first
-    seeds_root = File.join(__dir__, "..", "..", "..", "db", "seeds")
-
-    3.times do |n|
-      params = {
-        organization: organization,
-        title: Decidim::Faker::Localized.sentence(word_count: 5),
-        slug: Decidim::Faker::Internet.unique.slug(words: nil, glue: "-"),
-        description: Decidim::Faker::Localized.wrapped("<p>", "</p>") do
-          Decidim::Faker::Localized.paragraph(sentence_count: 3)
-        end,
-        scope: n.positive? ? nil : Decidim::Scope.reorder(Arel.sql("RANDOM()")).first,
-        banner_image: ActiveStorage::Blob.create_and_upload!(
-          io: File.open(File.join(seeds_root, "city.jpeg")),
-          filename: "banner_image.jpeg",
-          content_type: "image/jpeg",
-          metadata: nil
-        ), # Keep after organization
-        published_at: 2.weeks.ago,
-        start_time: n.weeks.from_now,
-        end_time: (n + 1).weeks.from_now + 4.hours,
-        voting_type: Decidim::Votings::Voting.voting_types.values.sample,
-        promoted: n.odd?
-      }
-
-      voting = Decidim.traceability.perform_action!(
-        "publish",
-        Decidim::Votings::Voting,
-        organization.users.first,
-        visibility: "all"
-      ) do
-        Decidim::Votings::Voting.create!(params)
-      end
-      voting.add_to_index_as_search_resource
-
-      unless voting.online_voting?
-        3.times do
-          params = {
-            voting: voting,
-            title: Decidim::Faker::Localized.sentence(word_count: 5),
-            address: Faker::Address.full_address,
-            latitude: Faker::Address.latitude,
-            longitude: Faker::Address.longitude,
-            location: Decidim::Faker::Localized.sentence,
-            location_hints: Decidim::Faker::Localized.sentence
-          }
-
-          polling_station = Decidim.traceability.create!(
-            Decidim::Votings::PollingStation,
-            organization.users.first,
-            params,
-            visibility: "all"
-          )
-
-          email = "voting_#{voting.id}_president_#{polling_station.id}@example.org"
-
-          user = Decidim::User.find_or_initialize_by(email: email)
-          user.update!(
-            name: Faker::Name.name,
-            nickname: Faker::Twitter.unique.screen_name,
-            password: "decidim123456789",
-            password_confirmation: "decidim123456789",
-            organization: organization,
-            confirmed_at: Time.current,
-            locale: I18n.default_locale,
-            tos_agreement: true
-          )
-
-          Decidim.traceability.create!(
-            Decidim::Votings::PollingOfficer,
-            organization.users.first,
-            {
-              voting: voting,
-              user: user,
-              presided_polling_station: polling_station
-            },
-            visibility: "all"
-          )
-        end
-      end
-
-      landing_page_content_blocks = [:header, :description, :elections, :polling_stations, :attachments_and_folders, :stats, :metrics]
-
-      landing_page_content_blocks.each.with_index(1) do |manifest_name, index|
-        Decidim::ContentBlock.create(
-          organization: organization,
-          scope_name: :voting_landing_page,
-          manifest_name: manifest_name,
-          weight: index,
-          scoped_resource_id: voting.id,
-          published_at: Time.current
-        )
-      end
-
-      2.times do
-        Decidim::Category.create!(
-          name: Decidim::Faker::Localized.sentence(word_count: 5),
-          description: Decidim::Faker::Localized.wrapped("<p>", "</p>") do
-            Decidim::Faker::Localized.paragraph(sentence_count: 3)
-          end,
-          participatory_space: voting
-        )
-      end
+    require "decidim/votings/seeds"
 
-      Decidim.component_manifests.each do |manifest|
-        manifest.seed!(voting.reload)
-      end
-
-      unless voting.online_voting?
-        voting.reload.published_elections.finished.each do |election|
-          polling_officer = voting.polling_officers.sample
-          ps_closure = Decidim::Votings::PollingStationClosure.create!(
-            election: election,
-            polling_officer: polling_officer,
-            polling_station: polling_officer.polling_station,
-            signed_at: Time.current,
-            phase: :complete
-          )
-
-          valid_ballots = Faker::Number.number(digits: 3)
-          Decidim::Elections::Result.create!(
-            value: valid_ballots,
-            closurable: ps_closure,
-            question: nil,
-            answer: nil,
-            result_type: :valid_ballots
-          )
-
-          null_ballots = Faker::Number.number(digits: 1)
-          Decidim::Elections::Result.create!(
-            value: null_ballots,
-            closurable: ps_closure,
-            question: nil,
-            answer: nil,
-            result_type: :null_ballots
-          )
-
-          blank_ballots = Faker::Number.number(digits: 2)
-          Decidim::Elections::Result.create!(
-            value: blank_ballots,
-            closurable: ps_closure,
-            question: nil,
-            answer: nil,
-            result_type: :blank_ballots
-          )
-
-          Decidim::Elections::Result.create!(
-            value: valid_ballots + null_ballots + blank_ballots,
-            closurable: ps_closure,
-            question: nil,
-            answer: nil,
-            result_type: :total_ballots
-          )
-
-          election.questions.each do |question|
-            question_pending = valid_ballots
-            question.answers.shuffle.each do |answer|
-              answer_value = Faker::Number.between(from: 0, to: question_pending)
-              Decidim::Elections::Result.create!(
-                value: answer_value,
-                closurable: ps_closure,
-                question: question,
-                answer: answer,
-                result_type: :valid_answers
-              )
-              question_pending -= answer_value
-            end
-
-            next unless question.nota_option?
-
-            Decidim::Elections::Result.create!(
-              value: question_pending,
-              closurable: ps_closure,
-              question: question,
-              answer: nil,
-              result_type: :blank_answers
-            )
-          end
-        end
-      end
-
-      (1..2).each do |i|
-        ballot_style = voting.ballot_styles.create!(code: "DISTRICT#{i}")
-        voting.elections.each do |election|
-          election.questions.sample(1 + rand(election.questions.count)).each do |question|
-            ballot_style.ballot_style_questions.create!(question: question)
-          end
-        end
-      end
-    end
+    Decidim::Votings::Seeds.new.call
   end
 end
 

data/lib/decidim/votings/polling_officer_zone_engine.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require "decidim/votings/polling_officer_zone_menu"
+
 module Decidim
   module Votings
     # This is the engine that runs on the public interface for polling officers of `decidim-elections`.
@@ -29,13 +31,7 @@ module Decidim
       end
 
       initializer "decidim_elections.polling_officer_zone.menu" do
-        Decidim.menu :user_menu do |menu|
-          menu.add_item :decidim_votings_polling_officer_zone,
-                        I18n.t("menu.polling_officer_zone", scope: "decidim.votings.polling_officer_zone"),
-                        decidim.decidim_votings_polling_officer_zone_path,
-                        active: :inclusive,
-                        if: Decidim::Votings::PollingOfficer.polling_officer?(current_user)
-        end
+        Decidim::Votings::PollingOfficerZoneMenu.register_user_menu!
       end
     end
   end

data/lib/decidim/votings/polling_officer_zone_menu.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Votings
+    class PollingOfficerZoneMenu
+      def self.register_user_menu!
+        Decidim.menu :user_menu do |menu|
+          menu.add_item :decidim_votings_polling_officer_zone,
+                        I18n.t("menu.polling_officer_zone", scope: "decidim.votings.polling_officer_zone"),
+                        decidim.decidim_votings_polling_officer_zone_path,
+                        active: :inclusive,
+                        if: Decidim::Votings::PollingOfficer.polling_officer?(current_user)
+        end
+      end
+    end
+  end
+end

data/lib/decidim/votings/query_extensions.rb

@@ -15,8 +15,8 @@ module Decidim
                    [Decidim::Votings::VotingType],
                    null: true,
                    description: "Lists all votings" do
-          argument :filter, Decidim::ParticipatoryProcesses::ParticipatoryProcessInputFilter, "This argument let's you filter the results", required: false
-          argument :order, Decidim::ParticipatoryProcesses::ParticipatoryProcessInputSort, "This argument let's you order the results", required: false
+          argument :filter, Decidim::ParticipatoryProcesses::ParticipatoryProcessInputFilter, "This argument lets you filter the results", required: false
+          argument :order, Decidim::ParticipatoryProcesses::ParticipatoryProcessInputSort, "This argument lets you order the results", required: false
         end
 
         type.field :voting,
@@ -30,13 +30,13 @@ module Decidim
       def votings(filter: {}, order: {})
         manifest = Decidim.participatory_space_manifests.select { |m| m.name == :votings }.first
 
-        Decidim::Core::ParticipatorySpaceListBase.new(manifest: manifest).call(object, { filter: filter, order: order }, context)
+        Decidim::Core::ParticipatorySpaceListBase.new(manifest:).call(object, { filter:, order: }, context)
       end
 
       def voting(id: nil)
         manifest = Decidim.participatory_space_manifests.select { |m| m.name == :votings }.first
 
-        Decidim::Core::ParticipatorySpaceFinderBase.new(manifest: manifest).call(object, { id: id }, context)
+        Decidim::Core::ParticipatorySpaceFinderBase.new(manifest:).call(object, { id: }, context)
       end
     end
   end

data/lib/decidim/votings/seeds.rb

@@ -0,0 +1,197 @@
+# frozen_string_literal: true
+
+require "decidim/seeds"
+
+module Decidim
+  module Votings
+    class Seeds < Decidim::Seeds
+      # rubocop:disable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
+      def call
+        organization = Decidim::Organization.first
+
+        3.times do |n|
+          params = {
+            organization:,
+            title: Decidim::Faker::Localized.sentence(word_count: 5),
+            slug: Decidim::Faker::Internet.unique.slug(words: nil, glue: "-"),
+            description: Decidim::Faker::Localized.wrapped("<p>", "</p>") do
+              Decidim::Faker::Localized.paragraph(sentence_count: 3)
+            end,
+            scope: n.positive? ? nil : Decidim::Scope.all.sample,
+            banner_image: ::Faker::Boolean.boolean(true_ratio: 0.5) ? banner_image : nil, # Keep after organization
+            published_at: 2.weeks.ago,
+            start_time: n.weeks.from_now,
+            end_time: (n + 1).weeks.from_now + 4.hours,
+            voting_type: Decidim::Votings::Voting.voting_types.values.sample,
+            promoted: n.odd?
+          }
+
+          voting = Decidim.traceability.perform_action!(
+            "publish",
+            Decidim::Votings::Voting,
+            organization.users.first,
+            visibility: "all"
+          ) do
+            Decidim::Votings::Voting.create!(params)
+          end
+          voting.add_to_index_as_search_resource
+
+          unless voting.online_voting?
+            3.times do
+              params = {
+                voting:,
+                title: Decidim::Faker::Localized.sentence(word_count: 5),
+                address: ::Faker::Address.full_address,
+                latitude: ::Faker::Address.latitude,
+                longitude: ::Faker::Address.longitude,
+                location: Decidim::Faker::Localized.sentence,
+                location_hints: Decidim::Faker::Localized.sentence
+              }
+
+              polling_station = Decidim.traceability.create!(
+                Decidim::Votings::PollingStation,
+                organization.users.first,
+                params,
+                visibility: "all"
+              )
+
+              email = "voting_#{voting.id}_president_#{polling_station.id}@example.org"
+
+              user = Decidim::User.find_or_initialize_by(email:)
+              user.update!(
+                name: ::Faker::Name.name,
+                nickname: ::Faker::Twitter.unique.screen_name,
+                password: "decidim123456789",
+                organization:,
+                confirmed_at: Time.current,
+                locale: I18n.default_locale,
+                tos_agreement: true
+              )
+
+              Decidim.traceability.create!(
+                Decidim::Votings::PollingOfficer,
+                organization.users.first,
+                {
+                  voting:,
+                  user:,
+                  presided_polling_station: polling_station
+                },
+                visibility: "all"
+              )
+            end
+          end
+
+          landing_page_content_blocks = [:hero, :title, :related_elections, :polling_stations, :related_documents, :related_images, :stats, :metrics]
+
+          landing_page_content_blocks.each.with_index(1) do |manifest_name, index|
+            Decidim::ContentBlock.create(
+              organization:,
+              scope_name: :voting_landing_page,
+              manifest_name:,
+              weight: index,
+              scoped_resource_id: voting.id,
+              published_at: Time.current
+            )
+          end
+
+          2.times do
+            Decidim::Category.create!(
+              name: Decidim::Faker::Localized.sentence(word_count: 5),
+              description: Decidim::Faker::Localized.wrapped("<p>", "</p>") do
+                Decidim::Faker::Localized.paragraph(sentence_count: 3)
+              end,
+              participatory_space: voting
+            )
+          end
+
+          Decidim.component_manifests.each do |manifest|
+            manifest.seed!(voting.reload)
+          end
+
+          unless voting.online_voting?
+            voting.reload.published_elections.finished.each do |election|
+              polling_officer = voting.polling_officers.sample
+              ps_closure = Decidim::Votings::PollingStationClosure.create!(
+                election:,
+                polling_officer:,
+                polling_station: polling_officer.polling_station,
+                signed_at: Time.current,
+                phase: :complete
+              )
+
+              valid_ballots = ::Faker::Number.number(digits: 3)
+              Decidim::Elections::Result.create!(
+                value: valid_ballots,
+                closurable: ps_closure,
+                question: nil,
+                answer: nil,
+                result_type: :valid_ballots
+              )
+
+              null_ballots = ::Faker::Number.number(digits: 1)
+              Decidim::Elections::Result.create!(
+                value: null_ballots,
+                closurable: ps_closure,
+                question: nil,
+                answer: nil,
+                result_type: :null_ballots
+              )
+
+              blank_ballots = ::Faker::Number.number(digits: 2)
+              Decidim::Elections::Result.create!(
+                value: blank_ballots,
+                closurable: ps_closure,
+                question: nil,
+                answer: nil,
+                result_type: :blank_ballots
+              )
+
+              Decidim::Elections::Result.create!(
+                value: valid_ballots + null_ballots + blank_ballots,
+                closurable: ps_closure,
+                question: nil,
+                answer: nil,
+                result_type: :total_ballots
+              )
+
+              election.questions.each do |question|
+                question_pending = valid_ballots
+                question.answers.shuffle.each do |answer|
+                  answer_value = ::Faker::Number.between(from: 0, to: question_pending)
+                  Decidim::Elections::Result.create!(
+                    value: answer_value,
+                    closurable: ps_closure,
+                    question:,
+                    answer:,
+                    result_type: :valid_answers
+                  )
+                  question_pending -= answer_value
+                end
+
+                next unless question.nota_option?
+
+                Decidim::Elections::Result.create!(
+                  value: question_pending,
+                  closurable: ps_closure,
+                  question:,
+                  answer: nil,
+                  result_type: :blank_answers
+                )
+              end
+            end
+          end
+
+          (1..2).each do |i|
+            ballot_style = voting.ballot_styles.create!(code: "DISTRICT#{i}")
+            voting.elections.each do |election|
+              election.questions.sample(1 + rand(election.questions.count)).each do |question|
+                ballot_style.ballot_style_questions.create!(question:)
+              end
+            end
+          end
+        end
+      end
+      # rubocop:enable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
+    end
+  end
+end

data/lib/decidim/votings/test/factories.rb

@@ -4,7 +4,7 @@ require "decidim/core/test/factories"
 require "decidim/forms/test/factories"
 
 def format_birthdate(birthdate)
-  format("%04d%02d%02d", birthdate.year, birthdate.month, birthdate.day) # rubocop:disable Style/FormatStringToken
+  format("%04d%02d%02d", birthdate.year, birthdate.month, birthdate.day)
 end
 
 def hash_for(*data)
@@ -24,7 +24,7 @@ FactoryBot.define do
     published_at { Time.current }
     start_time { 1.day.from_now }
     end_time { 3.days.from_now }
-    decidim_scope_id { create(:scope, organization: organization).id }
+    decidim_scope_id { create(:scope, organization:).id }
     banner_image { Decidim::Dev.test_file("city2.jpeg", "image/jpeg") }
     introductory_image { Decidim::Dev.test_file("city.jpeg", "image/jpeg") }
     voting_type { "hybrid" }
@@ -69,6 +69,22 @@ FactoryBot.define do
     trait :hybrid do
       voting_type { "hybrid" }
     end
+
+    trait :with_content_blocks do
+      transient { blocks_manifests { [:hero] } }
+
+      after(:create) do |voting, evaluator|
+        evaluator.blocks_manifests.each do |manifest_name|
+          create(
+            :content_block,
+            organization: voting.organization,
+            scope_name: :voting_landing_page,
+            manifest_name:,
+            scoped_resource_id: voting.id
+          )
+        end
+      end
+    end
   end
 
   factory :voting_election, parent: :election do
@@ -77,7 +93,7 @@ FactoryBot.define do
       base_id { 20_000 }
     end
 
-    component { create(:elections_component, organization: organization, participatory_space: voting) }
+    component { create(:elections_component, organization:, participatory_space: voting) }
   end
 
   factory :polling_station, class: "Decidim::Votings::PollingStation" do
@@ -95,7 +111,7 @@ FactoryBot.define do
     voting { create :voting }
 
     trait :president do
-      presided_polling_station { create :polling_station, voting: voting }
+      presided_polling_station { create :polling_station, voting: }
     end
   end
 
@@ -113,13 +129,13 @@ FactoryBot.define do
 
     trait :with_data do
       after(:create) do |dataset|
-        create_list(:datum, 5, dataset: dataset)
+        create_list(:datum, 5, dataset:)
       end
     end
 
     trait :with_access_code_data do
       after(:create) do |dataset|
-        create_list(:datum, 5, :with_access_code, dataset: dataset)
+        create_list(:datum, 5, :with_access_code, dataset:)
       end
     end
 
@@ -142,7 +158,7 @@ FactoryBot.define do
 
     transient do
       document_number { Faker::IDNumber.spanish_citizen_number }
-      document_type { %w(DNI NIE PASSPORT).sample }
+      document_type { %w(identification_number passport).sample }
       birthdate { Faker::Date.birthday(min_age: 18, max_age: 65) }
     end
 
@@ -175,7 +191,7 @@ FactoryBot.define do
       with_questions
 
       after(:create) do |ballot_style, evaluator|
-        evaluator.election.reload.questions.first(2).map { |question| create(:ballot_style_question, question: question, ballot_style: ballot_style) }
+        evaluator.election.reload.questions.first(2).map { |question| create(:ballot_style_question, question:, ballot_style:) }
       end
     end
   end
@@ -191,12 +207,12 @@ FactoryBot.define do
       component { create(:elections_component, participatory_space: voting) }
     end
 
-    election { create(:election, component: component) }
+    election { create(:election, component:) }
     sequence(:voter_id) { |n| "voter_#{n}" }
     status { "pending" }
     message_id { "decidim-test-authority.2.vote.in_person+v.5826de088371d1b15b38f00c8203871caec07041ed0c8fb0c6fb875f0df763b6" }
     polling_station { polling_officer.polling_station }
-    polling_officer { create(:polling_officer, :president, voting: voting) }
+    polling_officer { create(:polling_officer, :president, voting:) }
 
     trait :accepted do
       status { "accepted" }
@@ -232,13 +248,13 @@ FactoryBot.define do
           max = total_votes
           question.answers.each do |answer|
             value = Faker::Number.between(from: 0, to: max)
-            closure.results << create(:election_result, closurable: closure, election: closure.election, question: question, answer: answer, value: value)
+            closure.results << create(:election_result, closurable: closure, election: closure.election, question:, answer:, value:)
             max -= value
           end
           value = Faker::Number.between(from: 0, to: max)
-          closure.results << create(:election_result, :null_ballots, election: closure.election, question: question, value: value)
+          closure.results << create(:election_result, :null_ballots, election: closure.election, question:, value:)
           max -= value
-          closure.results << create(:election_result, :blank_ballots, election: closure.election, question: question, value: max)
+          closure.results << create(:election_result, :blank_ballots, election: closure.election, question:, value: max)
         end
         closure.results << create(:election_result, :total_ballots, closurable: closure, election: closure.election, value: total_votes)
       end

data/lib/decidim/votings/voting_serializer.rb

@@ -18,7 +18,7 @@ module Decidim
       def serialize
         {
           participatory_space_id: voting.id,
-          url: url,
+          url:,
           title: voting.title,
           description: voting.description,
           start_time: voting.start_time,

data/lib/tasks/decidim_elections.rake

@@ -21,7 +21,7 @@ namespace :decidim_elections do
   task :scheduled_tasks, [] => :environment do
     Decidim::Elections::ElectionsReadyToStart.for.each do |election|
       puts "\nStarting vote period for election ##{election.id}:"
-      form = Decidim::Elections::Admin::VotePeriodForm.new.with_context(election: election, current_user: nil)
+      form = Decidim::Elections::Admin::VotePeriodForm.new.with_context(election:, current_user: nil)
       Decidim::Elections::Admin::StartVote.call(form) do
         on(:ok) do
           puts "\n✓ Voting period start requested.\n"
@@ -36,7 +36,7 @@ namespace :decidim_elections do
 
     Decidim::Elections::ElectionsFinishedToEnd.for.each do |election|
       puts "\nEnding vote period for election ##{election.id}:"
-      form = Decidim::Elections::Admin::VotePeriodForm.new.with_context(election: election, current_user: nil)
+      form = Decidim::Elections::Admin::VotePeriodForm.new.with_context(election:, current_user: nil)
       Decidim::Elections::Admin::EndVote.call(form) do
         on(:ok) do
           puts "\n✓ Voting period end requested.\n"