decidim-elections 0.27.7 → 0.28.0.rc4

data/db/migrate/20210310120708_add_followable_counter_cache_to_votings.rb

@@ -1,17 +1,13 @@
 # frozen_string_literal: true
 
 class AddFollowableCounterCacheToVotings < ActiveRecord::Migration[5.2]
-  class Voting < ApplicationRecord
-    self.table_name = :decidim_votings_votings
-  end
-
   def change
     add_column :decidim_votings_votings, :follows_count, :integer, null: false, default: 0, index: true
 
     reversible do |dir|
       dir.up do
-        Voting.reset_column_information
-        Voting.find_each do |record|
+        Decidim::Votings::Voting.reset_column_information
+        Decidim::Votings::Voting.find_each do |record|
           record.class.reset_counters(record.id, :follows)
         end
       end

data/lib/decidim/api/election_type.rb

@@ -17,7 +17,7 @@ module Decidim
       field :created_at, Decidim::Core::DateTimeType, "When this election was created", null: true
       field :updated_at, Decidim::Core::DateTimeType, "When this election was updated", null: true
       field :published_at, Decidim::Core::DateTimeType, "When this election was published", null: true
-      field :blocked, GraphQL::Types::Boolean, "Whether this election has it's parameters blocked or not", method: :blocked?, null: true
+      field :blocked, GraphQL::Types::Boolean, "Whether this election has it is parameters blocked or not", method: :blocked?, null: true
       field :bb_status, GraphQL::Types::String, "The status for this election in the bulletin board", null: true, camelize: false
 
       field :questions, [Decidim::Elections::ElectionQuestionType, { null: true }], "The questions for this election", null: false

data/lib/decidim/api/elections_type.rb

@@ -25,7 +25,7 @@ module Decidim
 
     module ElectionsTypeHelper
       def self.base_scope(component)
-        Election.where(component: component).where.not(published_at: nil)
+        Election.where(component:).where.not(published_at: nil)
       end
     end
   end

data/lib/decidim/elections/admin_engine.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require "decidim/elections/menu"
+
 module Decidim
   module Elections
     # This is the engine that runs on the public interface of `Elections`.
@@ -50,25 +52,8 @@ module Decidim
         [:trustees]
       end
 
-      initializer "decidim_admin_elections.menu_entry" do
-        Decidim.participatory_space_registry.manifests.each do |participatory_space|
-          menu_id = :"admin_#{participatory_space.name.to_s.singularize}_menu"
-          Decidim.menu menu_id do |menu|
-            component = current_participatory_space.try(:components)&.find_by(manifest_name: :elections)
-            next unless component
-
-            link = Decidim::EngineRouter.admin_proxy(component).trustees_path(locale: I18n.locale)
-
-            has_election_components = current_participatory_space.components.select { |c| c.manifest_name == "elections" }.any?
-
-            menu.add_item :trustees,
-                          I18n.t("trustees", scope: "decidim.elections.admin.menu"),
-                          link,
-                          if: has_election_components && (allowed_to?(:manage, :trustees) || current_user.admin?),
-                          position: 100,
-                          active: is_active_link?(link)
-          end
-        end
+      initializer "decidim_elections_admin.menu_entry" do
+        Decidim::Elections::Menu.register_participatory_space_registry_manifests!
       end
 
       def load_seed

data/lib/decidim/elections/component.rb

@@ -1,17 +1,16 @@
 # frozen_string_literal: true
 
-require "decidim/components/namer"
-
 Decidim.register_component(:elections) do |component|
   component.engine = Decidim::Elections::Engine
   component.admin_engine = Decidim::Elections::AdminEngine
   component.icon = "media/images/decidim_elections.svg"
+  component.icon_key = "check-double-fill"
   component.stylesheet = "decidim/elections/elections"
   component.permissions_class_name = "Decidim::Elections::Permissions"
   component.query_type = "Decidim::Elections::ElectionsType"
 
   component.on(:before_destroy) do |instance|
