decidim-participatory_processes 0.28.2 → 0.29.0.rc2

data/app/commands/decidim/participatory_processes/admin/update_participatory_process.rb

@@ -3,95 +3,25 @@
 module Decidim
   module ParticipatoryProcesses
     module Admin
-      # A command with all the business logic when creating a new participatory
+      # A command with all the business logic when updating a participatory
       # process in the system.
-      class UpdateParticipatoryProcess < Decidim::Command
-        include ::Decidim::AttachmentAttributesMethods
+      class UpdateParticipatoryProcess < Decidim::Commands::UpdateResource
+        fetch_file_attributes :hero_image
 
-        # Public: Initializes the command.
-        #
-        # participatory_process - the ParticipatoryProcess to update
-        # form - A form object with the params.
-        def initialize(participatory_process, form)
-          @participatory_process = participatory_process
-          @form = form
-        end
-
-        # Executes the command. Broadcasts these events:
-        #
-        # - :ok when everything is valid.
-        # - :invalid if the form was not valid and we could not proceed.
-        #
-        # Returns nothing.
-        def call
-          return broadcast(:invalid) if form.invalid?
-
-          update_participatory_process
-
-          if @participatory_process.valid?
-            broadcast(:ok, @participatory_process)
-          else
-            form.errors.add(:hero_image, @participatory_process.errors[:hero_image]) if @participatory_process.errors.include? :hero_image
-            form.errors.add(:banner_image, @participatory_process.errors[:banner_image]) if @participatory_process.errors.include? :banner_image
-            broadcast(:invalid)
-          end
-        end
+        fetch_form_attributes :title, :subtitle, :weight, :slug, :hashtag, :promoted, :description,
+                              :short_description, :scopes_enabled, :scope, :scope_type_max_depth,
+                              :private_space, :developer_group, :local_area, :area, :target, :participatory_scope,
+                              :participatory_structure, :meta_scope, :start_date, :end_date, :participatory_process_group,
+                              :participatory_process_type, :announcement
 
         private
 
-        attr_reader :form, :participatory_process
-
-        def update_participatory_process
-          @participatory_process.assign_attributes(attributes)
-          return unless @participatory_process.valid?
-
-          @participatory_process.save!
-
-          Decidim.traceability.perform_action!(:update, @participatory_process, form.current_user) do
-            @participatory_process
-          end
-          link_related_processes
-        end
-
-        def attributes
-          {
-            title: form.title,
-            subtitle: form.subtitle,
-            weight: form.weight,
-            slug: form.slug,
-            hashtag: form.hashtag,
-            promoted: form.promoted,
-            description: form.description,
-            short_description: form.short_description,
-            scopes_enabled: form.scopes_enabled,
-            scope: form.scope,
-            scope_type_max_depth: form.scope_type_max_depth,
-            private_space: form.private_space,
-            developer_group: form.developer_group,
-            local_area: form.local_area,
-            area: form.area,
-            target: form.target,
-            participatory_scope: form.participatory_scope,
-            participatory_structure: form.participatory_structure,
-            meta_scope: form.meta_scope,
-            start_date: form.start_date,
-            end_date: form.end_date,
-            participatory_process_group: form.participatory_process_group,
-            participatory_process_type: form.participatory_process_type,
-            show_metrics: form.show_metrics,
-            show_statistics: form.show_statistics,
-            announcement: form.announcement
-          }.merge(
-            attachment_attributes(:hero_image, :banner_image)
-          )
-        end
-
         def related_processes
           @related_processes ||= Decidim::ParticipatoryProcess.where(id: form.related_process_ids)
         end
 
-        def link_related_processes
-          @participatory_process.link_participatory_space_resources(related_processes, "related_processes")
+        def run_after_hooks
+          resource.link_participatory_space_resources(related_processes, "related_processes")
         end
       end
     end

data/app/commands/decidim/participatory_processes/admin/update_participatory_process_group.rb

@@ -3,69 +3,20 @@
 module Decidim
   module ParticipatoryProcesses
     module Admin
-      # A command with all the business logic when creating a new participatory
+      # A command with all the business logic when updating a participatory
       # process group in the system.
