decidim-proposals 0.14.4 → 0.15.0

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

@@ -42,23 +42,28 @@ module Decidim
       attr_reader :form, :collaborative_draft, :attachment
 
       def create_collaborative_draft
-        @collaborative_draft = Decidim.traceability.create!(
+        @collaborative_draft = Decidim.traceability.perform_action!(
+          :create,
           CollaborativeDraft,
-          @form.current_user,
-          title: form.title,
-          body: form.body,
-          category: form.category,
-          scope: form.scope,
-          component: form.component,
-          address: form.address,
-          latitude: form.latitude,
-          longitude: form.longitude,
-          state: "open"
-        )
+          @form.current_user
+        ) do
+          draft = CollaborativeDraft.new(
+            title: form.title,
+            body: form.body,
+            category: form.category,
+            scope: form.scope,
+            component: form.component,
+            address: form.address,
+            latitude: form.latitude,
+            longitude: form.longitude,
+            state: "open"
+          )
+          draft.coauthorships.build(author: @current_user, user_group: @form.user_group)
+          draft.save!
+          draft
+        end
 
         @attached_to = @collaborative_draft
-
-        @collaborative_draft.add_coauthor(@current_user, user_group: @form.user_group)
       end
 
       def user_group

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

@@ -45,12 +45,14 @@ module Decidim
         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.create!(
+        @proposal = Proposal.new(
           title: parsed_title,
           body: parsed_body,
           component: form.component
         )
-        proposal.add_coauthor(@current_user, user_group: user_group)
+        @proposal.add_coauthor(@current_user, user_group: user_group)
+        @proposal.save!
+        @proposal
       end
 
       def proposal_limit_reached?

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

@@ -35,10 +35,14 @@ module Decidim
 
       def build_proposal_endorsement
         endorsement = @proposal.endorsements.build(author: @current_user)
-        endorsement.user_group = @current_user.user_groups.verified.find(@current_group_id) if @current_group_id.present?
+        endorsement.user_group = user_groups.find(@current_group_id) if @current_group_id.present?
         endorsement
       end
 
+      def user_groups
+        Decidim::UserGroups::ManageableUserGroups.for(@current_user).verified
+      end
+
       def notify_endorser_followers
         recipient_ids = @current_user.followers.pluck(:id)
         Decidim::EventsManager.publish(

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

@@ -23,7 +23,15 @@ module Decidim
         return broadcast(:invalid) unless @proposal.authored_by?(@current_user)
 
         transaction do
-          @proposal.update published_at: Time.current
+          Decidim.traceability.perform_action!(
+            "publish",
+            @proposal,
+            @current_user,
+            visibility: "public-only"
+          ) do
+            @proposal.update published_at: Time.current
+          end
+
           increment_scores
           send_notification
           send_notification_to_participatory_space
@@ -66,8 +74,12 @@ module Decidim
       end
 
       def increment_scores
-        @proposal.authors.each do |author|
-          Decidim::Gamification.increment_score(author, :proposals)
+        @proposal.coauthorships.find_each do |coauthorship|
+          if coauthorship.user_group
+            Decidim::Gamification.increment_score(coauthorship.user_group, :proposals)
+          else
+            Decidim::Gamification.increment_score(coauthorship.author, :proposals)
+          end
         end
       end
     end

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

@@ -21,13 +21,44 @@ module Decidim
       # Returns nothing.
       def call
         ActiveRecord::Base.transaction do
-          votes = @proposal.votes.where(author: @current_user)
-          Decidim::Gamification.decrement_score(@current_user, :proposal_votes, votes.count)
-          votes.destroy_all
+          ProposalVote.where(
+            author: @current_user,
+            proposal: @proposal
+          ).destroy_all
+
+          update_temporary_votes
         end
 
+        Decidim::Gamification.decrement_score(@current_user, :proposal_votes)
+
         broadcast(:ok, @proposal)
       end
+
+      private
+
+      def component
+        @component ||= @proposal.component
+      end
+
+      def minimum_votes_per_user
+        component.settings.minimum_votes_per_user
+      end
+
+      def minimum_votes_per_user?
+        minimum_votes_per_user.positive?
+      end
+
+      def update_temporary_votes
+        return unless minimum_votes_per_user? && user_votes.count < minimum_votes_per_user
+        user_votes.each { |vote| vote.update(temporary: true) }
+      end
+
+      def user_votes
+        @user_votes ||= ProposalVote.where(
+          author: @current_user,
+          proposal: Proposal.where(component: component)
+        )
+      end
     end
   end
 end

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

@@ -25,7 +25,10 @@ module Decidim
         build_proposal_vote
         return broadcast(:invalid) unless vote.valid?
 
-        vote.save!
+        ActiveRecord::Base.transaction do
+          vote.save!
+          update_temporary_votes
+        end
 
         Decidim::Gamification.increment_score(@current_user, :proposal_votes)
 
@@ -36,8 +39,35 @@ module Decidim
 
       private
 
+      def component
+        @component ||= @proposal.component
+      end
+
+      def minimum_votes_per_user
+        component.settings.minimum_votes_per_user
+      end
+
+      def minimum_votes_per_user?
+        minimum_votes_per_user.positive?
+      end
+
+      def update_temporary_votes
+        return unless minimum_votes_per_user? && user_votes.count >= minimum_votes_per_user
+        user_votes.each { |vote| vote.update(temporary: false) }
+      end
+
+      def user_votes
+        @user_votes ||= ProposalVote.where(
+          author: @current_user,
+          proposal: Proposal.where(component: component)
+        )
+      end
+
       def build_proposal_vote
-        @vote = @proposal.votes.build(author: @current_user)
+        @vote = @proposal.votes.build(
+          author: @current_user,
+          temporary: minimum_votes_per_user?
+        )
       end
     end
   end

data/app/controllers/decidim/proposals/admin/participatory_texts_controller.rb

@@ -0,0 +1,62 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Proposals
+    module Admin
+      # This controller manages the participatory texts area.
+      class ParticipatoryTextsController < Admin::ApplicationController
+        helper_method :proposal
+        helper ParticipatoryTextsHelper
+
+        def index
+          @drafts = Proposal.where(component: current_component).drafts.order(:position)
+          @preview_form = form(Admin::PreviewParticipatoryTextForm).instance
+          @preview_form.from_models(@drafts)
+        end
+
+        def new_import
+          enforce_permission_to :import, :participatory_texts
+          @import = form(Admin::ImportParticipatoryTextForm).instance
+        end
+
+        def import
+          enforce_permission_to :import, :participatory_texts
+          @import = form(Admin::ImportParticipatoryTextForm).from_params(params)
+
+          Admin::ImportParticipatoryText.call(@import) do
+            on(:ok) do
+              flash[:notice] = I18n.t("participatory_texts.import.success", scope: "decidim.proposals.admin")
+              redirect_to participatory_texts_path(component_id: current_component.id, initiative_slug: "asdf")
+            end
+
+            on(:invalid) do
+              flash.now[:alert] = I18n.t("participatory_texts.import.invalid", scope: "decidim.proposals.admin")
+              render action: "new_import"
+            end
+          end
+        end
+
+        def publish
+          enforce_permission_to :publish, :participatory_texts
+          form_params = params.require(:preview_participatory_text).permit!
+          @preview_form = form(Admin::PreviewParticipatoryTextForm).from_params(proposals: form_params[:proposals_attributes]&.values)
+
+          PublishParticipatoryText.call(@preview_form) do
+            on(:ok) do
+              flash[:notice] = I18n.t("participatory_texts.publish.success", scope: "decidim.proposals.admin")
+              redirect_to proposals_path
+            end
+
+            on(:invalid) do |failures|
+              alert_msg = [I18n.t("participatory_texts.publish.invalid", scope: "decidim.proposals.admin")]
+              failures.each_pair { |id, msg| alert_msg << "ID:[#{id}] #{msg}" }
+              flash.now[:alert] = alert_msg.join("<br/>").html_safe
+              index
+              render action: "index"
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/app/controllers/decidim/proposals/admin/proposals_controller.rb

@@ -61,10 +61,37 @@ module Decidim
           end
         end
 
+        def edit
+          enforce_permission_to :edit, :proposal, proposal: proposal
+          @form = form(Admin::ProposalForm).from_model(proposal)
+          @form.attachment = form(AttachmentForm).from_params({})
+        end
+
+        def update
+          enforce_permission_to :edit, :proposal, proposal: proposal
+
+          @form = form(Admin::ProposalForm).from_params(params)
+          Admin::UpdateProposal.call(@form, @proposal) do
+            on(:ok) do |_proposal|
+              flash[:notice] = I18n.t("proposals.update.success", scope: "decidim")
+              redirect_to proposals_path
+            end
+
+            on(:invalid) do
+              flash.now[:alert] = I18n.t("proposals.update.error", scope: "decidim")
+              render :edit
+            end
+          end
+        end
+
         private
 
         def query
-          @query ||= Proposal.where(component: current_component).published.ransack(params[:q])
+          @query ||= if current_component.settings.participatory_texts_enabled?
+                       Proposal.where(component: current_component).published.order(:position).ransack(params[:q])
+                     else
+                       Proposal.where(component: current_component).published.ransack(params[:q])
+                     end
         end
 
         def proposals

data/app/controllers/decidim/proposals/admin/proposals_merges_controller.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Proposals
+    module Admin
+      class ProposalsMergesController < Admin::ApplicationController
+        def create
+          enforce_permission_to :merge, :proposals
+
+          @form = form(Admin::ProposalsMergeForm).from_params(params)
+
+          Admin::MergeProposals.call(@form) do
+            on(:ok) do |_proposal|
+              flash[:notice] = I18n.t("proposals_merges.create.success", scope: "decidim.proposals.admin")
+              redirect_to EngineRouter.admin_proxy(@form.target_component).root_path
+            end
+
+            on(:invalid) do
+              flash[:alert] = I18n.t("proposals_merges.create.invalid", scope: "decidim.proposals.admin")
+              redirect_to EngineRouter.admin_proxy(current_component).root_path
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/app/controllers/decidim/proposals/admin/proposals_splits_controller.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Proposals
+    module Admin
+      class ProposalsSplitsController < Admin::ApplicationController
+        def create
+          enforce_permission_to :split, :proposals
+
+          @form = form(Admin::ProposalsSplitForm).from_params(params)
+
+          Admin::SplitProposals.call(@form) do
+            on(:ok) do |_proposal|
+              flash[:notice] = I18n.t("proposals_splits.create.success", scope: "decidim.proposals.admin")
+              redirect_to EngineRouter.admin_proxy(@form.target_component).root_path
+            end
+
+            on(:invalid) do
+              flash.now[:alert] = I18n.t("proposals_splits.create.invalid", scope: "decidim.proposals.admin")
+              redirect_to EngineRouter.admin_proxy(current_component).root_path
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/app/controllers/decidim/proposals/collaborative_drafts_controller.rb

@@ -20,7 +20,6 @@ module Decidim
       def index
         @collaborative_drafts = search
                                 .results
-                                .includes(:authors)
                                 .includes(:category)
                                 .includes(:scope)
 

data/app/controllers/decidim/proposals/proposal_endorsements_controller.rb

@@ -29,7 +29,7 @@ module Decidim
         enforce_permission_to :unendorse, :proposal, proposal: proposal
         @from_proposals_list = params[:from_proposals_list] == "true"
         user_group_id = params[:user_group_id]
-        user_group = current_user.user_groups.verified.find(user_group_id) if user_group_id
+        user_group = user_groups.find(user_group_id) if user_group_id
 
         UnendorseProposal.call(proposal, current_user, user_group) do
           on(:ok) do
@@ -42,12 +42,16 @@ module Decidim
       def identities
         enforce_permission_to :endorse, :proposal, proposal: proposal
 
-        @user_verified_groups = current_user.user_groups.verified
+        @user_verified_groups = Decidim::UserGroups::ManageableUserGroups.for(current_user).verified
         render :identities, layout: false
       end
 
       private
 
+      def user_groups
+        Decidim::UserGroups::ManageableUserGroups.for(current_user).verified
+      end
+
       def proposal
         @proposal ||= Proposal.where(component: current_component).find(params[:proposal_id])
       end

data/app/controllers/decidim/proposals/proposal_votes_controller.rb

@@ -5,6 +5,7 @@ module Decidim
     # Exposes the proposal vote resource so users can vote proposals.
     class ProposalVotesController < Decidim::Proposals::ApplicationController
       include ProposalVotesHelper
+      include Rectify::ControllerHelpers
 
       helper_method :proposal
 
@@ -17,6 +18,13 @@ module Decidim
         VoteProposal.call(proposal, current_user) do
           on(:ok) do
             proposal.reload
+
+            proposals = ProposalVote.where(
+              author: current_user,
+              proposal: Proposal.where(component: current_component)
+            ).map(&:proposal)
+
+            expose(proposals: proposals)
             render :update_buttons_and_counters
           end
 
@@ -33,6 +41,13 @@ module Decidim
         UnvoteProposal.call(proposal, current_user) do
           on(:ok) do
             proposal.reload
+
+            proposals = ProposalVote.where(
+              author: current_user,
+              proposal: Proposal.where(component: current_component)
+            ).map(&:proposal)
+
+            expose(proposals: proposals + [proposal])
             render :update_buttons_and_counters
           end
         end

data/app/controllers/decidim/proposals/proposals_controller.rb

@@ -203,7 +203,7 @@ module Decidim
       end
 
       def proposal_draft
-        Proposal.from_all_user_identities(current_user).not_hidden.where(component: current_component).find_by(published_at: nil)
+        Proposal.from_all_author_identities(current_user).not_hidden.where(component: current_component).find_by(published_at: nil)
       end
 
       def ensure_is_draft