-    raise StandardError, "Can't remove this component" if Decidim::Elections::Election.where(component: instance).any?
+    raise StandardError, "Cannot remove this component" if Decidim::Elections::Election.where(component: instance).any?
   end
 
   # These actions permissions can be configured in the admin panel
@@ -66,456 +65,9 @@ Decidim.register_component(:elections) do |component|
   end
 
   component.seeds do |participatory_space|
-    admin_user = Decidim::User.find_by(
-      organization: participatory_space.organization,
-      email: "admin@example.org"
-    )
-
-    params = {
-      name: Decidim::Components::Namer.new(participatory_space.organization.available_locales, :elections).i18n_name,
-      manifest_name: :elections,
-      published_at: Time.current,
-      participatory_space: participatory_space
-    }
-
-    component = Decidim.traceability.perform_action!(
-      "publish",
-      Decidim::Component,
-      admin_user,
-      visibility: "all"
-    ) do
-      Decidim::Component.create!(params)
-    end
-
-    # upcoming elections that may be published
-    2.times do
-      upcoming_election = Decidim.traceability.create!(
-        Decidim::Elections::Election,
-        admin_user,
-        {
-          component: component,
-          title: Decidim::Faker::Localized.sentence(word_count: 2),
-          description: Decidim::Faker::Localized.wrapped("<p>", "</p>") do
-            Decidim::Faker::Localized.paragraph(sentence_count: 3)
-          end,
-          start_time: 3.weeks.from_now,
-          end_time: 3.weeks.from_now + 4.hours,
-          published_at: Faker::Boolean.boolean(true_ratio: 0.5) ? 1.week.ago : nil,
-          salt: Decidim::Tokenizer.random_salt
-        },
-        visibility: "all"
-      )
-
-      rand(1...4).times do
-        upcoming_question = Decidim.traceability.create!(
-          Decidim::Elections::Question,
-          admin_user,
-          {
-            election: upcoming_election,
-            title: Decidim::Faker::Localized.sentence(word_count: 2),
-            max_selections: Faker::Number.between(from: 1, to: 3),
-            weight: Faker::Number.number(digits: 1),
-            random_answers_order: Faker::Boolean.boolean(true_ratio: 0.5),
-            min_selections: Faker::Number.between(from: 0, to: 1)
-          },
-          visibility: "all"
-        )
-
-        rand(upcoming_question.max_selections...5).times do
-          answer = Decidim.traceability.create!(
-            Decidim::Elections::Answer,
-            admin_user,
-            {
-              question: upcoming_question,
-              title: Decidim::Faker::Localized.sentence(word_count: 2),
-              description: Decidim::Faker::Localized.wrapped("<p>", "</p>") do
-                Decidim::Faker::Localized.paragraph(sentence_count: 3)
-              end,
-              weight: Faker::Number.number(digits: 1),
-              selected: Faker::Boolean.boolean(true_ratio: 0.2) # false
-            },
-            visibility: "all"
-          )
-
-          Decidim::Attachment.create!(
-            title: Decidim::Faker::Localized.sentence(word_count: 2),
-            description: Decidim::Faker::Localized.sentence(word_count: 5),
-            attached_to: answer,
-            content_type: "image/jpeg",
-            file: ActiveStorage::Blob.create_and_upload!(
-              io: File.open(File.join(__dir__, "seeds", "city.jpeg")),
-              filename: "city.jpeg",
-              content_type: "image/jpeg",
-              metadata: nil
-            ) # Keep after attached_to
-          )
-        end
-
-        questionnaire = Decidim::Forms::Questionnaire.create!(
-          title: Decidim::Faker::Localized.paragraph,
-          description: Decidim::Faker::Localized.wrapped("<p>", "</p>") do
-            Decidim::Faker::Localized.paragraph(sentence_count: 3)
-          end,
-          tos: Decidim::Faker::Localized.wrapped("<p>", "</p>") do
-            Decidim::Faker::Localized.paragraph(sentence_count: 2)
-          end,
-          questionnaire_for: upcoming_election
-        )
-
-        %w(short_answer long_answer).each do |text_question_type|
-          Decidim::Forms::Question.create!(
-            questionnaire: questionnaire,
-            body: Decidim::Faker::Localized.paragraph,
-            question_type: text_question_type
-          )
-        end
-
-        %w(single_option multiple_option).each do |multiple_choice_question_type|
-          question = Decidim::Forms::Question.create!(
-            questionnaire: questionnaire,
-            body: Decidim::Faker::Localized.paragraph,
-            question_type: multiple_choice_question_type
-          )
-
-          3.times do
-            question.answer_options.create!(body: Decidim::Faker::Localized.sentence)
-          end
-        end
-      end
-    end
-
-    # finished elections that may be published, with questionnaire
-    2.times do
-      finished_election = Decidim.traceability.create!(
-        Decidim::Elections::Election,
-        admin_user,
-        {
-          component: component,
-          title: Decidim::Faker::Localized.sentence(word_count: 2),
-          description: Decidim::Faker::Localized.wrapped("<p>", "</p>") do
-            Decidim::Faker::Localized.paragraph(sentence_count: 3)
-          end,
-          start_time: 4.weeks.ago,
-          end_time: 3.weeks.ago,
-          published_at: 4.weeks.ago,
-          salt: Decidim::Tokenizer.random_salt
-        },
-        visibility: "all"
-      )
-
-      rand(1...4).times do
-        finished_question = Decidim.traceability.create!(
-          Decidim::Elections::Question,
-          admin_user,
-          {
-            election: finished_election,
-            title: Decidim::Faker::Localized.sentence(word_count: 2),
-            max_selections: 2,
-            weight: Faker::Number.number(digits: 1),
-            random_answers_order: Faker::Boolean.boolean(true_ratio: 0.5),
-            min_selections: Faker::Number.between(from: 0, to: 1)
-          },
-          visibility: "all"
-        )
-
-        rand(2...5).times do
-          answer = Decidim.traceability.create!(
-            Decidim::Elections::Answer,
-            admin_user,
-            {
-              question: finished_question,
-              title: Decidim::Faker::Localized.sentence(word_count: 2),
-              description: Decidim::Faker::Localized.wrapped("<p>", "</p>") do
-                Decidim::Faker::Localized.paragraph(sentence_count: 3)
-              end,
-              weight: Faker::Number.number(digits: 1),
-              selected: Faker::Boolean.boolean(true_ratio: 0.2) # false
-            },
-            visibility: "all"
-          )
-
-          Decidim::Attachment.create!(
-            title: Decidim::Faker::Localized.sentence(word_count: 2),
-            description: Decidim::Faker::Localized.sentence(word_count: 5),
-            attached_to: answer,
-            content_type: "image/jpeg",
-            file: ActiveStorage::Blob.create_and_upload!(
-              io: File.open(File.join(__dir__, "seeds", "city.jpeg")),
-              filename: "city.jpeg",
-              content_type: "image/jpeg",
-              metadata: nil
-            ) # Keep after attached_to
-          )
-        end
-
-        questionnaire = Decidim::Forms::Questionnaire.create!(
-          title: Decidim::Faker::Localized.paragraph,
-          description: Decidim::Faker::Localized.wrapped("<p>", "</p>") do
-            Decidim::Faker::Localized.paragraph(sentence_count: 3)
-          end,
-          tos: Decidim::Faker::Localized.wrapped("<p>", "</p>") do
-            Decidim::Faker::Localized.paragraph(sentence_count: 2)
-          end,
-          questionnaire_for: finished_election
-        )
-
-        %w(short_answer long_answer).each do |text_question_type|
-          Decidim::Forms::Question.create!(
-            questionnaire: questionnaire,
-            body: Decidim::Faker::Localized.paragraph,
-            question_type: text_question_type
-          )
-        end
-
-        %w(single_option multiple_option).each do |multiple_choice_question_type|
-          question = Decidim::Forms::Question.create!(
-            questionnaire: questionnaire,
-            body: Decidim::Faker::Localized.paragraph,
-            question_type: multiple_choice_question_type
-          )
-
-          3.times do
-            question.answer_options.create!(body: Decidim::Faker::Localized.sentence)
-          end
-        end
-      end
-    end
-
-    # finished, published elections with results and with questionnaire
-    2.times do
-      election_with_results = Decidim.traceability.create!(
-        Decidim::Elections::Election,
-        admin_user,
-        {
-          component: component,
-          title: Decidim::Faker::Localized.sentence(word_count: 2),
-          description: Decidim::Faker::Localized.wrapped("<p>", "</p>") do
-            Decidim::Faker::Localized.paragraph(sentence_count: 3)
-          end,
-          start_time: 4.weeks.ago,
-          end_time: 3.weeks.ago,
-          published_at: 3.weeks.ago,
-          bb_status: "results_published",
-          salt: Decidim::Tokenizer.random_salt
-
-        },
-        visibility: "all"
-      )
+    require "decidim/elections/seeds"
 
