decidim-assemblies 0.28.5 → 0.29.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2426e2a93703b5bae03164076b1f98a50edf032176a4856f66c652058afd49c3
-  data.tar.gz: 80946fdce8ee5504237f3ea13d95780c00efe8294631a884d447fc90b15eed71
+  metadata.gz: bb2e321d4d397b59daabff4553cdc2caa3ed6fbf2eb8f9d33b3e3fbc1fef8ffc
+  data.tar.gz: f0e387fe8972d70c6e1d046b4726caba7d7529d1aa9306ca6484807d3d1fc1e4
 SHA512:
-  metadata.gz: e3d23b89018cc083ca8940dd7676d3f64df76bd7aa005a7dca3464d11a58e38fe183e1b262bba504f321a28e321315cea23ae6ebc074b87eef182b0230467196
-  data.tar.gz: dd4cb78eb5ce5ddac6dc5cbe9e2364d20e9cd571201e2a8969c23f82df0d2c99194ad68a198cb891ae7b96e4b8d56739fae6717809c3f339f0819d827bb30f4b
+  metadata.gz: 6065ed4aca734ca6c4bf6c019229d442d270bdc732f7e8607204a1f800c1d80ee95efa9f39950b9731c3d6269306ab027ee72b68a8a79d6e0930d859e39a726b
+  data.tar.gz: 0e9b83e6c7a03b6a47e02c2072762b3ba62817607ab823269e351d4fe2210e9ebff6e64c59a2e583645b5893cb3a157d3c2a957966187205aee046f03ae9fea7

data/app/cells/decidim/assemblies/assembly_g_cell.rb

@@ -11,8 +11,8 @@ module Decidim
         Decidim::Assemblies::Engine.routes.url_helpers.assembly_path(model)
       end
 
-      def resource_image_url
-        model.attached_uploader(:hero_image).url
+      def resource_image_path
+        model.attached_uploader(:hero_image).path
       end
 
       def metadata_cell

data/app/cells/decidim/assemblies/content_blocks/highlighted_assemblies_cell.rb

@@ -4,14 +4,10 @@ module Decidim
   module Assemblies
     module ContentBlocks
       class HighlightedAssembliesCell < Decidim::ContentBlocks::HighlightedParticipatorySpacesCell
-        delegate :current_user, to: :controller
-
         def highlighted_spaces
           @highlighted_spaces ||= OrganizationPrioritizedAssemblies
                                   .new(current_organization, current_user)
                                   .query
-                                  .with_attached_hero_image
-                                  .includes([:organization])
         end
 
         def i18n_scope

data/app/cells/decidim/assemblies/content_blocks/stats_cell.rb

@@ -7,7 +7,7 @@ module Decidim
         private
 
         def stats
-          @stats ||= resource.show_statistics && AssemblyStatsPresenter.new(assembly: resource).collection
+          @stats ||= AssemblyStatsPresenter.new(assembly: resource).collection
         end
       end
     end

data/app/commands/decidim/assemblies/admin/create_assemblies_type.rb

@@ -5,40 +5,12 @@ module Decidim
     module Admin
       # A command with all the business logic when creating a new assembly
       # type in the system.
-      class CreateAssembliesType < Decidim::Command
-        # Public: Initializes the command.
-        #
-        # form - A form object with the params.
-        def initialize(form)
-          @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?
-
-          create_assemblies_type!
-
-          broadcast(:ok)
-        end
+      class CreateAssembliesType < Decidim::Commands::CreateResource
+        fetch_form_attributes :title, :organization
 
         private
 
-        attr_reader :form
-
-        def create_assemblies_type!
-          Decidim.traceability.create!(
-            AssembliesType,
-            form.current_user,
-            organization: form.current_organization,
-            title: form.title
-          )
-        end
+        def resource_class = Decidim::AssembliesType
       end
     end
   end

data/app/commands/decidim/assemblies/admin/create_assembly.rb

@@ -3,110 +3,51 @@
 module Decidim
   module Assemblies
     module Admin
