decidim-elections 0.26.9 → 0.27.0.rc1

data/app/commands/decidim/votings/admin/update_ballot_style.rb

@@ -4,7 +4,7 @@ module Decidim
   module Votings
     module Admin
       # A command with the business logic to update the ballot style
-      class UpdateBallotStyle < Rectify::Command
+      class UpdateBallotStyle < Decidim::Command
         def initialize(form, ballot_style)
           @form = form
           @ballot_style = ballot_style

data/app/commands/decidim/votings/admin/update_voting.rb

@@ -5,7 +5,7 @@ module Decidim
     module Admin
       # A command with all the business logic when updating an existing
       # voting in the system.
-      class UpdateVoting < Rectify::Command
+      class UpdateVoting < Decidim::Command
         include ::Decidim::AttachmentAttributesMethods
 
         # Public: Initializes the command.
@@ -67,7 +67,8 @@ module Decidim
             scope: form.scope,
             promoted: form.promoted,
             voting_type: form.voting_type,
-            census_contact_information: form.census_contact_information
+            census_contact_information: form.census_contact_information,
+            show_check_census: form.show_check_census
           }.merge(attachment_attributes(*image_fields))
         end
       end

data/app/commands/decidim/votings/census/admin/create_dataset.rb

@@ -8,7 +8,9 @@ module Decidim
       module Admin
         # A command with the business logic to create census dataset for a
         # voting space.
-        class CreateDataset < Rectify::Command
+        class CreateDataset < Decidim::Command
+          include Decidim::ProcessesFileLocally
+
           def initialize(form, current_user)
             @form = form
             @current_user = current_user
@@ -23,23 +25,28 @@ module Decidim
           def call
             return broadcast(:invalid) unless form.valid?
 
-            dataset = create_census_dataset!
+            process_file_locally(form.file) do |file_path|
+              @file_path = file_path
+              dataset = create_census_dataset!
 
-            if csv_header_invalid?
-              dataset.destroy!
-              return broadcast(:invalid_csv_header)
-            end
+              if csv_header_invalid?
+                dataset.destroy!
+                return broadcast(:invalid_csv_header)
+              end
 
-            if dataset
-              CSV.foreach(form.file.tempfile.path, col_sep: ";", headers: true, converters: ->(f) { f&.strip }) do |row|
-                CreateDatumJob.perform_later(current_user, dataset, row.fields)
+              if dataset
+                CSV.foreach(file_path, col_sep: ";", headers: true, converters: ->(f) { f&.strip }) do |row|
+                  CreateDatumJob.perform_later(current_user, dataset, row.fields)
+                end
               end
             end
 
             broadcast(:ok)
           end
 
-          attr_reader :form, :current_user
+          private
+
+          attr_reader :form, :current_user, :file_path
           attr_accessor :dataset
 
           def create_census_dataset!
@@ -48,7 +55,7 @@ module Decidim
               current_user,
               {
                 voting: form.current_participatory_space,
-                file: form.file.original_filename,
+                file: form.file,
                 csv_row_raw_count: csv_row_count,
                 status: :creating_data
               },
@@ -57,7 +64,7 @@ module Decidim
           end
 
           def csv_header_invalid?
-            CSV.parse_line(File.open(form.file.tempfile.path), col_sep: ";", headers: true, header_converters: :symbol).headers != expected_headers
+            CSV.parse_line(File.open(file_path), col_sep: ";", headers: true, header_converters: :symbol).headers != expected_headers
           end
 
           def headers
@@ -72,16 +79,12 @@ module Decidim
             @expected_headers ||= form.current_participatory_space.has_ballot_styles? ? ballot_style_headers : headers
           end
 
-          def csv_rows
-            @csv_rows ||= CSV.read(form.file.tempfile.path)
-          end
-
           def csv_row_count
-            @csv_row_count ||= file_lines_count(form.file.tempfile.path) - 1
+            @csv_row_count ||= file_lines_count - 1
           end
 
