decidim-action_delegator 0.8.1 → 0.9.0

data/app/controllers/decidim/action_delegator/admin/manage_participants_controller.rb

@@ -7,7 +7,7 @@ module Decidim
         include NeedsPermission
         include Decidim::Paginable
 
-        helper ::Decidim::ActionDelegator::Admin::DelegationHelper
+        helper ::Decidim::ActionDelegator::Admin::SettingsHelper
         helper_method :organization_settings, :current_setting
 
         layout "decidim/admin/users"
@@ -15,22 +15,23 @@ module Decidim
         def new
           enforce_permission_to :create, :participant
 
+          @form = CsvImportForm.from_params(params)
           @errors = []
         end
 
         def create
           enforce_permission_to :create, :participant
 
-          @csv_file = params[:csv_file]
-          redirect_to seting_manage_participants_path && return if @csv_file.blank?
+          @form = CsvImportForm.from_params(params)
 
-          importer_type = "ParticipantsCsvImporter"
-          csv_file = @csv_file.read.force_encoding("utf-8").encode("utf-8")
-          @import_summary = Decidim::ActionDelegator::Admin::ImportCsvJob.perform_later(importer_type, csv_file, current_user, current_setting)
-
-          flash[:notice] = t(".success")
-
-          redirect_to decidim_admin_action_delegator.setting_participants_path(current_setting)
+          if @form.valid?
+            csv = @form.csv_file.download.force_encoding("utf-8").encode("utf-8")
+            @import_summary = ImportCsvJob.perform_now("ParticipantsCsvImporter", csv, current_user, current_setting)
+            flash[:notice] = t(".success")
+            redirect_to setting_participants_path(current_setting)
+          else
+            render :new
+          end
         end
 
         def destroy_all
@@ -43,16 +44,6 @@ module Decidim
           flash[:notice] = I18n.t("participants.remove_census.success", scope: "decidim.action_delegator.admin", participants_count: participants_to_remove.count)
           redirect_to setting_participants_path(current_setting)
         end
-
-        private
-
-        def current_setting
-          @current_setting ||= organization_settings.find_by(id: params[:setting_id])
-        end
-
-        def organization_settings
-          Decidim::ActionDelegator::OrganizationSettings.new(current_organization).query
-        end
       end
     end
   end

data/app/controllers/decidim/action_delegator/admin/participants_controller.rb

@@ -7,7 +7,7 @@ module Decidim
         include NeedsPermission
         include Decidim::Paginable
 
-        helper ::Decidim::ActionDelegator::Admin::DelegationHelper
+        helper ::Decidim::ActionDelegator::Admin::SettingsHelper
         helper_method :current_setting, :participants
 
         layout "decidim/admin/users"
@@ -88,14 +88,6 @@ module Decidim
         def collection
           @collection ||= current_setting.participants
         end
-
-        def current_setting
-          @current_setting ||= organization_settings.find_by(id: params[:setting_id])
-        end
-
-        def organization_settings
-          ActionDelegator::OrganizationSettings.new(current_organization).query
-        end
       end
     end
   end

data/app/controllers/decidim/action_delegator/admin/permissions_controller.rb

@@ -4,36 +4,13 @@ module Decidim
   module ActionDelegator
     module Admin
       class PermissionsController < ActionDelegator::Admin::ApplicationController
-        def create
-          enforce_permission_to :update, :setting
-          return redirect_to decidim_admin_action_delegator.settings_path unless setting&.consultation
-
-          FixResourcePermissions.call(setting.consultation.questions) do
-            on(:ok) do
-              notice = I18n.t("permissions.update.success", scope: "decidim.action_delegator.admin")
-              redirect_to decidim_admin_action_delegator.settings_path, notice: notice
-            end
-
-            on(:invalid) do |_error|
-              flash.now[:error] = I18n.t("permissions.update.error", scope: "decidim.action_delegator.admin")
-              render :new
-            end
-          end
-        end
-
         def sync
           enforce_permission_to :update, :setting
 