-      class UpdateParticipatoryProcessGroup < Decidim::Command
-        include ::Decidim::AttachmentAttributesMethods
+      class UpdateParticipatoryProcessGroup < Decidim::Commands::UpdateResource
+        fetch_file_attributes :hero_image
 
-        # Public: Initializes the command.
-        #
-        # participatory_process_group - the ParticipatoryProcessGroup to update
-        # form - A form object with the params.
-        def initialize(participatory_process_group, form)
-          @participatory_process_group = participatory_process_group
-          @form = form
-        end
-
-        # Executes the command. Broadcasts these events:
-        #
-        # - :ok when everything is valid.
-        # - :invalid if the form was not valid and we could not proceed.
-        #
-        # Returns nothing.
-        def call
-          return broadcast(:invalid) if form.invalid?
-
-          update_participatory_process_group
-
-          if @participatory_process_group.valid?
-            broadcast(:ok, @participatory_process_group)
-          else
-            form.errors.add(:hero_image, @participatory_process_group.errors[:hero_image]) if @participatory_process_group.errors.include? :hero_image
-            broadcast(:invalid)
-          end
-        end
+        fetch_form_attributes :title, :description, :hashtag, :group_url, :developer_group, :local_area,
+                              :meta_scope, :participatory_scope, :participatory_structure, :target, :promoted
 
         private
 
         attr_reader :form
 
-        def update_participatory_process_group
-          Decidim.traceability.perform_action!(
-            "update",
-            @participatory_process_group,
-            form.current_user
-          ) do
-            @participatory_process_group.assign_attributes(attributes)
-            @participatory_process_group.save! if @participatory_process_group.valid?
-          end
-        end
-
         def attributes
-          {
-            title: form.title,
-            description: form.description,
-            hashtag: form.hashtag,
-            group_url: form.group_url,
-            participatory_processes:,
-            developer_group: form.developer_group,
-            local_area: form.local_area,
-            meta_scope: form.meta_scope,
-            participatory_scope: form.participatory_scope,
-            participatory_structure: form.participatory_structure,
-            target: form.target,
-            promoted: form.promoted
-          }.merge(attachment_attributes(:hero_image))
+          super.merge({ participatory_processes: })
         end
 
         def participatory_processes

data/app/commands/decidim/participatory_processes/admin/update_participatory_process_step.rb

@@ -3,65 +3,21 @@
 module Decidim
   module ParticipatoryProcesses
     module Admin
-      # A command with all the business logic when creating a new participatory
-      # process in the system.
-      class UpdateParticipatoryProcessStep < Decidim::Command
-        attr_reader :step
-
-        # Public: Initializes the command.
-        #
-        # step - the ParticipatoryProcessStep to update
-        # form - A form object with the params.
-        def initialize(step, form)
-          @step = step
-          @form = form
-        end
-
-        # Executes the command. Broadcasts these events:
-        #
-        # - :ok when everything is valid.
-        # - :invalid if the form was not valid and we could not proceed.
-        #
-        # Returns nothing.
-        def call
-          return broadcast(:invalid) if form.invalid?
-
-          update_step
-          notify_followers
-          broadcast(:ok)
-        end
+      # A command with all the business logic when updating a participatory
+      # process step in the system.
+      class UpdateParticipatoryProcessStep < Decidim::Commands::UpdateResource
+        fetch_form_attributes :cta_path, :cta_text, :title, :start_date, :end_date, :description
 
         private
 
-        attr_reader :form
-
-        def update_step
-          Decidim.traceability.update!(
-            step,
-            form.current_user,
-            attributes
-          )
-        end
-
-        def attributes
-          {
-            cta_path: form.cta_path,
-            cta_text: form.cta_text,
-            title: form.title,
-            start_date: form.start_date,
-            end_date: form.end_date,
-            description: form.description
-          }
-        end
-
-        def notify_followers
-          return unless step.saved_change_to_start_date || step.saved_change_to_end_date
+        def run_after_hooks
+          return unless resource.saved_change_to_start_date || resource.saved_change_to_end_date
 
           Decidim::EventsManager.publish(
             event: "decidim.events.participatory_process.step_changed",
             event_class: Decidim::ParticipatoryProcessStepChangedEvent,
-            resource: step,
-            followers: step.participatory_process.followers
+            resource:,
+            followers: resource.participatory_process.followers
           )
         end
       end