-          def file_lines_count(file_path)
-            `wc -l "#{file_path.shellescape}"`.strip.split(" ")[0].to_i
+          def file_lines_count
+            `wc -l "#{file_path.shellescape}"`.strip.split.first.to_i
           end
         end
       end

data/app/commands/decidim/votings/census/admin/create_datum.rb

@@ -6,7 +6,7 @@ module Decidim
       module Admin
         # A command with the business logic to create the datum for a
         # dataset row.
-        class CreateDatum < Rectify::Command
+        class CreateDatum < Decidim::Command
           def initialize(form, dataset)
             @form = form
             @dataset = dataset

data/app/commands/decidim/votings/census/admin/destroy_dataset.rb

@@ -8,7 +8,7 @@ module Decidim
       module Admin
         # A command with the business logic to destroy a census dataset
         # from the admin panel.
-        class DestroyDataset < Rectify::Command
+        class DestroyDataset < Decidim::Command
           def initialize(dataset, current_user)
             @dataset = dataset
             @current_user = current_user

data/app/commands/decidim/votings/census/admin/increment_dataset_processed_rows.rb

@@ -6,7 +6,7 @@ module Decidim
       module Admin
         # A command with the business logic to create increment the dataset
         # processed rows and change the state when the last is processed
-        class IncrementDatasetProcessedRows < Rectify::Command
+        class IncrementDatasetProcessedRows < Decidim::Command
           def initialize(dataset)
             @dataset = dataset
           end

data/app/commands/decidim/votings/census/admin/launch_access_codes_export.rb

@@ -5,7 +5,7 @@ module Decidim
     module Census
       module Admin
         # A command to launch the access codes export
-        class LaunchAccessCodesExport < Rectify::Command
+        class LaunchAccessCodesExport < Decidim::Command
           def initialize(dataset, user)
             @dataset = dataset
             @user = user

data/app/commands/decidim/votings/census/admin/launch_access_codes_generation.rb

@@ -5,7 +5,7 @@ module Decidim
     module Census
       module Admin
         # A command to launch the access codes generation
-        class LaunchAccessCodesGeneration < Rectify::Command
+        class LaunchAccessCodesGeneration < Decidim::Command
           def initialize(dataset, user)
             @dataset = dataset
             @user = user

data/app/commands/decidim/votings/census/admin/update_dataset.rb

@@ -11,7 +11,7 @@ module Decidim
         # dataset - the Decidim::Votings::Census::Dataset to update
         # attributes - the hash of attibutes to update
         # user - the user performing the action (used for tracing)
-        class UpdateDataset < Rectify::Command
+        class UpdateDataset < Decidim::Command
           def initialize(dataset, attributes, user)
             @dataset = dataset
             @attributes = attributes

data/app/commands/decidim/votings/certify_polling_station_closure.rb

@@ -3,7 +3,7 @@
 module Decidim
   module Votings
     # A command with all the business logic when signing a closure of a polling station
-    class CertifyPollingStationClosure < Rectify::Command
+    class CertifyPollingStationClosure < Decidim::Command
       include ::Decidim::AttachmentMethods
       include ::Decidim::GalleryMethods
       # Public: Initializes the command.

data/app/commands/decidim/votings/check_census.rb

@@ -3,7 +3,7 @@
 module Decidim
   module Votings
     # A command to check if census data is given
-    class CheckCensus < Rectify::Command
+    class CheckCensus < Decidim::Command
       def initialize(form)
         @form = form
       end

data/app/commands/decidim/votings/create_polling_station_closure.rb

@@ -3,7 +3,7 @@
 module Decidim
   module Votings
     # A command with all the business logic when creating a closure for a polling station
-    class CreatePollingStationClosure < Rectify::Command
+    class CreatePollingStationClosure < Decidim::Command
       # Public: Initializes the command.
       #
       # form - A form object with the params.

data/app/commands/decidim/votings/create_polling_station_results.rb

@@ -3,7 +3,7 @@
 module Decidim
   module Votings
     # A command with all the business logic when creating results for a polling station
