decidim-proposals 0.9.3 → 0.10.0

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

@@ -35,7 +35,6 @@ module Decidim
         transaction do
           create_proposal
           create_attachment if process_attachments?
-          send_notification
         end
 
         broadcast(:ok, proposal)
@@ -43,17 +42,6 @@ module Decidim
 
       private
 
-      def send_notification
-        return if proposal.author.blank?
-
-        Decidim::EventsManager.publish(
-          event: "decidim.events.proposals.proposal_created",
-          event_class: Decidim::Proposals::CreateProposalEvent,
-          resource: proposal,
-          recipient_ids: proposal.author.followers.pluck(:id)
-        )
-      end
-
       attr_reader :form, :proposal, :attachment
 
       def create_proposal

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

@@ -0,0 +1,56 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Proposals
+    # A command with all the business logic when a user endorses a proposal.
+    class EndorseProposal < Rectify::Command
+      # Public: Initializes the command.
+      #
+      # proposal     - A Decidim::Proposals::Proposal object.
+      # current_user - The current user.
+      # current_group_id- (optional) The current_grup that is endorsing the Proposal.
+      def initialize(proposal, current_user, current_group_id = nil)
+        @proposal = proposal
+        @current_user = current_user
+        @current_group_id = current_group_id
+      end
+
+      # Executes the command. Broadcasts these events:
+      #
+      # - :ok when everything is valid, together with the proposal vote.
+      # - :invalid if the form wasn't valid and we couldn't proceed.
+      #
+      # Returns nothing.
+      def call
+        endorsement = build_proposal_endorsement
+        if endorsement.save
+          notify_endorser_followers
+          broadcast(:ok, endorsement)
+        else
+          broadcast(:invalid)
+        end
+      end
+
+      private
+
+      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
+      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,
+          extra: {
+            endorser_id: @current_user.id
+          }
+        )
+      end
+    end
+  end
+end

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

@@ -0,0 +1,60 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Proposals
+    # A command with all the business logic when a user publishes a draft proposal.
+    class PublishProposal < Rectify::Command
+      # Public: Initializes the command.
+      #
+      # proposal     - The proposal to publish.
+      # current_user - The current user.
+      def initialize(proposal, current_user)
+        @proposal = proposal
+        @current_user = current_user
+      end
+
+      # Executes the command. Broadcasts these events:
+      #
+      # - :ok when everything is valid and the proposal is published.
+      # - :invalid if the proposal's author is not the current user.
+      #
+      # Returns nothing.
+      def call
+        return broadcast(:invalid) if @proposal.author != @current_user
+
+        transaction do
+          @proposal.update published_at: Time.current
+          send_notification
+          send_notification_to_participatory_space
+        end
+
+        broadcast(:ok, @proposal)
+      end
+
+      private
+
+      def send_notification
+        return if @proposal.author.blank?
+
+        Decidim::EventsManager.publish(
+          event: "decidim.events.proposals.proposal_published",
+          event_class: Decidim::Proposals::PublishProposalEvent,
+          resource: @proposal,
+          recipient_ids: @proposal.author.followers.pluck(:id)
+        )
+      end
+
+      def send_notification_to_participatory_space
+        Decidim::EventsManager.publish(
+          event: "decidim.events.proposals.proposal_published",
+          event_class: Decidim::Proposals::PublishProposalEvent,
+          resource: @proposal,
+          recipient_ids: @proposal.participatory_space.followers.pluck(:id) - @proposal.author.followers.pluck(:id),
+          extra: {
+            participatory_space: true
+          }
+        )
+      end
+    end
+  end
+end

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

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Proposals
+    # A command with all the business logic when a user or organization unendorses a proposal.
+    class UnendorseProposal < Rectify::Command
+      # Public: Initializes the command.
+      #
+      # proposal     - A Decidim::Proposals::Proposal object.
+      # current_user - The current user.
+      # current_group- (optional) The current_group that is unendorsing from the Proposal.
+      def initialize(proposal, current_user, current_group = nil)
+        @proposal = proposal
+        @current_user = current_user
+        @current_group = current_group
+      end
+
+      # Executes the command. Broadcasts these events:
+      #
+      # - :ok when everything is valid, together with the proposal.
+      # - :invalid if the form wasn't valid and we couldn't proceed.
+      #
+      # Returns nothing.
+      def call
+        destroy_proposal_endorsement
+        broadcast(:ok, @proposal)
+      end
+
+      private
+
+      def destroy_proposal_endorsement
+        query = @proposal.endorsements.where(
+          author: @current_user,
+          decidim_user_group_id: @current_group&.id
+        )
+        query.destroy_all
+      end
+    end
+  end
+end

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