-          SyncParticipantsJob.perform_later(setting)
+          SyncParticipantsJob.perform_later(current_setting)
           notice = I18n.t("permissions.sync.started", scope: "decidim.action_delegator.admin")
           redirect_to decidim_admin_action_delegator.settings_path, notice: notice
         end
-
-        private
-
-        def setting
-          @setting ||= Decidim::ActionDelegator::Setting.find(params[:setting_id])
-        end
       end
     end
   end

data/app/controllers/decidim/action_delegator/admin/ponderations_controller.rb

@@ -87,14 +87,6 @@ module Decidim
         def collection
           @collection ||= current_setting.ponderations
         end
-
-        def current_setting
-          @current_setting ||= organization_settings.find_by(id: params[:setting_id])
-        end
-
-        def organization_settings
-          ActionDelegator::OrganizationSettings.new(current_organization).query
-        end
       end
     end
   end

data/app/controllers/decidim/action_delegator/admin/settings_controller.rb

@@ -4,12 +4,12 @@ module Decidim
   module ActionDelegator
     module Admin
       class SettingsController < ActionDelegator::Admin::ApplicationController
-        helper ::Decidim::ActionDelegator::Admin::DelegationHelper
+        helper ::Decidim::ActionDelegator::Admin::SettingsHelper
         include Filterable
         include Paginable
 
         layout "decidim/admin/users"
-        helper_method :settings, :settings_select_options, :copy_from_setting
+        helper_method :settings_select_options, :copy_from_setting, :settings
 
         def index
           enforce_permission_to :index, :setting
@@ -42,7 +42,7 @@ module Decidim
         def edit
           enforce_permission_to :update, :setting
 
-          @form = form(SettingForm).from_model(setting)
+          @form = form(SettingForm).from_model(current_setting)
         end
 
         def update
@@ -50,7 +50,7 @@ module Decidim
 
           @form = form(SettingForm).from_params(params)
 
-          UpdateSetting.call(@form, setting, copy_from_setting) do
+          UpdateSetting.call(@form, current_setting, copy_from_setting) do
             on(:ok) do
               notice = I18n.t("settings.update.success", scope: "decidim.action_delegator.admin")
               redirect_to decidim_admin_action_delegator.settings_path, notice: notice
@@ -64,9 +64,9 @@ module Decidim
         end
 
         def destroy
-          enforce_permission_to :destroy, :setting, resource: setting
+          enforce_permission_to :destroy, :setting, resource: current_setting
 
-          if setting.destroy
+          if current_setting.destroy
             flash[:notice] = I18n.t("settings.destroy.success", scope: "decidim.action_delegator.admin")
           else
             flash[:error] = I18n.t("settings.destroy.error", scope: "decidim.action_delegator.admin")
@@ -78,15 +78,15 @@ module Decidim
         private
 
         def setting_params
-          params.require(:setting).permit(:max_grants, :decidim_consultation_id)
+          params.require(:setting).permit(:max_grants)
         end
 
         def build_setting
           Setting.new(setting_params)
         end
 
-        def setting
-          @setting ||= collection.find_by(id: params[:id])
+        def current_setting
+          @current_setting ||= collection.find_by(id: params[:id])
         end
 
         def settings
@@ -94,15 +94,15 @@ module Decidim
         end
 
         def collection
-          @collection ||= ActionDelegator::OrganizationSettings.new(current_organization).query
+          organization_settings
         end
 
         def settings_select_options
-          collection.to_h { |setting| [setting.consultation.id, translated_attribute(setting.title)] }
+          collection.to_h { |setting| [setting.id, translated_attribute(setting.title)] }
         end
 
         def copy_from_setting
-          @copy_from_setting ||= Setting.find_by(decidim_consultation_id: params[:setting][:copy_from_setting_id])
+          @copy_from_setting ||= Setting.find_by(id: params[:setting][:copy_from_setting_id])
         end
       end
     end

