decidim-proposals 0.15.2 → 0.16.0

data/app/commands/decidim/proposals/admin/update_proposal.rb

@@ -6,6 +6,7 @@ module Decidim
       # A command with all the business logic when a user updates a proposal.
       class UpdateProposal < Rectify::Command
         include AttachmentMethods
+        include HashtagsMethods
 
         # Public: Initializes the command.
         #
@@ -35,6 +36,7 @@ module Decidim
 
           transaction do
             update_proposal
+            update_proposal_author
             create_attachment if process_attachments?
           end
 
@@ -46,21 +48,26 @@ module Decidim
         attr_reader :form, :proposal, :attachment
 
         def update_proposal
-          parsed_title = Decidim::ContentProcessor.parse_with_processor(:hashtag, form.title, current_organization: form.current_organization).rewrite
-          parsed_body = Decidim::ContentProcessor.parse_with_processor(:hashtag, form.body, current_organization: form.current_organization).rewrite
-
           Decidim.traceability.update!(
             proposal,
             form.current_user,
-            title: parsed_title,
-            body: parsed_body,
+            title: title_with_hashtags,
+            body: body_with_hashtags,
             category: form.category,
             scope: form.scope,
             address: form.address,
             latitude: form.latitude,
-            longitude: form.longitude
+            longitude: form.longitude,
+            created_in_meeting: form.created_in_meeting
           )
         end
+
+        def update_proposal_author
+          proposal.coauthorships.clear
+          proposal.add_coauthor(form.author)
+          proposal.save!
+          proposal
+        end
       end
     end
   end

data/app/commands/decidim/proposals/admin/update_proposal_category.rb

@@ -59,7 +59,7 @@ module Decidim
             event: "decidim.events.proposals.proposal_update_category",
             event_class: Decidim::Proposals::Admin::UpdateProposalCategoryEvent,
             resource: proposal,
-            recipient_ids: proposal.coauthorships.pluck(:decidim_author_id)
+            affected_users: proposal.notifiable_identities
           )
         end
       end

data/app/commands/decidim/proposals/create_collaborative_draft.rb

@@ -5,6 +5,8 @@ module Decidim
     # A command with all the business logic when a user creates a new collaborative draft.
     class CreateCollaborativeDraft < Rectify::Command
       include AttachmentMethods
+      include HashtagsMethods
+
       # Public: Initializes the command.
       #
       # form         - A form object with the params.