-      bb_closure = Decidim::Elections::BulletinBoardClosure.create!(
-        election: election_with_results
-      )
-
-      valid_ballots = Faker::Number.number(digits: 3)
-      Decidim::Elections::Result.create!(
-        value: valid_ballots,
-        closurable: bb_closure,
-        question: nil,
-        answer: nil,
-        result_type: :valid_ballots
-      )
-
-      Decidim::Elections::Result.create!(
-        value: valid_ballots,
-        closurable: bb_closure,
-        question: nil,
-        answer: nil,
-        result_type: :total_ballots
-      )
-
-      rand(1...4).times do
-        result_question = Decidim.traceability.create!(
-          Decidim::Elections::Question,
-          admin_user,
-          {
-            election: election_with_results,
-            title: Decidim::Faker::Localized.sentence(word_count: 2),
-            max_selections: 2,
-            weight: Faker::Number.number(digits: 1),
-            random_answers_order: Faker::Boolean.boolean(true_ratio: 0.5),
-            min_selections: Faker::Number.between(from: 0, to: 1)
-          },
-          visibility: "all"
-        )
-
-        question_pending = valid_ballots
-        rand(2...5).times do
-          answer = Decidim.traceability.create!(
-            Decidim::Elections::Answer,
-            admin_user,
-            {
-              question: result_question,
-              title: Decidim::Faker::Localized.sentence(word_count: 2),
-              description: Decidim::Faker::Localized.wrapped("<p>", "</p>") do
-                Decidim::Faker::Localized.paragraph(sentence_count: 3)
-              end,
-              weight: Faker::Number.number(digits: 1),
-              selected: Faker::Boolean.boolean(true_ratio: 0.5)
-            },
-            visibility: "all"
-          )
-
-          Decidim::Attachment.create!(
-            title: Decidim::Faker::Localized.sentence(word_count: 2),
-            description: Decidim::Faker::Localized.sentence(word_count: 5),
-            attached_to: answer,
-            content_type: "image/jpeg",
-            file: ActiveStorage::Blob.create_and_upload!(
-              io: File.open(File.join(__dir__, "seeds", "city.jpeg")),
-              filename: "city.jpeg",
-              content_type: "image/jpeg",
-              metadata: nil
-            ) # Keep after attached_to
-          )
-
-          answer_value = Faker::Number.between(from: 0, to: question_pending)
-          Decidim::Elections::Result.create!(
-            value: answer_value,
-            closurable: bb_closure,
-            question: result_question,
-            answer: answer,
-            result_type: :valid_answers
-          )
-          question_pending -= answer_value
-        end
-
-        if result_question.nota_option? && result_question.max_selections == 1
-          Decidim::Elections::Result.create!(
-            value: question_pending,
-            closurable: bb_closure,
-            question: result_question,
-            answer: nil,
-            result_type: :blank_answers
-          )
-        end
-
-        questionnaire = Decidim::Forms::Questionnaire.create!(
-          title: Decidim::Faker::Localized.paragraph,
-          description: Decidim::Faker::Localized.wrapped("<p>", "</p>") do
-            Decidim::Faker::Localized.paragraph(sentence_count: 3)
-          end,
-          tos: Decidim::Faker::Localized.wrapped("<p>", "</p>") do
-            Decidim::Faker::Localized.paragraph(sentence_count: 2)
-          end,
-          questionnaire_for: election_with_results
-        )
-
-        %w(short_answer long_answer).each do |text_question_type|
-          Decidim::Forms::Question.create!(
-            questionnaire: questionnaire,
-            body: Decidim::Faker::Localized.paragraph,
-            question_type: text_question_type
-          )
-        end
-
-        %w(single_option multiple_option).each do |multiple_choice_question_type|
-          question = Decidim::Forms::Question.create!(
-            questionnaire: questionnaire,
-            body: Decidim::Faker::Localized.paragraph,
-            question_type: multiple_choice_question_type
-          )
-
-          3.times do
-            question.answer_options.create!(body: Decidim::Faker::Localized.sentence)
-          end
-        end
-      end
-    end
-
-    # ongoing election that is published
-    ongoing_election = Decidim.traceability.create!(
-      Decidim::Elections::Election,
-      admin_user,
-      {
-        component: component,
-        title: Decidim::Faker::Localized.sentence(word_count: 2),
-        description: Decidim::Faker::Localized.wrapped("<p>", "</p>") do
-          Decidim::Faker::Localized.paragraph(sentence_count: 3)
-        end,
-        start_time: 2.weeks.ago,
-        end_time: 2.weeks.from_now + 4.hours,
-        published_at: 3.weeks.ago,
-        salt: Decidim::Tokenizer.random_salt
-      },
-      visibility: "all"
-    )
-
-    rand(1...4).times do
-      ongoing_question = Decidim.traceability.create!(
-        Decidim::Elections::Question,
-        admin_user,
-        {
-          election: ongoing_election,
-          title: Decidim::Faker::Localized.sentence(word_count: 2),
-          max_selections: 2,
-          weight: Faker::Number.number(digits: 1),
-          random_answers_order: Faker::Boolean.boolean(true_ratio: 0.5),
-          min_selections: Faker::Number.between(from: 0, to: 1)
-        },
-        visibility: "all"
-      )
-
-      rand(3...5).times do
-        answer = Decidim.traceability.create!(
-          Decidim::Elections::Answer,
-          admin_user,
-          {
-            question: ongoing_question,
-            title: Decidim::Faker::Localized.sentence(word_count: 2),
-            description: Decidim::Faker::Localized.wrapped("<p>", "</p>") do
-              Decidim::Faker::Localized.paragraph(sentence_count: 3)
-            end,
-            weight: Faker::Number.number(digits: 1),
-            selected: Faker::Boolean.boolean(true_ratio: 0.2) # false
-          },
-          visibility: "all"
-        )
-
-        Decidim::Attachment.create!(
-          title: Decidim::Faker::Localized.sentence(word_count: 2),
-          description: Decidim::Faker::Localized.sentence(word_count: 5),
-          attached_to: answer,
-          content_type: "image/jpeg",
-          file: ActiveStorage::Blob.create_and_upload!(
-            io: File.open(File.join(__dir__, "seeds", "city.jpeg")),
-            filename: "city.jpeg",
-            content_type: "image/jpeg",
-            metadata: nil
-          ) # Keep after attached_to
-        )
-      end
-    end
-
-    questionnaire = Decidim::Forms::Questionnaire.create!(
-      title: Decidim::Faker::Localized.paragraph,
-      description: Decidim::Faker::Localized.wrapped("<p>", "</p>") do
-        Decidim::Faker::Localized.paragraph(sentence_count: 3)
-      end,
-      tos: Decidim::Faker::Localized.wrapped("<p>", "</p>") do
-        Decidim::Faker::Localized.paragraph(sentence_count: 2)
-      end,
-      questionnaire_for: ongoing_election
-    )
-
-    %w(short_answer long_answer).each do |text_question_type|
-      Decidim::Forms::Question.create!(
-        questionnaire: questionnaire,
-        body: Decidim::Faker::Localized.paragraph,
-        question_type: text_question_type
-      )
-    end
-
-    %w(single_option multiple_option).each do |multiple_choice_question_type|
-      question = Decidim::Forms::Question.create!(
-        questionnaire: questionnaire,
-        body: Decidim::Faker::Localized.paragraph,
-        question_type: multiple_choice_question_type
-      )
-
-      3.times do
-        question.answer_options.create!(body: Decidim::Faker::Localized.sentence)
-      end
-    end
+    Decidim::Elections::Seeds.new(participatory_space:).call
   end
 end
 