-      # A command with all the business logic when creating a new participatory
-      # assembly in the system.
-      class CreateAssembly < Decidim::Command
-        # Public: Initializes the command.
-        #
-        # form - A form object with the params.
-        def initialize(form)
-          @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?
-
-          if assembly.persisted?
-            add_admins_as_followers(assembly)
-            link_participatory_processes(assembly)
-            Decidim::ContentBlocksCreator.new(assembly).create_default!
-
-            broadcast(:ok, assembly)
-          else
-            form.errors.add(:hero_image, assembly.errors[:hero_image]) if assembly.errors.include? :hero_image
-            form.errors.add(:banner_image, assembly.errors[:banner_image]) if assembly.errors.include? :banner_image
-            broadcast(:invalid)
-          end
+      # A command with all the business logic when creating a new assembly
+      # in the system.
+      class CreateAssembly < Decidim::Commands::CreateResource
+        fetch_file_attributes :hero_image, :banner_image
+
+        fetch_form_attributes :title, :subtitle, :weight, :slug, :hashtag, :description, :short_description,
+                              :promoted, :scopes_enabled, :scope, :area, :parent, :announcement, :organization,
+                              :private_space, :developer_group, :local_area, :target, :participatory_scope,
+                              :participatory_structure, :meta_scope, :purpose_of_action,
+                              :composition, :assembly_type, :creation_date, :created_by, :created_by_other,
+                              :duration, :included_at, :closing_date, :closing_date_reason, :internal_organisation,
+                              :is_transparent, :special_features, :twitter_handler, :facebook_handler,
+                              :instagram_handler, :youtube_handler, :github_handler
+
+        protected
+
+        def run_after_hooks
+          add_admins_as_followers
+          link_participatory_processes
+          Decidim::ContentBlocksCreator.new(resource).create_default!
         end
 
         private
 
-        attr_reader :form
-
-        def assembly
-          @assembly ||= Decidim.traceability.create(
-            Assembly,
-            form.current_user,
-            organization: form.current_organization,
-            title: form.title,
-            subtitle: form.subtitle,
-            weight: form.weight,
-            slug: form.slug,
-            hashtag: form.hashtag,
-            description: form.description,
-            short_description: form.short_description,
-            hero_image: form.hero_image,
-            banner_image: form.banner_image,
-            promoted: form.promoted,
-            scopes_enabled: form.scopes_enabled,
-            scope: form.scope,
-            area: form.area,
-            parent: form.parent,
-            private_space: form.private_space,
-            developer_group: form.developer_group,
-            local_area: form.local_area,
-            target: form.target,
-            participatory_scope: form.participatory_scope,
-            participatory_structure: form.participatory_structure,
-            meta_scope: form.meta_scope,
-            show_statistics: form.show_statistics,
-            purpose_of_action: form.purpose_of_action,
-            composition: form.composition,
-            assembly_type: form.assembly_type,
-            creation_date: form.creation_date,
-            created_by: form.created_by,
-            created_by_other: form.created_by_other,
-            duration: form.duration,
-            included_at: form.included_at,
-            closing_date: form.closing_date,
-            closing_date_reason: form.closing_date_reason,
-            internal_organisation: form.internal_organisation,
-            is_transparent: form.is_transparent,
-            special_features: form.special_features,
-            twitter_handler: form.twitter_handler,
-            facebook_handler: form.facebook_handler,
-            instagram_handler: form.instagram_handler,
-            youtube_handler: form.youtube_handler,
-            github_handler: form.github_handler,
-            announcement: form.announcement
-          )
-        end
+        def resource_class = Decidim::Assembly
 
-        def add_admins_as_followers(assembly)
-          assembly.organization.admins.each do |admin|
+        def add_admins_as_followers
+          resource.organization.admins.each do |admin|
             form = Decidim::FollowForm
-                   .from_params(followable_gid: assembly.to_signed_global_id.to_s)
+                   .from_params(followable_gid: resource.to_signed_global_id.to_s)
                    .with_context(
-                     current_organization: assembly.organization,
+                     current_organization: resource.organization,
                      current_user: admin
                    )
 
-            Decidim::CreateFollow.new(form, admin).call
+            Decidim::CreateFollow.new(form).call
           end
         end
 
-        def participatory_processes(assembly)
-          @participatory_processes ||= assembly.participatory_space_sibling_scope(:participatory_processes).where(id: @form.participatory_processes_ids)
+        def participatory_processes
+          @participatory_processes ||= resource.participatory_space_sibling_scope(:participatory_processes).where(id: form.participatory_processes_ids)
         end
 
-        def link_participatory_processes(assembly)
-          assembly.link_participatory_space_resources(participatory_processes(assembly), "included_participatory_processes")
+        def link_participatory_processes
+          resource.link_participatory_space_resources(participatory_processes, "included_participatory_processes")
         end
       end
     end

data/app/commands/decidim/assemblies/admin/create_assembly_member.rb

@@ -5,87 +5,35 @@ module Decidim
     module Admin
       # A command with all the business logic when creating a new assembly
       # member in the system.
-      class CreateAssemblyMember < Decidim::Command
-        include ::Decidim::AttachmentAttributesMethods
+      class CreateAssemblyMember < Decidim::Commands::CreateResource
+        fetch_file_attributes :non_user_avatar
 