@@ -45,11 +47,12 @@ module Decidim
         @collaborative_draft = Decidim.traceability.perform_action!(
           :create,
           CollaborativeDraft,
-          @form.current_user
+          @form.current_user,
+          visibility: "public-only"
         ) do
           draft = CollaborativeDraft.new(
-            title: form.title,
-            body: form.body,
+            title: title_with_hashtags,
+            body: body_with_hashtags,
             category: form.category,
             scope: form.scope,
             component: form.component,

data/app/commands/decidim/proposals/create_proposal.rb

@@ -5,6 +5,8 @@ module Decidim
     # A command with all the business logic when a user creates a new proposal.
     class CreateProposal < Rectify::Command
       include AttachmentMethods
+      include HashtagsMethods
+
       # Public: Initializes the command.
       #
       # form         - A form object with the params.
@@ -41,18 +43,30 @@ module Decidim
 
       attr_reader :form, :proposal, :attachment
 
+      def proposal_attributes
+        fields = {}
+
+        fields[:title] = title_with_hashtags
+        fields[:body] = body_with_hashtags
+        fields[:component] = form.component
+
+        fields
+      end
+
+      # This will be the PaperTrail version that is
+      # shown in the version control feature (1 of 1)
       def create_proposal
-        parsed_title = Decidim::ContentProcessor.parse_with_processor(:hashtag, form.title, current_organization: form.current_organization).rewrite
-        parsed_body = Decidim::ContentProcessor.parse_with_processor(:hashtag, form.body, current_organization: form.current_organization).rewrite
-
-        @proposal = Proposal.new(
-          title: parsed_title,
-          body: parsed_body,
-          component: form.component
-        )
-        @proposal.add_coauthor(@current_user, user_group: user_group)
-        @proposal.save!
-        @proposal
+        @proposal = Decidim.traceability.perform_action!(
+          :create,
+          Decidim::Proposals::Proposal,
+          @current_user,
+          visibility: "public-only"
+        ) do
+          proposal = Proposal.new(proposal_attributes)
+          proposal.add_coauthor(@current_user, user_group: user_group)
+          proposal.save!
+          proposal
+        end
       end
 
       def proposal_limit_reached?

data/app/commands/decidim/proposals/endorse_proposal.rb

@@ -44,12 +44,11 @@ module Decidim
       end
 
       def notify_endorser_followers
-        recipient_ids = @current_user.followers.pluck(:id)
         Decidim::EventsManager.publish(
           event: "decidim.events.proposals.proposal_endorsed",
           event_class: Decidim::Proposals::ProposalEndorsedEvent,
           resource: @proposal,
-          recipient_ids: recipient_ids.uniq,
+          followers: @current_user.followers,
           extra: {
             endorser_id: @current_user.id
           }

data/app/commands/decidim/proposals/hashtags_methods.rb

@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Proposals
+    # A module with all the hash tags common methods for proposals
+    # and collaborative draft commands.
+    module HashtagsMethods
+      private
+
+      def title_with_hashtags
+        @title_with_hashtags ||= Decidim::ContentProcessor.parse_with_processor(:hashtag, form.title, current_organization: form.current_organization).rewrite
+      end
+
+      def body_with_hashtags
+        @body_with_hashtags ||= begin
+          ret = Decidim::ContentProcessor.parse_with_processor(:hashtag, form.body, current_organization: form.current_organization).rewrite.strip
+          ret += "\n" + body_extra_hashtags.strip unless body_extra_hashtags.empty?
+          ret
+        end
+      end
+
+      def body_extra_hashtags
+        @body_extra_hashtags ||= if form.respond_to?(:extra_hashtags)
+                                   Decidim::ContentProcessor.parse_with_processor(
+                                     :hashtag,
+                                     form.extra_hashtags.map { |hashtag| "##{hashtag}" }.join(" "),
+                                     current_organization: form.current_organization,
+                                     extra_hashtags: true
+                                   ).rewrite
+                                 else
+                                   ""
+                                 end
+      end
+    end
+  end
+end

data/app/commands/decidim/proposals/publish_collaborative_draft.rb

@@ -25,12 +25,10 @@ module Decidim
         return broadcast(:invalid) unless @collaborative_draft.authored_by? @current_user
 
         transaction do
-          @collaborative_draft.requesters.each do |requester_user|
-            RejectAccessToCollaborativeDraft.call(@collaborative_draft, current_user, requester_user)
-          end
-
-          @new_proposal = publish_collaborative_draft
-          broadcast(:invalid) unless @new_proposal
+          reject_access_to_collaborative_draft
+          publish_collaborative_draft
+          create_proposal!
+          link_collaborative_draft_and_proposal
         end
 
         broadcast(:ok, @new_proposal)
@@ -40,47 +38,54 @@ module Decidim
 
       private
 
+      def reject_access_to_collaborative_draft
+        @collaborative_draft.requesters.each do |requester_user|
+          RejectAccessToCollaborativeDraft.call(@collaborative_draft, current_user, requester_user)
+        end
+      end
+
       def publish_collaborative_draft
         Decidim.traceability.update!(
           @collaborative_draft,
           @current_user,
-          state: "published",
-          published_at: Time.current
+          { state: "published", published_at: Time.current },
+          visibility: "public-only"
         )
-        create_proposal
       end
 
-      def create_proposal
-        proposal_form_params = ActionController::Parameters.new(
-          proposal: @collaborative_draft.as_json
-        )
-        proposal_form_params[:proposal][:category_id] = @collaborative_draft.category.id if @collaborative_draft.category
-        proposal_form_params[:proposal][:scope_id] = @collaborative_draft.scope.id if @collaborative_draft.scope
-        proposal_form = Decidim::Proposals::ProposalForm.from_params(
-          proposal_form_params
-        ).with_context(
-          current_user: @current_user,
-          current_organization: @current_user.organization,
-          current_component: @collaborative_draft.component,
-          current_participatory_space: @collaborative_draft.participatory_space
-        )
+      def proposal_attributes
+        fields = {}
 
-        result = CreateProposal.call(proposal_form, @current_user, @collaborative_draft.coauthorships)
-        return publish_proposal(result[:ok]) if result[:ok]
+        parsed_title = Decidim::ContentProcessor.parse_with_processor(:hashtag, @collaborative_draft.title, current_organization: @collaborative_draft.organization).rewrite
+        parsed_body = Decidim::ContentProcessor.parse_with_processor(:hashtag, @collaborative_draft.body, current_organization: @collaborative_draft.organization).rewrite
 
-        false
-      end
+        fields[:title] = parsed_title
+        fields[:body] = parsed_body
+        fields[:component] = @collaborative_draft.component
+        fields[:scope] = @collaborative_draft.scope
+        fields[:address] = @collaborative_draft.address
+        fields[:published_at] = Time.current
 
-      def publish_proposal(new_proposal)
-        result = PublishProposal.call(new_proposal, @current_user)
-        return link_collaborative_draft_and_proposal(result[:ok]) if result[:ok]
+        fields
+      end
 
-        false
+      def create_proposal!
+        @new_proposal = Decidim.traceability.perform_action!(
+          :create,
+          Decidim::Proposals::Proposal,
+          @current_user,
+          visibility: "public-only"
+        ) do
+          new_proposal = Proposal.new(proposal_attributes)
+          new_proposal.coauthorships = @collaborative_draft.coauthorships
+          new_proposal.category = @collaborative_draft.category
+          new_proposal.save!
+          new_proposal
+        end
       end
 
-      def link_collaborative_draft_and_proposal(new_proposal)
-        @collaborative_draft.link_resources(new_proposal, "created_from_collaborative_draft")
-        new_proposal
+      def link_collaborative_draft_and_proposal
+        @collaborative_draft.link_resources(@new_proposal, "created_from_collaborative_draft")
       end
     end
   end

data/app/commands/decidim/proposals/publish_proposal.rb

@@ -23,15 +23,7 @@ module Decidim
         return broadcast(:invalid) unless @proposal.authored_by?(@current_user)
 
         transaction do
-          Decidim.traceability.perform_action!(
-            "publish",
-            @proposal,
-            @current_user,
-            visibility: "public-only"
-          ) do
-            @proposal.update published_at: Time.current
-          end
-
+          publish_proposal
           increment_scores
           send_notification
           send_notification_to_participatory_space
@@ -42,6 +34,14 @@ module Decidim
 
       private
 
+      # Prevent PaperTrail from creating an additional version
+      # in the proposal multi-step creation process (step 4: publish)
+      def publish_proposal
+        PaperTrail.request(enabled: false) do
+          @proposal.update published_at: Time.current
+        end
+      end
+
       def send_notification
         return if @proposal.coauthorships.empty?
 
@@ -49,7 +49,7 @@ module Decidim
           event: "decidim.events.proposals.proposal_published",
           event_class: Decidim::Proposals::PublishProposalEvent,
           resource: @proposal,
-          recipient_ids: coauthors_followers(@proposal)
+          followers: coauthors_followers
         )
       end
 
@@ -58,19 +58,15 @@ module Decidim
           event: "decidim.events.proposals.proposal_published",
           event_class: Decidim::Proposals::PublishProposalEvent,
           resource: @proposal,
-          recipient_ids: @proposal.participatory_space.followers.pluck(:id) - coauthors_followers(@proposal),
+          followers: @proposal.participatory_space.followers - coauthors_followers,
           extra: {
             participatory_space: true
           }
         )
       end
 