data/app/commands/decidim/participatory_processes/admin/update_participatory_process_type.rb

@@ -5,44 +5,8 @@ module Decidim
     module Admin
       # A command with all the business logic when updating a participatory
       # process type in the system.
-      class UpdateParticipatoryProcessType < Decidim::Command
-        # Public: Initializes the command.
-        #
-        # participatory_process_type - A participatory_process_type object to
-        # update
-        # form - A form object with the params.
-        def initialize(participatory_process_type, form)
-          @participatory_process_type = participatory_process_type
-          @form = form
-        end
-
-        # Executes the command. Broadcasts these events:
-        #
-        # - :ok when everything is valid.
-        # - :invalid if the form was not valid and we could not proceed.
-        #
-        # Returns nothing.
-        def call
-          return broadcast(:invalid) if form.invalid?
-
-          update_participatory_process_type!
-
-          broadcast(:ok)
-        end
-
-        private
-
-        attr_reader :form, :participatory_process_type
-
-        def update_participatory_process_type!
-          transaction do
-            Decidim.traceability.update!(
-              participatory_process_type,
-              form.current_user,
-              title: form.title
-            )
-          end
-        end
+      class UpdateParticipatoryProcessType < Decidim::Commands::UpdateResource
+        fetch_form_attributes :title
       end
     end
   end

data/app/controllers/decidim/participatory_processes/admin/participatory_process_copies_controller.rb

@@ -17,7 +17,7 @@ module Decidim
           enforce_permission_to :create, :process
           @form = form(ParticipatoryProcessCopyForm).from_params(params)
 
-          CopyParticipatoryProcess.call(@form, current_participatory_process, current_user) do
+          CopyParticipatoryProcess.call(@form, current_participatory_process) do
             on(:ok) do
               flash[:notice] = I18n.t("participatory_processes_copies.create.success", scope: "decidim.admin")
               redirect_to participatory_processes_path

data/app/controllers/decidim/participatory_processes/admin/participatory_process_groups_controller.rb

@@ -53,7 +53,7 @@ module Decidim
           enforce_permission_to :update, :process_group, process_group: @participatory_process_group
           @form = form(ParticipatoryProcessGroupForm).from_params(params)
 
-          UpdateParticipatoryProcessGroup.call(@participatory_process_group, @form) do
+          UpdateParticipatoryProcessGroup.call(@form, @participatory_process_group) do
             on(:ok) do |participatory_process_group|
               flash[:notice] = I18n.t("participatory_process_groups.update.success", scope: "decidim.admin")
               redirect_to edit_participatory_process_group_path(participatory_process_group)
@@ -70,7 +70,7 @@ module Decidim
           @participatory_process_group = collection.find(params[:id])
           enforce_permission_to :destroy, :process_group, process_group: @participatory_process_group
 
-          DestroyParticipatoryProcessGroup.call(@participatory_process_group, current_user) do
+          Decidim::Commands::DestroyResource.call(@participatory_process_group, current_user) do
             on(:ok) do
               flash[:notice] = I18n.t("participatory_process_groups.destroy.success", scope: "decidim.admin")
               redirect_to action: :index

data/app/controllers/decidim/participatory_processes/admin/participatory_process_steps_controller.rb

@@ -24,7 +24,7 @@ module Decidim
           enforce_permission_to :create, :process_step
           @form = form(ParticipatoryProcessStepForm).from_params(params)
 
-          CreateParticipatoryProcessStep.call(@form, current_participatory_process) do
+          CreateParticipatoryProcessStep.call(@form) do
             on(:ok) do
               flash[:notice] = I18n.t("participatory_process_steps.create.success", scope: "decidim.admin")
               redirect_to participatory_process_steps_path(current_participatory_process)
@@ -46,7 +46,7 @@ module Decidim
           enforce_permission_to :update, :process_step, process_step: @participatory_process_step
           @form = form(ParticipatoryProcessStepForm).from_params(params)
 
-          UpdateParticipatoryProcessStep.call(@participatory_process_step, @form) do
+          UpdateParticipatoryProcessStep.call(@form, @participatory_process_step) do
             on(:ok) do
               flash[:notice] = I18n.t("participatory_process_steps.update.success", scope: "decidim.admin")
               redirect_to participatory_process_steps_path(current_participatory_process)