-    class CreatePollingStationResults < Rectify::Command
+    class CreatePollingStationResults < Decidim::Command
       # Public: Initializes the command.
       #
       # form - A form object with the params.

data/app/commands/decidim/votings/send_access_code.rb

@@ -3,7 +3,7 @@
 module Decidim
   module Votings
     # A command to send the access code
-    class SendAccessCode < Rectify::Command
+    class SendAccessCode < Decidim::Command
       def initialize(datum, medium)
         @datum = datum
         @medium = medium

data/app/commands/decidim/votings/sign_polling_station_closure.rb

@@ -3,7 +3,7 @@
 module Decidim
   module Votings
     # A command with all the business logic when signing a closure of a polling station
-    class SignPollingStationClosure < Rectify::Command
+    class SignPollingStationClosure < Decidim::Command
       # Public: Initializes the command.
       #
       # form - A form object with the params.

data/app/commands/decidim/votings/voter/in_person_vote.rb

@@ -4,7 +4,7 @@ module Decidim
   module Votings
     module Voter
       # This command allows the user to register an in person vote.
-      class InPersonVote < Rectify::Command
+      class InPersonVote < Decidim::Command
         # Public: Initializes the command.
         #
         # form - A form with necessary info to register an in person vote.

data/app/commands/decidim/votings/voter/update_in_person_vote_status.rb

@@ -4,7 +4,7 @@ module Decidim
   module Votings
     module Voter
       # This command updates the in person vote status
-      class UpdateInPersonVoteStatus < Rectify::Command
+      class UpdateInPersonVoteStatus < Decidim::Command
         # Public: Initializes the command.
         #
         # in_person_vote     - the in person vote that has been updated

data/app/controllers/decidim/elections/admin/steps_controller.rb

@@ -73,7 +73,7 @@ module Decidim
             "key_ceremony_ended" => VotePeriodForm,
             "vote" => VotePeriodForm,
             "vote_ended" => ActionForm,
-            "tally" => ReportMissingTrusteeForm,
+            "tally_started" => ReportMissingTrusteeForm,
             "tally_ended" => ActionForm
           }[current_step]
         end
@@ -85,7 +85,7 @@ module Decidim
             "key_ceremony_ended" => StartVote,
             "vote" => EndVote,
             "vote_ended" => StartTally,
-            "tally" => ReportMissingTrustee,
+            "tally_started" => ReportMissingTrustee,
             "tally_ended" => PublishResults
           }[current_step]
         end

data/app/controllers/decidim/elections/admin/trustees_participatory_spaces_controller.rb

@@ -72,7 +72,7 @@ module Decidim
         private
 
         def trustee_participatory_space
-          @trustee_participatory_space ||= TrusteesParticipatorySpace.find_by(id: params[:id], participatory_space: current_participatory_space)
+          @trustee_participatory_space ||= TrusteesParticipatorySpace.find_by(id: params[:id])
         end
 
         def trustees

data/app/controllers/decidim/elections/elections_controller.rb

@@ -26,10 +26,12 @@ module Decidim
       delegate :bulletin_board_server, :authority_slug, to: :bulletin_board_client
 
       def elections
-        @elections ||= Election.where(component: current_component).published
+        @elections ||= search_collection
       end
 
       def election
+        # The single election is searched from non-published records on purpose
+        # to allow previewing for admins.
         @election ||= Election.where(component: current_component).find(params[:id])
       end
 
@@ -57,26 +59,26 @@ module Decidim
       end
 
       def paginated_elections
-        @paginated_elections ||= reorder(search.results.published)
-        @paginated_elections = paginate(@paginated_elections)
+        @paginated_elections ||= paginate(search.result.published)
+        @paginated_elections = reorder(@paginated_elections)
       end
 
       def scheduled_elections
-        @scheduled_elections ||= search_klass.new(search_params.merge(state: %w(active upcoming))).results
+        @scheduled_elections ||= search_with(filter_params.merge(with_any_date: %w(active upcoming))).result
       end
 