@@ -38,7 +38,7 @@ module Decidim
       attr_reader :form, :proposal, :current_user
 
       def update_proposal
-        @proposal.update_attributes!(
+        @proposal.update!(
           title: form.title,
           body: form.body,
           category: form.category,
@@ -72,11 +72,11 @@ module Decidim
       end
 
       def current_user_proposals
-        Proposal.where(author: current_user, feature: form.current_feature).where.not(id: proposal.id)
+        Proposal.where(author: current_user, feature: form.current_feature).published.where.not(id: proposal.id)
       end
 
       def user_group_proposals
-        Proposal.where(user_group: user_group, feature: form.current_feature).where.not(id: proposal.id)
+        Proposal.where(user_group: user_group, feature: form.current_feature).published.where.not(id: proposal.id)
       end
     end
   end

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

@@ -20,7 +20,7 @@ module Decidim
       #
       # Returns nothing.
       def call
-        return broadcast(:invalid) if @proposal.maximum_votes_reached?
+        return broadcast(:invalid) if @proposal.maximum_votes_reached? && !@proposal.can_accumulate_supports_beyond_threshold
 
         build_proposal_vote
         return broadcast(:invalid) unless vote.valid?

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

@@ -30,7 +30,7 @@ module Decidim
       private
 
       def change_proposal_state_to_withdrawn
-        @proposal.update_attributes state: "withdrawn"
+        @proposal.update state: "withdrawn"
       end
     end
   end

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

@@ -32,7 +32,7 @@ module Decidim
         private
 
         def proposal
-          @proposals ||= Proposal.where(feature: current_feature).find(params[:id])
+          @proposal ||= Proposal.where(feature: current_feature).find(params[:id])
         end
       end
     end

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

@@ -16,7 +16,7 @@ module Decidim
           authorize! :create, ProposalNote
           @form = form(ProposalNoteForm).from_params(params)
 
-          CreateProposalNote.call(@form, proposal, current_user) do
+          CreateProposalNote.call(@form, proposal) do
             on(:ok) do
               flash[:notice] = I18n.t("proposal_notes.create.success", scope: "decidim.proposals.admin")
               redirect_to proposal_proposal_notes_path(proposal_id: proposal.id)
@@ -32,7 +32,7 @@ module Decidim
         private
 
         def proposal
-          @proposals ||= Proposal.where(feature: current_feature).find(params[:proposal_id])
+          @proposal ||= Proposal.where(feature: current_feature).find(params[:proposal_id])
         end
       end
     end

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

@@ -32,10 +32,39 @@ module Decidim
           end
         end
 
+        def update_category
+          authorize! :update, Proposal
+          @proposal_ids = params[:proposal_ids]
+
+          Admin::UpdateProposalCategory.call(params[:category][:id], params[:proposal_ids]) do
+            on(:invalid_category) do
+              flash.now[:error] = I18n.t(
+                "proposals.update_category.select_a_category",
+                scope: "decidim.proposals.admin"
+              )
+            end
+
+            on(:invalid_proposal_ids) do
+              flash.now[:alert] = I18n.t(
+                "proposals.update_category.select_a_proposal",
+                scope: "decidim.proposals.admin"
+              )
+            end
+
+            on(:update_proposals_category) do
+              flash.now[:notice] = update_proposals_category_response_successful @response
+              flash.now[:alert] = update_proposals_category_response_errored @response
+            end
+            respond_to do |format|
+              format.js
+            end
+          end
+        end
+
         private
 
         def query
-          @query ||= Proposal.where(feature: current_feature).ransack(params[:q])
+          @query ||= Proposal.where(feature: current_feature).published.ransack(params[:q])
         end
 
         def proposals
@@ -45,6 +74,26 @@ module Decidim
         def proposal
           @proposal ||= Proposal.where(feature: current_feature).find(params[:id])
         end
+
+        def update_proposals_category_response_successful(response)
+          return if response[:successful].blank?
+          I18n.t(
+            "proposals.update_category.success",
+            category: response[:category_name],
+            proposals: response[:successful].to_sentence,
+            scope: "decidim.proposals.admin"
+          )
+        end
+
+        def update_proposals_category_response_errored(response)
+          return if response[:errored].blank?
+          I18n.t(
+            "proposals.update_category.invalid",
+            category: response[:category_name],
+            proposals: response[:errored].to_sentence,
+            scope: "decidim.proposals.admin"
+          )
+        end
       end
     end
   end

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

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Proposals
+    module Admin
+      class ProposalsImportsController < Admin::ApplicationController
+        def new
+          authorize! :manage, current_feature
+
+          @form = form(Admin::ProposalsImportForm).instance
+        end
+
+        def create
+          authorize! :manage, current_feature
+
+          @form = form(Admin::ProposalsImportForm).from_params(params)
+
+          authorize! :manage, @form.origin_feature
+
+          Admin::ImportProposals.call(@form) do
+            on(:ok) do |proposals|
+              flash[:notice] = I18n.t("proposals_imports.create.success", scope: "decidim.proposals.admin", number: proposals.length)
+              redirect_to EngineRouter.admin_proxy(current_feature).root_path
+            end
+
+            on(:invalid) do
+              flash.now[:alert] = I18n.t("proposals_imports.create.invalid", scope: "decidim.proposals.admin")
+              render action: "new"
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,56 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Proposals
+    # Exposes the proposal endorsement resource so that users can endorse proposals.
+    class ProposalEndorsementsController < Decidim::Proposals::ApplicationController
+      helper_method :proposal
+
+      before_action :authenticate_user!
+
+      def create
+        authorize! :endorse, proposal
+        @from_proposals_list = params[:from_proposals_list] == "true"
+        user_group_id = params[:user_group_id]
+
+        EndorseProposal.call(proposal, current_user, user_group_id) do
+          on(:ok) do
+            proposal.reload
+            render :update_buttons_and_counters
+          end
+
+          on(:invalid) do
+            render json: { error: I18n.t("proposal_endorsements.create.error", scope: "decidim.proposals") }, status: 422
+          end
+        end
+      end
+
+      def destroy
+        authorize! :unendorse, 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
+
+        UnendorseProposal.call(proposal, current_user, user_group) do
+          on(:ok) do
+            proposal.reload
+            render :update_buttons_and_counters
+          end
+        end
+      end
+
+      def identities
+        authorize! :endorse, proposal
+
+        @user_verified_groups = current_user.user_groups.verified
+        render :identities, layout: false
+      end
+
+      private
+
+      def proposal
+        @proposal ||= Proposal.where(feature: current_feature).find(params[:proposal_id])
+      end
+    end
+  end
+end

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

@@ -5,6 +5,7 @@ module Decidim
     # Exposes the proposal resource so users can view and create them.
     class ProposalsController < Decidim::Proposals::ApplicationController
       helper Decidim::WidgetUrlsHelper
+      helper ProposalWizardHelper
       include FormFactory
       include FilterResource
       include Orderable
@@ -12,10 +13,12 @@ module Decidim
 
       helper_method :geocoded_proposals
       before_action :authenticate_user!, only: [:new, :create]
+      before_action :ensure_is_draft, only: [:compare, :preview, :publish, :edit_draft, :update_draft]
 
       def index
         @proposals = search
                      .results
+                     .published
                      .not_hidden
                      .includes(:author)
                      .includes(:category)
@@ -35,27 +38,32 @@ module Decidim
       end
 
       def show
-        @proposal = Proposal.not_hidden.where(feature: current_feature).find(params[:id])
+        @proposal = Proposal.published.not_hidden.where(feature: current_feature).find(params[:id])
         @report_form = form(Decidim::ReportForm).from_params(reason: "spam")
       end
 
       def new
         authorize! :create, Proposal
-
-        @form = form(ProposalForm).from_params(
-          attachment: form(AttachmentForm).from_params({})
-        )
+        @step = :step_1
+        if proposal_draft.present?
+          redirect_to edit_draft_proposal_path proposal_draft.id
+        else
+          @form = form(ProposalForm).from_params(
+            attachment: form(AttachmentForm).from_params({})
+          )
+        end
       end
 
       def create
         authorize! :create, Proposal
-
+        @step = :step_1
         @form = form(ProposalForm).from_params(params)
 
         CreateProposal.call(@form, current_user) do
           on(:ok) do |proposal|
             flash[:notice] = I18n.t("proposals.create.success", scope: "decidim")
-            redirect_to Decidim::ResourceLocatorPresenter.new(proposal).path
+            compare_path = Decidim::ResourceLocatorPresenter.new(proposal).path + "/compare"
+            redirect_to compare_path
           end
 
           on(:invalid) do
@@ -65,8 +73,64 @@ module Decidim
         end
       end
 
+      def compare
+        @step = :step_2
+        @similar_proposals ||= Decidim::Proposals::SimilarProposals
+                               .for(current_feature, @proposal)
+                               .all
+
+        if @similar_proposals.blank?
+          flash[:notice] = I18n.t("proposals.proposals.compare.no_similars_found", scope: "decidim")
+          redirect_to preview_proposal_path(@proposal)
+        end
+      end
+
+      def preview
+        @step = :step_3
+      end
+
+      def publish
+        @step = :step_3
+        PublishProposal.call(@proposal, current_user) do
+          on(:ok) do |proposal|
+            flash[:notice] = I18n.t("proposals.publish.success", scope: "decidim")
+            redirect_to proposal_path(proposal)
+          end
+
+          on(:invalid) do
+            flash.now[:alert] = I18n.t("proposals.publish.error", scope: "decidim")
+            render :edit_draft
+          end
+        end
+      end
+
+      def edit_draft
+        @step = :step_1
+        authorize! :edit, Proposal
+
+        @form = form(ProposalForm).from_model(@proposal)
+      end
+
+      def update_draft
+        @step = :step_1
+        authorize! :edit, @proposal
+
+        @form = form(ProposalForm).from_params(params)
+        UpdateProposal.call(@form, current_user, @proposal) do
+          on(:ok) do |proposal|
+            flash[:notice] = I18n.t("proposals.update_draft.success", scope: "decidim")
+            redirect_to preview_proposal_path(proposal)
+          end
+
+          on(:invalid) do
+            flash.now[:alert] = I18n.t("proposals.update_draft.error", scope: "decidim")
+            render :edit_draft
+          end
+        end
+      end
+
       def edit
-        @proposal = Proposal.not_hidden.where(feature: current_feature).find(params[:id])
+        @proposal = Proposal.published.not_hidden.where(feature: current_feature).find(params[:id])
         authorize! :edit, @proposal
 
         @form = form(ProposalForm).from_model(@proposal)
@@ -91,7 +155,7 @@ module Decidim
       end
 
       def withdraw
-        @proposal = Proposal.not_hidden.where(feature: current_feature).find(params[:id])
+        @proposal = Proposal.published.not_hidden.where(feature: current_feature).find(params[:id])
         authorize! :withdraw, @proposal
 
         WithdrawProposal.call(@proposal, current_user) do
@@ -127,6 +191,15 @@ module Decidim
           related_to: ""
         }
       end
+
+      def proposal_draft
+        Proposal.not_hidden.where(feature: current_feature).find_by(published_at: nil)
+      end
+
+      def ensure_is_draft
+        @proposal = Proposal.not_hidden.where(feature: current_feature).find(params[:id])
+        redirect_to Decidim::ResourceLocatorPresenter.new(@proposal).path unless @proposal.draft?
+      end
     end
   end
 end