data/lib/decidim/elections/engine.rb

@@ -22,8 +22,22 @@ module Decidim
 
           get :election_log, on: :member
         end
+        scope "/elections" do
+          root to: "elections#index"
+        end
+        get "/", to: redirect("elections", status: 301)
+      end
 
-        root to: "elections#index"
+      initializer "decidim_elections.register_icons" do
+        Decidim.icons.register(name: "Decidim::Elections::Election", icon: "chat-poll-line", description: "Election", category: "activity", engine: :elections)
+        Decidim.icons.register(name: "safe-line", icon: "safe-line", category: "system", description: "", engine: :elections)
+        Decidim.icons.register(name: "guide-line", icon: "guide-line", category: "system", description: "", engine: :elections)
+        Decidim.icons.register(name: "loader-4-line", icon: "loader-4-line", category: "system", description: "", engine: :elections)
+        Decidim.icons.register(name: "checkbox-multiple-line", icon: "checkbox-multiple-line", category: "system", description: "", engine: :elections)
+        Decidim.icons.register(name: "book-2-line", icon: "book-2-line", category: "system", description: "", engine: :elections)
+        Decidim.icons.register(name: "shut-down-line", icon: "shut-down-line", category: "system", description: "", engine: :elections)
+        Decidim.icons.register(name: "article-line", icon: "article-line", category: "system", description: "", engine: :elections)
+        Decidim.icons.register(name: "bar-chart-box-line", icon: "bar-chart-box-line", category: "system", description: "", engine: :elections)
       end
 
       initializer "decidim_elections.add_cells_view_paths" do