-      def search_klass
-        ElectionSearch
+      def search_collection
+        Election.where(component: current_component).published
       end
 
       def default_filter_params
         {
-          search_text: "",
-          state: default_filter_state_params
+          search_text_cont: "",
+          with_any_date: default_filter_date_params
         }
       end
 
-      def default_filter_state_params
+      def default_filter_date_params
         if elections.active.any?
           %w(active)
         elsif elections.upcoming.any?
@@ -85,10 +87,6 @@ module Decidim
           %w()
         end
       end
-
-      def context_params
-        { component: current_component, organization: current_organization }
-      end
     end
   end
 end

data/app/controllers/decidim/elections/trustee_zone/application_controller.rb

@@ -13,11 +13,6 @@ module Decidim
 
         before_action :ensure_configured_bulletin_board!
 
-        register_permissions(::Decidim::Elections::TrusteeZone::ApplicationController,
-                             ::Decidim::Elections::Permissions,
-                             ::Decidim::Admin::Permissions,
-                             ::Decidim::Permissions)
-
         private
 
         def ensure_configured_bulletin_board!
@@ -39,7 +34,10 @@ module Decidim
         end
 
         def permission_class_chain
-          ::Decidim.permissions_registry.chain_for(::Decidim::Elections::TrusteeZone::ApplicationController)
+          [
+            Decidim::Elections::Permissions,
+            Decidim::Permissions
+          ]
         end
       end
     end

data/app/controllers/decidim/elections/trustee_zone/elections_controller.rb

@@ -41,7 +41,7 @@ module Decidim
         end
 
         def current_step
-          @current_step ||= election.bb_status if election.bb_key_ceremony? || election.bb_tally?
+          @current_step ||= election.bb_status if election.bb_key_ceremony? || election.bb_tally_started?
         end
       end
     end

data/app/controllers/decidim/votings/admin/votings_landing_page_content_blocks_controller.rb

@@ -18,7 +18,7 @@ module Decidim
         end
 
         def scoped_resource
-          @scoped_resource ||= Voting.find_by(slug: params[:voting_slug], organization: current_organization)
+          @scoped_resource ||= Voting.find_by(slug: params[:voting_slug])
         end
 
         def enforce_permission_to_update_resource

data/app/controllers/decidim/votings/admin/votings_landing_page_controller.rb

@@ -16,7 +16,7 @@ module Decidim
         end
 
         def scoped_resource
-          @scoped_resource ||= Voting.find_by(slug: params[:voting_slug], organization: current_organization)
+          @scoped_resource ||= Voting.find_by(slug: params[:voting_slug])
         end
 
         def enforce_permission_to_update_resource

data/app/controllers/decidim/votings/polling_officer_zone/closures_controller.rb

@@ -111,11 +111,7 @@ module Decidim
         end
 
         def election
-          @election ||= Decidim::Elections::Election
-                        .joins("INNER JOIN decidim_components component ON component.id = decidim_elections_elections.decidim_component_id")
-                        .where(component: { participatory_space: current_organization.participatory_spaces })
-                        .includes(questions: :answers)
-                        .find_by(id: params[:election_id])
+          @election ||= Decidim::Elections::Election.includes(questions: :answers).find_by(id: params[:election_id])
         end
 
         def polling_station

data/app/controllers/decidim/votings/polling_officer_zone/in_person_votes_controller.rb

@@ -121,11 +121,7 @@ module Decidim
         end
 
         def election
-          @election ||= Decidim::Elections::Election
-                        .joins("INNER JOIN decidim_components component ON component.id = decidim_elections_elections.decidim_component_id")
-                        .where(component: { participatory_space: current_organization.participatory_spaces })
-                        .includes(questions: :answers)
-                        .find_by(id: params[:election_id])
+          @election ||= Decidim::Elections::Election.find(params[:election_id])
         end
 
         def polling_officer

data/app/controllers/decidim/votings/votings_controller.rb

@@ -49,11 +49,15 @@ module Decidim
       end
 
       def show_check_census