data/app/controllers/decidim/participatory_processes/admin/participatory_process_types_controller.rb

@@ -57,7 +57,7 @@ module Decidim
           @form = participatory_process_type_form
                   .from_params(params, participatory_process_type: current_participatory_process_type)
 
-          UpdateParticipatoryProcessType.call(current_participatory_process_type, @form) do
+          UpdateParticipatoryProcessType.call(@form, current_participatory_process_type) do
             on(:ok) do
               flash[:notice] = I18n.t("participatory_process_types.update.success", scope: "decidim.admin")
               redirect_to participatory_process_types_path
@@ -74,7 +74,7 @@ module Decidim
         def destroy
           enforce_permission_to :destroy, :participatory_process_type, participatory_process_type: current_participatory_process_type
 
-          DestroyParticipatoryProcessType.call(current_participatory_process_type, current_user) do
+          Decidim::Commands::DestroyResource.call(current_participatory_process_type, current_user) do
             on(:ok) do
               flash[:notice] = I18n.t("participatory_process_types.destroy.success", scope: "decidim.admin")
               redirect_to participatory_process_types_path

data/app/controllers/decidim/participatory_processes/admin/participatory_processes_controller.rb

@@ -60,7 +60,7 @@ module Decidim
             process_id: current_participatory_process.id
           )
 
-          UpdateParticipatoryProcess.call(current_participatory_process, @form) do
+          UpdateParticipatoryProcess.call(@form, current_participatory_process) do
             on(:ok) do |participatory_process|
               flash[:notice] = I18n.t("participatory_processes.update.success", scope: "decidim.admin")
               redirect_to edit_participatory_process_path(participatory_process)

data/app/controllers/decidim/participatory_processes/admin/participatory_space_private_users_controller.rb

@@ -3,7 +3,7 @@
 module Decidim
   module ParticipatoryProcesses
     module Admin
-      # Controller that allows managing participatory process privte users
+      # Controller that allows managing participatory process private users
       class ParticipatorySpacePrivateUsersController < Decidim::Admin::ApplicationController
         include Concerns::ParticipatoryProcessAdmin
         include Decidim::Admin::Concerns::HasPrivateUsers

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

@@ -2,11 +2,14 @@
 
 module Decidim
   module ParticipatoryProcesses
+    # The main application controller for participatory processes
+    #
     # This controller is the abstract class from which all other controllers of
     # this engine inherit.
     class ApplicationController < Decidim::ApplicationController
       helper Decidim::ParticipatoryProcesses::ApplicationHelper
       helper ParticipatoryProcessHelper