data/app/controllers/decidim/action_delegator/application_controller.rb

@@ -6,9 +6,9 @@ module Decidim
     # this engine inherit.
     #
     class ApplicationController < Decidim::ApplicationController
-      # def permission_class_chain
-      #  [::Decidim::ActionDelegator::Permissions] + super
-      # end
+      def permission_class_chain
+        [::Decidim::ActionDelegator::Permissions] + super
+      end
     end
   end
 end

data/app/controllers/decidim/action_delegator/elections/admin/results_controller.rb

@@ -0,0 +1,58 @@
+# frozen_string_literal: true
+
+module Decidim
+  module ActionDelegator
+    module Elections
+      module Admin
+        class ResultsController < ActionDelegator::Admin::ApplicationController
+          include ::Decidim::ActionDelegator::SettingsHelper
+
+          # TODO: authentication
+          def by_type_and_weight
+            render json: {
+              id: election.id,
+              ongoing: election.ongoing?,
+              questions: election.questions.map do |question|
+                {
+                  id: question.id,
+                  response_options: elections_question_responses_by_type(question)
+                }
+              end
+            }
+          end
+
+          def sum_of_weights
+            render json: {
+              id: election.id,
+              ongoing: election.ongoing?,
+              questions: election.questions.map do |question|
+                {
+                  id: question.id,
+                  response_options: elections_question_weighted_responses(question)
+                }
+              end
+            }
+          end
+
+          def totals
+            render json: {
+              id: election.id,
+              ongoing: election.ongoing?,
+              questions: election.questions.map do |question|
+                { id: question.id }.merge(
+                  elections_question_stats(question)
+                )
+              end
+            }
+          end
+
+          private
+
+          def election
+            @election ||= Decidim::Elections::Election.includes(questions: { votes: :versions }).find(params[:id])
+          end
+        end
+      end
+    end
+  end
+end

data/app/controllers/decidim/action_delegator/elections/results_controller.rb

@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+module Decidim
+  module ActionDelegator
+    module Elections
+      class ResultsController < ActionDelegator::ApplicationController
+        include ::Decidim::ActionDelegator::SettingsHelper
+
+        # TODO: authentication, ensure published results
+        def sum_of_weights
+          render json: {
+            id: election.id,
+            ongoing: election.ongoing?,
+            questions: election.questions.map do |question|
+              {
+                id: question.id,
+                body: translated_attribute(question.body),
+                published_results: question.published_results?,
+                response_options: elections_question_weighted_responses(question).map do |option|
+                  option.slice!(:id, :question_id, :body) unless election.result_published_questions.include?(question)
+                  option
+                end
+              }
+            end
+          }
+        end
+
+        private
+
+        def election
+          @election ||= Decidim::Elections::Election.published.includes(questions: { votes: :versions }).find(params[:id])
+        end
+      end
+    end
+  end
+end

data/app/controllers/decidim/action_delegator/user_delegations_controller.rb

@@ -15,7 +15,7 @@ module Decidim
       private
 
       def delegations
-        @delegations ||= Delegation.where(grantee_id: current_user.id)
+        @delegations ||= user_signed_in? ? Delegation.where(grantee_id: current_user.id) : Delegation.none
       end
     end
   end

data/app/controllers/decidim/action_delegator/verifications/delegations_verifier/authorizations_controller.rb

@@ -8,27 +8,26 @@ module Decidim
           include Decidim::FormFactory
           include Decidim::Verifications::Renewable
 
-          helper_method :authorization, :setting
+          helper_method :authorization, :active_settings
 
           before_action do
-            unless setting
+            unless active_settings
               flash[:alert] = t("verifications.delegations_verifier.not_active", scope: "decidim.action_delegator")
               redirect
             end
           end
 
-          def new
-            @authorization.destroy! if authorization&.persisted? && !authorization&.granted?
+          def new # rubocop:disable Metrics/CyclomaticComplexity
+            authorization.destroy! if authorization&.persisted? && !authorization&.granted?
 
             enforce_permission_to :create, :authorization, authorization: authorization