+        raise ActionController::RoutingError, "Not Found" unless current_participatory_space.check_census_enabled?
+
         @form = form(Census::CheckForm).instance
         render :check_census, locals: { success: false, not_found: false }
       end
 
       def check_census
+        raise ActionController::RoutingError, "Not Found" unless current_participatory_space.check_census_enabled?
+
         @form = form(Census::CheckForm).from_params(params).with_context(
           current_participatory_space: current_participatory_space
         )
@@ -99,7 +103,7 @@ module Decidim
       end
 
       def election
-        @election ||= Decidim::Elections::Election.where(component: current_participatory_space.components).find(params[:election_id])
+        @election ||= Decidim::Elections::Election.find(params[:election_id])
       end
 
       def elections
@@ -129,8 +133,8 @@ module Decidim
       end
 
       def paginated_votings
-        @paginated_votings ||= reorder(search.results.published)
-        @paginated_votings = paginate(@paginated_votings)
+        @paginated_votings ||= paginate(search.result.published)
+        @paginated_votings = reorder(@paginated_votings)
       end
 
       def promoted_votings
@@ -138,7 +142,7 @@ module Decidim
       end
 
       def finished_votings
-        @finished_votings ||= search_klass.new(search_params.merge(state: ["finished"])).results
+        @finished_votings ||= search_with(filter_params.merge(with_any_date: %w(finished))).result
       end
 
       def only_finished_votings?
@@ -147,21 +151,14 @@ module Decidim
         published_votings.count == finished_votings.count
       end
 
-      def search_klass
-        VotingSearch
+      def search_collection
+        Voting.where(organization: current_organization).published
       end
 
       def default_filter_params
         {
-          search_text: "",
-          state: [""]
-        }
-      end
-
-      def context_params
-        {
-          organization: current_organization,
-          current_user: current_user
+          search_text_cont: "",
+          with_any_date: [""]
         }
       end
 

data/app/forms/decidim/elections/admin/setup_form.rb

@@ -13,12 +13,6 @@ module Decidim
           validations.each do |message, t_args, valid|
             errors.add(message, I18n.t("steps.create_election.errors.#{message}", **t_args, scope: "decidim.elections.admin")) unless valid
           end
-
-          if needs_census?
-            census_validations.each do |message, t_args, valid|
-              errors.add(message, I18n.t("steps.create_election.errors.#{message}", **t_args, scope: "decidim.elections.admin")) unless valid
-            end
-          end
         end
 
         def current_step; end
@@ -41,30 +35,13 @@ module Decidim
             [:max_selections, {}, election.valid_questions?],
             [:published, {}, election.published_at.present?],
             [:component_published, {}, election.component.published?],
-            [:time_before, { hours: I18n.t("datetime.distance_in_words.x_hours", count: Decidim::Elections.setup_minimum_hours_before_start) },
-             election.minimum_hours_before_start?],
+            [:time_before, { hours: Decidim::Elections.setup_minimum_hours_before_start }, election.minimum_hours_before_start?],
             [:trustees_number, { number: bulletin_board.number_of_trustees }, participatory_space_trustees_with_public_key.size >= bulletin_board.number_of_trustees]
           ].freeze
         end
 
-        def census_validations
-          return [] unless needs_census?
-
-          @census_validations ||= [
-            [:census_uploaded, {}, census.present? && census.data.exists?],
-            [:census_codes_generated, {}, census_codes_generated?],
-            [:census_frozen, {}, census&.freeze?]
-          ].freeze
-        end
-
         def messages
-          @messages ||= validations.map do |message, t_args, _valid|
-            [message, I18n.t("steps.create_election.requirements.#{message}", **t_args, scope: "decidim.elections.admin")]
-          end.to_h
-        end
-
-        def census_messages
-          @census_messages ||= census_validations.to_h do |message, t_args, _valid|
+          @messages ||= validations.to_h do |message, t_args, _valid|
             [message, I18n.t("steps.create_election.requirements.#{message}", **t_args, scope: "decidim.elections.admin")]
           end
         end