+
       include NeedsPermission
 
       register_permissions(Decidim::ParticipatoryProcesses::ApplicationController,

data/app/controllers/decidim/participatory_processes/participatory_processes_controller.rb

@@ -6,7 +6,6 @@ module Decidim
     # public layout.
     class ParticipatoryProcessesController < Decidim::ParticipatoryProcesses::ApplicationController
       include ParticipatorySpaceContext
-      participatory_space_layout only: [:show, :all_metrics]
       include FilterResource
       include Paginable
       include HasParticipatorySpaceContentBlocks
@@ -33,11 +32,7 @@ module Decidim
       end
 
       def all_metrics
-        if current_participatory_space.show_statistics
-          enforce_permission_to :read, :process, process: current_participatory_space
-        else
-          render status: :not_found
-        end
+        enforce_permission_to :read, :process, process: current_participatory_space
       end
 
       private

data/app/events/decidim/participatory_process_role_assigned_event.rb

@@ -2,13 +2,8 @@
 
 module Decidim
   class ParticipatoryProcessRoleAssignedEvent < Decidim::Events::SimpleEvent
-    include Decidim::Events::NotificationEvent
     include Decidim::Events::AuthorEvent
 
-    def notification_title
-      I18n.t("notification_title", **i18n_options).html_safe
-    end
-
     def i18n_role
       I18n.t(extra["role"], scope: "decidim.admin.models.participatory_process_user_role.roles", default: extra["role"])
     end

data/app/forms/decidim/participatory_processes/admin/participatory_process_form.rb

@@ -37,16 +37,12 @@ module Decidim
         attribute :private_space, Boolean
         attribute :promoted, Boolean
         attribute :scopes_enabled, Boolean
-        attribute :show_metrics, Boolean
-        attribute :show_statistics, Boolean
         attribute :participatory_process_type_id, Integer
 
         attribute :end_date, Decidim::Attributes::LocalizedDate
         attribute :start_date, Decidim::Attributes::LocalizedDate
 
-        attribute :banner_image
         attribute :hero_image
-        attribute :remove_banner_image, Boolean, default: false
         attribute :remove_hero_image, Boolean, default: false
 
         validates :area, presence: true, if: proc { |object| object.area_id.present? }
@@ -57,7 +53,6 @@ module Decidim
 
         validates :title, :subtitle, :description, :short_description, translatable_presence: true
 
-        validates :banner_image, passthru: { to: Decidim::ParticipatoryProcess }
         validates :hero_image, passthru: { to: Decidim::ParticipatoryProcess }
 
         validates :weight, presence: true

data/app/models/decidim/participatory_process.rb

@@ -71,9 +71,6 @@ module Decidim
     has_one_attached :hero_image
     validates_upload :hero_image, uploader: Decidim::HeroImageUploader
 
-    has_one_attached :banner_image
-    validates_upload :banner_image, uploader: Decidim::BannerImageUploader
-
     scope :past, -> { where(arel_table[:end_date].lt(Date.current)) }
     scope :upcoming, -> { where(arel_table[:start_date].gt(Date.current)) }
     scope :active, -> { where(arel_table[:start_date].lteq(Date.current).and(arel_table[:end_date].gteq(Date.current).or(arel_table[:end_date].eq(nil)))) }

data/app/models/decidim/participatory_process_step.rb

@@ -38,7 +38,7 @@ module Decidim
     # set to the last step's position + 1.
     #
     # Note: This allows manual positioning, but there is a validation that
-    # forbids two steps from the same proccess to have the same position. Take
+    # forbids two steps from the same process to have the same position. Take
     # that into account. It would be best if you did not use manual
     # positioning.
     def set_position

data/app/permissions/decidim/participatory_processes/permissions.rb

@@ -217,7 +217,7 @@ module Decidim
         allow! if permission_action.action == :export && permission_action.subject == :component_data
       end
 
-      # Process admins can eprform everything *inside* that process. They cannot
+      # Process admins can perform everything *inside* that process. They cannot
       # create a process or perform actions on process groups or other
       # processes.
       def process_admin_action?

data/app/presenters/decidim/participatory_processes/participatory_process_presenter.rb

@@ -7,10 +7,6 @@ module Decidim
         process.attached_uploader(:hero_image).url(host: process.organization.host)
       end
 
-      def banner_image_url
-        process.attached_uploader(:banner_image).url(host: process.organization.host)
-      end
-
       def area_name
         return if process.area.blank?
 

data/app/queries/decidim/participatory_processes/stats_participants_count.rb

@@ -22,9 +22,9 @@ module Decidim
           debates_query,
           meetings_query,
           endorsements_query,
-          project_supports_query,
+          project_votes_query,
           proposals_query,
-          proposal_supports_query,
+          proposal_votes_query,
           survey_answer_query
         ].flatten.uniq.count
       end
@@ -93,7 +93,7 @@ module Decidim
           .uniq
       end
 
-      def proposal_supports_query
+      def proposal_votes_query
         return [] unless Decidim.module_installed?(:proposals)
 
         Decidim::Proposals::ProposalVote
@@ -105,7 +105,7 @@ module Decidim
           .uniq
       end
 
-      def project_supports_query
+      def project_votes_query
         return [] unless Decidim.module_installed?(:budgets)
 
         Decidim::Budgets::Order.joins(budget: [:component])

data/app/serializers/decidim/participatory_processes/participatory_process_importer.rb

@@ -14,8 +14,8 @@ module Decidim
       # attributes  - The Hash of attributes to create the ParticipatoryProcess with.
       # user        - The user that performs the action.
       # opts        - The options MUST contain:
-      #   - title: The +title+ for the new PartidicpatoryProcess
-      #   - slug: The +slug+ for the new PartidicpatoryProcess
+      #   - title: The +title+ for the new ParticipatoryProcess
+      #   - slug: The +slug+ for the new ParticipatoryProcess
       #
       # Returns a ParticipatoryProcess.
       def import(attributes, _user, opts)