-        # Public: Initializes the command.
-        #
-        # form - A form object with the params.
-        # assembly - The Assembly that will hold the member
-        def initialize(form, current_user, assembly)
-          @form = form
-          @current_user = current_user
-          @assembly = assembly
-        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?
+        fetch_form_attributes :full_name, :gender, :birthday, :birthplace, :ceased_date, :designation_date,
+                              :position, :position_other, :user
 
-          if assembly_member_with_attributes.valid?
-            create_assembly_member!
-            notify_assembly_member_about_new_membership
+        protected
 
-            broadcast(:ok)
-          else
-            if assembly_member_with_attributes.errors.include? :non_user_avatar
-              form.errors.add(
-                :non_user_avatar,
-                assembly_member_with_attributes.errors[:non_user_avatar]
-              )
-            end
-            broadcast(:invalid)
-          end
+        def run_after_hooks
+          notify_assembly_member_about_new_membership
         end
 
         private
 
-        attr_reader :form, :assembly, :current_user
-
-        def assembly_member_with_attributes
-          @assembly_member_with_attributes ||= Decidim::AssemblyMember.new(assembly_member_attributes)
+        def attributes
+          super.merge(assembly: form.participatory_space)
         end
 
-        def assembly_member_attributes
-          form.attributes.slice(
-            "full_name",
-            "gender",
-            "birthday",
-            "birthplace",
-            "ceased_date",
-            "designation_date",
-            "position",
-            "position_other",
-            "weight"
-          ).symbolize_keys.merge(
-            assembly:,
-            user: form.user
-          ).merge(
-            attachment_attributes(:non_user_avatar)
-          )
-        end
+        def resource_class = Decidim::AssemblyMember
 