@@ -81,26 +58,6 @@ module Decidim
           @bulletin_board ||= context[:bulletin_board] || Decidim::Elections.bulletin_board
         end
 
-        def needs_census?
-          vote_flow.is_a?(Decidim::Votings::CensusVoteFlow)
-        end
-
-        def vote_flow
-          @vote_flow ||= election.participatory_space.try(:vote_flow_for, election)
-        end
-
-        def census_codes_generated?
-          return unless needs_census?
-
-          census&.codes_generated? || census&.exporting_codes? || census&.freeze?
-        end
-
-        def census
-          return unless needs_census?
-
-          @census ||= election.component.participatory_space.dataset
-        end
-
         def main_button?
           true
         end
@@ -108,7 +65,7 @@ module Decidim
         private
 
         def choose_random_trustees
-          return @trustee_ids if @trustee_ids.any? || defined?(@trustees)
+          return @trustee_ids if @trustee_ids&.any? || defined?(@trustees)
 
           @trustees = if participatory_space_trustees_with_public_key.count >= bulletin_board.number_of_trustees
                         participatory_space_trustees_with_public_key.sample(bulletin_board.number_of_trustees)

data/app/forms/decidim/elections/admin/vote_period_form.rb

@@ -27,9 +27,9 @@ module Decidim
         end
 
         def messages
-          @messages ||= validations.map do |message, t_args, _valid|
+          @messages ||= validations.to_h do |message, t_args, _valid|
             [message, I18n.t("steps.#{current_step}.requirements.#{message}", **t_args, scope: "decidim.elections.admin")]
-          end.to_h
+          end
         end
       end
     end

data/app/forms/decidim/votings/admin/ballot_style_form.rb

@@ -11,7 +11,7 @@ module Decidim
         validates :code, presence: true
 
         def code
-          @code&.upcase
+          super&.upcase
         end
       end
     end

data/app/forms/decidim/votings/admin/voting_form.rb

@@ -15,11 +15,12 @@ module Decidim
         attribute :scope_id, Integer
         attribute :promoted, Boolean
         attribute :remove_banner_image, Boolean, default: false
-        attribute :banner_image, String
+        attribute :banner_image
         attribute :remove_introductory_image, Boolean, default: false
-        attribute :introductory_image, String
+        attribute :introductory_image
         attribute :voting_type, String
         attribute :census_contact_information, String
+        attribute :show_check_census, Boolean, default: false
 
         validates :title, translatable_presence: true
         validates :description, translatable_presence: true
@@ -29,7 +30,7 @@ module Decidim
         validates :end_time, presence: true, date: { after: :start_time }
         validates :banner_image, passthru: { to: Decidim::Votings::Voting }
         validates :introductory_image, passthru: { to: Decidim::Votings::Voting }
-        validates :voting_type, presence: true, inclusion: { in: Votings::Voting.voting_types, message: "%{value} is not a valid voting type" }
+        validates :voting_type, presence: true, inclusion: { in: Votings::Voting.voting_types }
 
         validates :scope, presence: true, if: proc { |object| object.scope_id.present? }
 

data/app/forms/decidim/votings/census/admin/dataset_form.rb

@@ -6,14 +6,11 @@ module Decidim
       module Admin
         # A form to temporaly upload csv census data
         class DatasetForm < Form
-          include Decidim::HasUploadValidations
-
           mimic :dataset
 
-          attribute :file
+          attribute :file, Decidim::Attributes::Blob
 
-          validates_upload :file
-          validates :file, presence: true
+          validates :file, presence: true, file_content_type: { allow: ["text/csv"] }
 
           def organization
             context.current_participatory_space&.organization

data/app/forms/decidim/votings/census/admin/datum_form.rb

@@ -25,7 +25,7 @@ module Decidim
                     presence: true
 
           def ballot_style_code
-            @ballot_style_code&.upcase
+            super&.upcase
           end
         end
       end