-            @form = form(DelegationsVerifierForm).instance(setting: setting)
-            participant = @form&.participant
+            @form = delegation_form = form(DelegationsVerifierForm).instance(active_settings: active_settings)
 
-            return unless ActionDelegator.authorize_on_login && setting&.verify_with_email?
+            return unless ActionDelegator.authorize_on_login && @form&.setting&.verify_with_email?
 
             Decidim::Verifications::PerformAuthorizationStep.call(authorization, @form) do
               on(:ok) do
-                grant_and_redirect(participant)
+                grant_and_redirect(delegation_form&.participant)
               end
               on(:invalid) do
                 render :new
@@ -39,17 +38,16 @@ module Decidim
           def create
             enforce_permission_to :create, :authorization, authorization: authorization
 
-            @form = form(DelegationsVerifierForm).from_params(params, setting: setting)
-            participant = @form&.participant
+            @form = delegation_form = form(DelegationsVerifierForm).from_params(params, active_settings: active_settings)
 
             Decidim::Verifications::PerformAuthorizationStep.call(authorization, @form) do
               on(:ok) do
-                if setting.phone_required?
+                if delegation_form&.setting&.phone_required?
                   flash[:notice] = t("authorizations.create.success", scope: "decidim.verifications.sms")
                   authorization_method = Decidim::Verifications::Adapter.from_element(authorization.name)
                   redirect_to authorization_method.resume_authorization_path(redirect_url: redirect_url)
                 else
-                  grant_and_redirect(participant)
+                  grant_and_redirect(delegation_form&.participant)
                 end
               end
               on(:invalid) do
@@ -96,6 +94,8 @@ module Decidim
           private
 
           def grant_and_redirect(participant)
+            return unless participant
+
             authorization.grant!
             participant.update!(decidim_user: authorization.user)
             flash[:notice] = t("authorizations.update.success", scope: "decidim.verifications.sms")
@@ -117,12 +117,8 @@ module Decidim
             )
           end
 
-          def setting
-            @setting ||= all_settings.first
-          end
-
-          def all_settings
-            @all_settings ||= OrganizationSettings.new(current_user.organization).active
+          def active_settings
+            @active_settings ||= Setting.where(organization: current_user.organization).active
           end
         end
       end

data/app/forms/decidim/action_delegator/admin/action_delegator_census_form.rb

@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+
+module Decidim
+  module ActionDelegator
+    module Admin
+      # A form object that extends the internal users census form with setting selection.
+      class ActionDelegatorCensusForm < Decidim::Elections::Admin::Censuses::InternalUsersForm
+        attribute :setting_id, Integer
+
+        validates :setting_id, presence: true
+        validate :setting_exists_and_belongs_to_organization
+
+        # Returns the settings that need to be persisted in the census.
+        def census_settings
+          super.merge("setting_id" => setting_id)
+        end
+
+        def available_settings
+          @available_settings ||= Decidim::ActionDelegator::Setting
+                                  .where(organization: current_organization, active: true)
+                                  .order(:title)
+        end
+
+        def settings_for_select
+          available_settings.map { |setting| [setting.presenter.translated_title, setting.id] }
+        end
+
+        def setting
+          @setting ||= available_settings.find_by(id: setting_id) if setting_id.present?
+        end
+
+        private
+
+        def setting_exists_and_belongs_to_organization
+          return if setting_id.blank?
+
+          return if available_settings.exists?(id: setting_id)
+
+          errors.add(:setting_id, :invalid)
+        end
+      end
+    end
+  end
+end

data/app/forms/decidim/action_delegator/admin/csv_import_form.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+# app/forms/decidim/action_delegator/admin/delegation_import_form.rb
+module Decidim
+  module ActionDelegator
+    module Admin
+      class CsvImportForm < Decidim::Form
+        include Decidim::HasUploadValidations
+
+        attribute :csv_file, Decidim::Attributes::Blob
+        attribute :setting_id, Integer
+
+        validates :csv_file, presence: true, file_content_type: { allow: ["text/csv"] }
+      end
+    end
+  end
+end