-      def coauthors_followers(_proposal)
-        followers_ids = []
-        @proposal.authors.each do |author|
-          followers_ids += author.followers.pluck(:id)
-        end
-        followers_ids
+      def coauthors_followers
+        @coauthors_followers ||= @proposal.authors.flat_map(&:followers)
       end
 
       def increment_scores

data/app/commands/decidim/proposals/reject_access_to_collaborative_draft.rb

@@ -38,12 +38,11 @@ module Decidim
       private
 
       def notify_collaborative_draft_authors
-        recipient_ids = @collaborative_draft.authors.pluck(:id)
         Decidim::EventsManager.publish(
           event: "decidim.events.proposals.collaborative_draft_access_rejected",
           event_class: Decidim::Proposals::CollaborativeDraftAccessRejectedEvent,
           resource: @collaborative_draft,
-          recipient_ids: recipient_ids.uniq,
+          affected_users: @collaborative_draft.authors,
           extra: {
             requester_id: @requester_user.id
           }
@@ -55,7 +54,7 @@ module Decidim
           event: "decidim.events.proposals.collaborative_draft_access_requester_rejected",
           event_class: Decidim::Proposals::CollaborativeDraftAccessRequesterRejectedEvent,
           resource: @collaborative_draft,
-          recipient_ids: [@requester_user.id]
+          affected_users: [@requester_user]
         )
       end
     end