-        def create_assembly_member!
-          log_info = {
+        def extra_params
+          {
             resource: {
               title: form.full_name
             },
             participatory_space: {
-              title: assembly.title
+              title: form.participatory_space.title
             }
           }
-
-          @assembly_member = Decidim.traceability.create!(
-            Decidim::AssemblyMember,
-            current_user,
-            assembly_member_attributes,
-            log_info
-          )
         end
 
         def followers
@@ -96,7 +44,7 @@ module Decidim
           data = {
             event: "decidim.events.assemblies.create_assembly_member",
             event_class: Decidim::Assemblies::CreateAssemblyMemberEvent,
-            resource: assembly,
+            resource: form.participatory_space,
             followers:
           }
           Decidim::EventsManager.publish(**data)

data/app/commands/decidim/assemblies/admin/destroy_assembly_member.rb

@@ -5,50 +5,18 @@ module Decidim
     module Admin
       # A command with all the business logic when destroying an assembly
       # member in the system.
-      class DestroyAssemblyMember < Decidim::Command
-        # Public: Initializes the command.
-        #
-        # assembly_member - the AssemblyMember to destroy
-        # current_user - the user performing this action
-        def initialize(assembly_member, current_user)
-          @assembly_member = assembly_member
-          @current_user = current_user
-        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
-          destroy_member!
-          broadcast(:ok)
-        end
-
+      class DestroyAssemblyMember < Decidim::Commands::DestroyResource
         private
 
-        attr_reader :assembly_member, :current_user
-
-        def destroy_member!
-          log_info = {
+        def extra_params
+          {
             resource: {
-              title: assembly_member.full_name
+              title: resource.full_name
             },
             participatory_space: {
-              title: assembly_member.assembly.title
+              title: resource.assembly.title
             }
           }
-
-          Decidim.traceability.perform_action!(
-            "delete",
-            assembly_member,
-            current_user,
-            log_info
-          ) do
-            assembly_member.destroy!
-            assembly_member
-          end
         end
       end
     end

data/app/commands/decidim/assemblies/admin/import_assembly.rb

@@ -67,7 +67,7 @@ module Decidim
                      current_user: admin
                    )
 
-            Decidim::CreateFollow.new(form, admin).call
+            Decidim::CreateFollow.new(form).call
           end
         end
       end

data/app/commands/decidim/assemblies/admin/update_assemblies_type.rb

@@ -5,41 +5,8 @@ module Decidim
     module Admin
       # A command with all the business logic when updating a new assembly
       # type in the system.
-      class UpdateAssembliesType < Decidim::Command
-        # Public: Initializes the command.
-        #
-        # assemblies_type - A assemblies_type object to update.
-        # form - A form object with the params.
-        def initialize(assemblies_type, form)
-          @assemblies_type = assemblies_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_assemblies_type!
-
-          broadcast(:ok)
-        end
-
-        private
-
-        attr_reader :form
-
-        def update_assemblies_type!
-          Decidim.traceability.update!(
-            @assemblies_type,
-            form.current_user,
-            title: form.title
-          )
-        end
+      class UpdateAssembliesType < Decidim::Commands::UpdateResource
+        fetch_form_attributes :title
       end
     end
   end

data/app/commands/decidim/assemblies/admin/update_assembly.rb

@@ -3,113 +3,36 @@
 module Decidim
   module Assemblies
     module Admin
-      # A command with all the business logic when creating a new participatory
-      # assembly in the system.
-      class UpdateAssembly < Decidim::Command
-        include ::Decidim::AttachmentAttributesMethods
-
-        # Public: Initializes the command.
-        #
-        # assembly - the Assembly to update
-        # form - A form object with the params.
-        def initialize(assembly, form)
-          @assembly = assembly
-          @form = form
-          @parent = Assembly.find_by(id: @assembly.parent)
-        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_assembly
-          link_participatory_processes(@assembly)
-
-          if @assembly.valid?
-            broadcast(:ok, @assembly)
-          else
-            form.errors.add(:hero_image, @assembly.errors[:hero_image]) if @assembly.errors.include? :hero_image
-            form.errors.add(:banner_image, @assembly.errors[:banner_image]) if @assembly.errors.include? :banner_image
-            broadcast(:invalid)
-          end
-        end
+      # A command with all the business logic when updating a new assembly
+      # in the system.
+      class UpdateAssembly < Decidim::Commands::UpdateResource
+        fetch_file_attributes :hero_image, :banner_image
+
+        fetch_form_attributes :title, :subtitle, :slug, :hashtag, :promoted, :description, :short_description,
+                              :scopes_enabled, :scope, :area, :parent, :private_space, :developer_group, :local_area,
+                              :target, :participatory_scope, :participatory_structure, :meta_scope,
+                              :purpose_of_action, :composition, :assembly_type, :creation_date, :created_by,
+                              :created_by_other, :duration, :included_at, :closing_date, :closing_date_reason,
+                              :internal_organisation, :is_transparent, :special_features, :twitter_handler, :announcement,
+                              :facebook_handler, :instagram_handler, :youtube_handler, :github_handler, :weight
 
         private
 
-        attr_reader :form, :assembly
-
-        def update_assembly
-          @assembly.assign_attributes(attributes)
-          save_assembly if @assembly.valid?
+        def run_after_hooks
+          link_participatory_processes
           update_children_count
         end
 
-        def save_assembly
-          transaction do
-            @assembly.save!
-            Decidim.traceability.perform_action!(:update, @assembly, form.current_user) do
-              @assembly
-            end
-          end
-        end
-
-        def attributes
-          {
-            title: form.title,
-            subtitle: form.subtitle,
-            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,
-            area: form.area,
-            parent: form.parent,
-            private_space: form.private_space,
-            developer_group: form.developer_group,
-            local_area: form.local_area,
-            target: form.target,
-            participatory_scope: form.participatory_scope,
-            participatory_structure: form.participatory_structure,
-            meta_scope: form.meta_scope,
-            show_statistics: form.show_statistics,
-            purpose_of_action: form.purpose_of_action,
-            composition: form.composition,
-            assembly_type: form.assembly_type,
-            creation_date: form.creation_date,
-            created_by: form.created_by,
-            created_by_other: form.created_by_other,
-            duration: form.duration,
-            included_at: form.included_at,
-            closing_date: form.closing_date,
-            closing_date_reason: form.closing_date_reason,
-            internal_organisation: form.internal_organisation,
-            is_transparent: form.is_transparent,
-            special_features: form.special_features,
-            twitter_handler: form.twitter_handler,
-            facebook_handler: form.facebook_handler,
-            instagram_handler: form.instagram_handler,
-            youtube_handler: form.youtube_handler,
-            github_handler: form.github_handler,
-            weight: form.weight,
-            announcement: form.announcement
-          }.merge(
-            attachment_attributes(:hero_image, :banner_image)
-          )
+        def parent
+          @parent ||= Assembly.find_by(id: resource.parent)
         end
 
-        def participatory_processes(assembly)
-          @participatory_processes ||= assembly.participatory_space_sibling_scope(:participatory_processes).where(id: @form.participatory_processes_ids)
+        def participatory_processes
+          @participatory_processes ||= resource.participatory_space_sibling_scope(:participatory_processes).where(id: form.participatory_processes_ids)
         end
 
-        def link_participatory_processes(assembly)
-          assembly.link_participatory_space_resources(participatory_processes(assembly), "included_participatory_processes")
+        def link_participatory_processes
+          resource.link_participatory_space_resources(participatory_processes, "included_participatory_processes")
         end
 
         # Resets the children counter cache to its correct value using an SQL count query.
@@ -117,9 +40,9 @@ module Decidim
         #
         # Returns nothing.
         def update_children_count
-          return unless @parent
+          return unless parent
 
-          Assembly.reset_counters(@parent.id, :children_count)
+          Assembly.reset_counters(parent.id, :children_count)
         end
       end
     end