@@ -34,6 +48,14 @@ module Decidim
       initializer "decidim_elections.webpacker.assets_path" do
         Decidim.register_assets_path File.expand_path("app/packs", root)
       end
+
+      initializer "decidim_elections.authorization_transfer" do
+        config.to_prepare do
+          Decidim::AuthorizationTransfer.register(:elections) do |transfer|
+            transfer.move_records(Decidim::Elections::Vote, :decidim_user_id)
+          end
+        end
+      end
     end
   end
 end

data/lib/decidim/elections/menu.rb

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Elections
+    class Menu
+      def self.register_user_menu!
+        Decidim.menu :user_menu do |menu|
+          menu.add_item :decidim_elections_trustee_zone,
+                        I18n.t("menu.trustee_zone", scope: "decidim.elections.trustee_zone"),
+                        decidim.decidim_elections_trustee_zone_path,
+                        active: :inclusive,
+                        if: Decidim::Elections::Trustee.trustee?(current_user)
+        end
+      end
+
+      def self.register_participatory_space_registry_manifests!
+        Decidim.participatory_space_registry.manifests.each do |participatory_space|
+          menu_id = :"admin_#{participatory_space.name.to_s.singularize}_menu"
+          Decidim.menu menu_id do |menu|
+            component = current_participatory_space.try(:components)&.find_by(manifest_name: :elections)
+            next unless component
+
+            link = Decidim::EngineRouter.admin_proxy(component).trustees_path(locale: I18n.locale)
+
+            has_election_components = current_participatory_space.components.select { |c| c.manifest_name == "elections" }.any?
+
+            menu.add_item :trustees,
+                          I18n.t("trustees", scope: "decidim.elections.admin.menu"),
+                          link,
+                          if: has_election_components && (allowed_to?(:manage, :trustees) || current_user.admin?),
+                          icon_name: "safe-line",
+                          position: 100,
+                          active: is_active_link?(link)
+          end
+        end
+      end
+    end
+  end
+end