data/app/commands/decidim/proposals/request_access_to_collaborative_draft.rb

@@ -34,12 +34,11 @@ module Decidim
       private
 
       def notify_collaborative_draft_authors
-        recipient_ids = @collaborative_draft.authors.pluck(:id)
         Decidim::EventsManager.publish(
           event: "decidim.events.proposals.collaborative_draft_access_requested",
           event_class: Decidim::Proposals::CollaborativeDraftAccessRequestedEvent,
           resource: @collaborative_draft,
-          recipient_ids: recipient_ids.uniq,
+          affected_users: @collaborative_draft.authors,
           extra: {
             requester_id: @current_user.id
           }

data/app/commands/decidim/proposals/update_collaborative_draft.rb

@@ -4,6 +4,8 @@ module Decidim
   module Proposals
     # A command with all the business logic when a user updates a collaborative_draft.
     class UpdateCollaborativeDraft < Rectify::Command
+      include HashtagsMethods
+
       # Public: Initializes the command.
       #
       # form         - A form object with the params.
@@ -40,19 +42,20 @@ module Decidim
         Decidim.traceability.update!(
           @collaborative_draft,
           @current_user,
-          attributes
+          attributes,
+          visibility: "public-only"
         )
       end
 
       def attributes
         {
-          title: @form.title,
-          body: @form.body,
-          category: @form.category,
-          scope: @form.scope,
-          address: @form.address,
-          latitude: @form.latitude,
-          longitude: @form.longitude
+          title: title_with_hashtags,
+          body: body_with_hashtags,
+          category: form.category,
+          scope: form.scope,
+          address: form.address,
+          latitude: form.latitude,
+          longitude: form.longitude
         }
       end
     end

data/app/commands/decidim/proposals/update_proposal.rb

@@ -5,6 +5,8 @@ module Decidim
     # A command with all the business logic when a user updates a proposal.
     class UpdateProposal < Rectify::Command
       include AttachmentMethods
+      include HashtagsMethods
+
       # Public: Initializes the command.
       #
       # form         - A form object with the params.
@@ -36,7 +38,11 @@ module Decidim
         end
 
         transaction do
-          update_proposal
+          if @proposal.draft?
+            update_draft
+          else
+            update_proposal
+          end
           create_attachment if process_attachments?
         end
 
@@ -47,21 +53,39 @@ module Decidim
 
       attr_reader :form, :proposal, :current_user, :attachment
 
+      def proposal_attributes
+        fields = {}
+
+        fields[:title] = title_with_hashtags
+        fields[:body] = body_with_hashtags
+        fields[:category] = form.category
+        fields[:scope] = form.scope
+        fields[:address] = form.address
+        fields[:latitude] = form.latitude
+        fields[:longitude] = form.longitude
+
+        fields
+      end
+
+      # Prevent PaperTrail from creating an additional version
+      # in the proposal multi-step creation process (step 3: complete)
+      def update_draft
+        PaperTrail.request(enabled: false) do
+          @proposal.update(proposal_attributes)
+          @proposal.coauthorships.clear
+          @proposal.add_coauthor(current_user, user_group: user_group)
+        end
+      end
+
       def update_proposal
-        parsed_title = Decidim::ContentProcessor.parse_with_processor(:hashtag, form.title, current_organization: form.current_organization).rewrite
-        parsed_body = Decidim::ContentProcessor.parse_with_processor(:hashtag, form.body, current_organization: form.current_organization).rewrite
-
-        @proposal.update!(
-          title: parsed_title,
-          body: parsed_body,
-          category: form.category,
-          scope: form.scope,
-          address: form.address,
-          latitude: form.latitude,
-          longitude: form.longitude
+        @proposal = Decidim.traceability.update!(
+          @proposal,
+          current_user,
+          proposal_attributes,
+          visibility: "public-only"
         )
         @proposal.coauthorships.clear
-        @proposal.add_coauthor(current_user, decidim_user_group_id: user_group&.id)
+        @proposal.add_coauthor(current_user, user_group: user_group)
       end
 
       def proposal_limit_reached?