data/app/forms/decidim/action_delegator/admin/delegation_form.rb

@@ -18,15 +18,19 @@ module Decidim
         validate :grantee_exists
 
         def granter
-          User.find_by(id: granter_id) || User.find_by(email: granter_email)
+          User.find_by(id: granter_id, organization: current_organization) || User.find_by(email: granter_email, organization: current_organization)
         end
 
         def grantee
-          User.find_by(id: grantee_id) || User.find_by(email: grantee_email)
+          User.find_by(id: grantee_id, organization: current_organization) || User.find_by(email: grantee_email, organization: current_organization)
         end
 
         private
 
+        def current_organization
+          context&.current_organization
+        end
+
         def granter_exists
           return if granter.present?
 

data/app/forms/decidim/action_delegator/admin/ponderation_form.rb

@@ -9,7 +9,8 @@ module Decidim
         attribute :weight, Decimal, default: 1.0
         attribute :name, String
 
-        validates :weight, :name, presence: true
+        validates :name, presence: true
+        validates :weight, presence: true, numericality: { greater_than: 0 }
         validate :name_uniqueness
 
         def name_uniqueness

data/app/forms/decidim/action_delegator/admin/setting_form.rb

@@ -3,24 +3,30 @@
 module Decidim
   module ActionDelegator
     module Admin
-      class SettingForm < Form
+      class SettingForm < Decidim::Form
+        include TranslatableAttributes
+
         mimic :setting
 
+        translatable_attribute :title, String
+        translatable_attribute :description, String
         attribute :max_grants, Integer
-        attribute :decidim_consultation_id, Integer
         attribute :authorization_method, String
         attribute :copy_from_setting_id, Integer
+        attribute :active, Boolean, default: false
 
-        validates :max_grants, :decidim_consultation_id, presence: true
-        validate :consultation_uniqueness
+        validates :max_grants, presence: true
+        validates :max_grants, numericality: { greater_than: 0 }
+        validates :title, translatable_presence: true
 
-        # TODO: validate consultation vote starting in the future
-        def consultation_uniqueness
-          errors.add(:decidim_consultation_id, :taken) if record.exists?(decidim_consultation_id: decidim_consultation_id)
-        end
+        validate :only_one_active_setting_per_phone_required
+
+        private
+
+        def only_one_active_setting_per_phone_required
+          return unless active && authorization_method.in?(%w(phone both))
 
-        def record
-          Setting.where.not(id: id)
+          errors.add(:base, :only_one_active_setting_per_phone_required) if Setting.active.phone_required.where.not(id: id).any?
         end
       end
     end

data/app/forms/decidim/action_delegator/censuses/internal_users_form.rb

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+module Decidim
+  module ActionDelegator
+    module Censuses
+      # This class does the same as Decidim::Elections::Censuses::InternalUsersForm
+      # but it provides the extra explanations from the authorizer
+      # hopefully this will be not needed form Decidim v0.32 onwards
+      class InternalUsersForm < Decidim::Elections::Censuses::InternalUsersForm
+        delegate :organization, to: :current_user
+
+        attr_reader :authorization_status
+
+        def authorization_handlers
+          @authorization_handlers ||= election.census_settings&.fetch("authorization_handlers", {})&.slice(*organization.available_authorizations)
+        end
+
+        private
+
+        def user_authenticated
+          return errors.add(:base, I18n.t("decidim.elections.censuses.internal_users_form.invalid")) unless in_census?
+
+          @authorization_status = Decidim::ActionAuthorizer::AuthorizationStatusCollection.new(authorization_handlers, current_user, election.component, election)
+
+          return if @authorization_status.ok?
+
+          errors.add(:base, I18n.t("decidim.elections.censuses.internal_users_form.invalid"))
+        end
+      end
+    end
+  end
+end