@@ -42,13 +42,10 @@ module Decidim
             announcement: attributes["announcement"],
             private_space: attributes["private_space"],
             scopes_enabled: attributes["scopes_enabled"],
-            show_metrics: attributes["show_metrics"],
-            show_statistics: attributes["show_statistics"],
             participatory_process_group: import_process_group(attributes["participatory_process_group"]),
             participatory_process_type: import_participatory_process_type(attributes["participatory_process_type"])
           )
           @imported_process.attached_uploader(:hero_image).remote_url = attributes["remote_hero_image_url"] if attributes["remote_hero_image_url"].present?
-          @imported_process.attached_uploader(:banner_image).remote_url = attributes["remote_banner_image_url"] if attributes["remote_banner_image_url"].present?
 
           @imported_process.save!
           @imported_process

data/app/serializers/decidim/participatory_processes/participatory_process_serializer.rb

@@ -28,7 +28,6 @@ module Decidim
           start_date: participatory_process.start_date,
           end_date: participatory_process.end_date,
           remote_hero_image_url: Decidim::ParticipatoryProcesses::ParticipatoryProcessPresenter.new(participatory_process).hero_image_url,
-          remote_banner_image_url: Decidim::ParticipatoryProcesses::ParticipatoryProcessPresenter.new(participatory_process).banner_image_url,
           developer_group: participatory_process.developer_group,
           local_area: participatory_process.local_area,
           meta_scope: participatory_process.meta_scope,
@@ -52,8 +51,6 @@ module Decidim
           private_space: participatory_process.private_space,
           promoted: participatory_process.promoted,
           scopes_enabled: participatory_process.scopes_enabled,
-          show_metrics: participatory_process.show_metrics,
-          show_statistics: participatory_process.show_statistics,
           participatory_process_type: {
             id: participatory_process.participatory_process_type.try(:id),
             title: participatory_process.participatory_process_type.try(:title) || empty_translatable

data/app/views/decidim/participatory_processes/admin/participatory_process_steps/index.html.erb

@@ -16,7 +16,7 @@
             <th><%= t("models.participatory_process_step.fields.title", scope: "decidim.admin") %></th>
             <th><%= t("models.participatory_process_step.fields.start_date", scope: "decidim.admin") %></th>
             <th><%= t("models.participatory_process_step.fields.end_date", scope: "decidim.admin") %></th>
-            <th class="actions"></th>
+            <th></th>
           </tr>
         </thead>
         <tbody class="sortable" data-sort-url="<%= ordering_participatory_process_steps_path(current_participatory_process) %>">

data/app/views/decidim/participatory_processes/admin/participatory_process_steps/show.html.erb

@@ -1,6 +1,6 @@
 <h3><%= translated_attribute(@participatory_process_step.title) %></h3>
 
-<div class="actions">
+<div>
   <hr>
   <%= link_to t("decidim.admin.actions.edit"), edit_participatory_process_step_path(participatory_process, @participatory_process_step) if allowed_to? :update, :process_step, process_step: @participatory_process_step %>
   <%= link_to t("decidim.admin.actions.destroy"), participatory_process_step_path(participatory_process, @participatory_process_step), method: :delete, class: "alert button", data: { confirm: t("decidim.admin.actions.confirm_destroy") } if allowed_to? :destroy, :process_step, process_step: @participatory_process_step %>

data/app/views/decidim/participatory_processes/admin/participatory_process_user_roles/index.html.erb

@@ -19,7 +19,7 @@
           <th><%= sort_link(query, :last_sign_in_at, t("models.user.fields.last_sign_in_at", scope: "decidim.admin"), default_order: :desc) %></th>
           <th><%= sort_link(query, :invitation_accepted_at, t("models.user.fields.invitation_accepted_at", scope: "decidim.admin"), default_order: :desc) %></th>
           <th><%= sort_link(query, :role, t("models.participatory_process_user_role.fields.role", scope: "decidim.admin"), default_order: :desc) %></th>
-          <th class="actions"></th>
+          <th></th>
         </tr>
       </thead>
       <tbody>