decidim-proposals 0.9.3 → 0.10.0

data/db/migrate/20170307085300_migrate_proposal_reports_data_to_reports.rb

@@ -14,7 +14,7 @@ class MigrateProposalReportsDataToReports < ActiveRecord::Migration[5.0]
                               user: proposal_report.user,
                               reason: proposal_report.reason,
                               details: proposal_report.details)
-      moderation.update_attributes!(report_count: moderation.report_count + 1)
+      moderation.update!(report_count: moderation.report_count + 1)
     end
 
     drop_table :decidim_proposals_proposal_reports

data/db/migrate/20171201115434_create_proposal_endorsements.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+class CreateProposalEndorsements < ActiveRecord::Migration[5.1]
+  def change
+    create_table :decidim_proposals_proposal_endorsements do |t|
+      t.references :decidim_proposal, null: false, index: { name: "decidim_proposals_proposal_endorsement_proposal" }
+      t.references :decidim_author, null: false, index: { name: "decidim_proposals_proposal_endorsement_author" }
+      t.references :decidim_user_group, null: true, index: { name: "decidim_proposals_proposal_endorsement_user_group" }
+
+      t.timestamps
+    end
+
+    add_index :decidim_proposals_proposal_endorsements, "decidim_proposal_id, decidim_author_id, (coalesce(decidim_user_group_id,-1))", unique: true, name:
+      "decidim_proposals_proposal_endorsmt_proposal_auth_ugroup_uniq"
+  end
+end

data/db/migrate/20171201122623_add_counter_cache_endorsements_to_proposals.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+class AddCounterCacheEndorsementsToProposals < ActiveRecord::Migration[5.1]
+  def change
+    add_column :decidim_proposals_proposals, :proposal_endorsements_count, :integer, null: false, default: 0
+    add_index :decidim_proposals_proposals, :proposal_endorsements_count, name: "idx_decidim_proposals_proposals_on_proposal_endorsemnts_count"
+  end
+end

data/db/migrate/20171212102250_enable_pg_extensions.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class EnablePgExtensions < ActiveRecord::Migration[5.1]
+  def change
+    enable_extension "pg_trgm"
+  end
+end

data/db/migrate/20171220084719_add_published_at_to_proposals.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+class AddPublishedAtToProposals < ActiveRecord::Migration[5.1]
+  def up
+    add_column :decidim_proposals_proposals, :published_at, :datetime, index: true
+    # rubocop:disable Rails/SkipsModelValidations
+    Decidim::Proposals::Proposal.update_all("published_at = updated_at")
+    # rubocop:enable Rails/SkipsModelValidations
+  end
+
+  def down
+    remove_column :decidim_proposals_proposals, :published_at
+  end
+end

data/lib/decidim/proposals.rb

@@ -10,5 +10,20 @@ module Decidim
   # allows users to create proposals in a participatory process.
   module Proposals
     autoload :ProposalSerializer, "decidim/proposals/proposal_serializer"
+    autoload :CommentableProposal, "decidim/proposals/commentable_proposal"
+
+    include ActiveSupport::Configurable
+
+    # Public Setting that defines the similarity minimum value to consider two
+    # proposals similar. Defaults to 0.25.
+    config_accessor :similarity_threshold do
+      0.25
+    end
+
+    # Public Setting that defines how many similar proposals will be shown.
+    # Defaults to 10.
+    config_accessor :similarity_limit do
+      10
+    end
   end
 end

data/lib/decidim/proposals/admin_engine.rb

@@ -10,6 +10,10 @@ module Decidim
 
       routes do
         resources :proposals, only: [:index, :new, :create] do
+          post :update_category, on: :collection
+          collection do
+            resource :proposals_import, only: [:new, :create]
+          end
           resources :proposal_answers, only: [:edit, :update]
           resources :proposal_notes, only: [:index, :create]
         end
@@ -17,6 +21,10 @@ module Decidim
         root to: "proposals#index"
       end
 
+      initializer "decidim_proposals.admin_assets" do |app|
+        app.config.assets.precompile += %w(admin/decidim_proposals_manifest.js)
+      end
+
       initializer "decidim_proposals.inject_abilities_to_user" do |_app|
         Decidim.configure do |config|
           config.admin_abilities += [

data/lib/decidim/proposals/commentable_proposal.rb

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Proposals
+    # The data store for a Proposal in the Decidim::Proposals component.
+    module CommentableProposal
+      extend ActiveSupport::Concern
+      include Decidim::Comments::Commentable
+
+      included do
+        # Public: Overrides the `commentable?` Commentable concern method.
+        def commentable?
+          feature.settings.comments_enabled?
+        end
+
+        # Public: Overrides the `accepts_new_comments?` Commentable concern method.
+        def accepts_new_comments?
+          commentable? && !feature.current_settings.comments_blocked
+        end
+
+        # Public: Overrides the `comments_have_alignment?` Commentable concern method.
+        def comments_have_alignment?
+          true
+        end
+
+        # Public: Overrides the `comments_have_votes?` Commentable concern method.
+        def comments_have_votes?
+          true
+        end
+
+        # Public: Override Commentable concern method `users_to_notify_on_comment_created`
+        def users_to_notify_on_comment_created
+          return (followers | feature.participatory_space.admins).uniq if official?
+          followers
+        end
+      end
+    end
+  end
+end

data/lib/decidim/proposals/engine.rb

@@ -14,7 +14,15 @@ module Decidim
 
       routes do
         resources :proposals, except: [:destroy] do
+          resource :proposal_endorsement, only: [:create, :destroy] do
+            get :identities, on: :collection
+          end
           member do
+            get :compare
+            get :edit_draft
+            patch :update_draft
+            get :preview
+            post :publish
             put :withdraw
           end
           resource :proposal_vote, only: [:create, :destroy]
@@ -24,7 +32,9 @@ module Decidim
       end
 
       initializer "decidim_proposals.assets" do |app|
-        app.config.assets.precompile += %w(decidim_proposals_manifest.js decidim_proposals_manifest.css)
+        app.config.assets.precompile += %w(decidim_proposals_manifest.js
+                                           decidim_proposals_manifest.css
+                                           decidim/proposals/identity_selector_dialog.js)
       end
 
       initializer "decidim_proposals.inject_abilities_to_user" do |_app|
@@ -32,6 +42,64 @@ module Decidim
           config.abilities += ["Decidim::Proposals::Abilities::CurrentUserAbility"]
         end
       end
+
+      initializer "decidim_proposals.view_hooks" do
+        Decidim.view_hooks.register(:participatory_space_highlighted_elements, priority: Decidim::ViewHooks::MEDIUM_PRIORITY) do |view_context|
+          published_features = Decidim::Feature.where(participatory_space: view_context.current_participatory_space).published
+          proposals = Decidim::Proposals::Proposal.where(feature: published_features).order_randomly(rand * 2 - 1).limit(4)
+
+          next unless proposals.any?
+
+          view_context.extend Decidim::Proposals::ApplicationHelper
+          view_context.render(
+            partial: "decidim/participatory_spaces/highlighted_proposals",
+            locals: {
+              proposals: proposals
+            }
+          )
+        end
+
+        if defined? Decidim::ParticipatoryProcesses
+          Decidim::ParticipatoryProcesses.view_hooks.register(:process_group_highlighted_elements, priority: Decidim::ViewHooks::MEDIUM_PRIORITY) do |view_context|
+            published_features = Decidim::Feature.where(participatory_space: view_context.participatory_processes).published
+            proposals = Decidim::Proposals::Proposal.where(feature: published_features).order_randomly(rand * 2 - 1).limit(3)
+
+            next unless proposals.any?
+
+            view_context.extend Decidim::ResourceReferenceHelper
+            view_context.extend Decidim::Proposals::ApplicationHelper
+            view_context.render(
+              partial: "decidim/participatory_processes/participatory_process_groups/highlighted_proposals",
+              locals: {
+                proposals: proposals
+              }
+            )
+          end
+        end
+      end
+
+      initializer "decidim_changes" do
+        Decidim::SettingsChange.subscribe "surveys" do |changes|
+          Decidim::Proposals::SettingsChangeJob.perform_later(
+            changes[:feature_id],
+            changes[:previous_settings],
+            changes[:current_settings]
+          )
+        end
+      end
+
+      # Subscribes to ActiveSupport::Notifications that may affect a Proposal.
+      initializer "decidim_proposals.subscribe_to_events" do
+        # when a proposal is linked from a result
+        event_name = "decidim.resourceable.included_proposals.created"
+        ActiveSupport::Notifications.subscribe event_name do |_name, _started, _finished, _unique_id, data|
+          payload = data[:this]
+          if payload[:from_type] == Decidim::Accountability::Result.name && payload[:to_type] == Proposal.name
+            proposal = Proposal.find(payload[:to_id])
+            proposal.update(state: "accepted")
+          end
+        end
+      end
     end
   end
 end

data/lib/decidim/proposals/feature.rb

@@ -11,13 +11,17 @@ Decidim.register_feature(:proposals) do |feature|
     raise "Can't destroy this feature when there are proposals" if Decidim::Proposals::Proposal.where(feature: instance).any?
   end
 
-  feature.actions = %w(vote create withdraw)
+  feature.actions = %w(endorse vote create withdraw)
+
+  feature.query_type = "Decidim::Proposals::ProposalsType"
 
   feature.settings(:global) do |settings|
     settings.attribute :vote_limit, type: :integer, default: 0
     settings.attribute :proposal_limit, type: :integer, default: 0
+    settings.attribute :proposal_length, type: :integer, default: 500
     settings.attribute :proposal_edit_before_minutes, type: :integer, default: 5
-    settings.attribute :maximum_votes_per_proposal, type: :integer, default: 0
+    settings.attribute :threshold_per_proposal, type: :integer, default: 0
+    settings.attribute :can_accumulate_supports_beyond_threshold, type: :boolean, default: false
     settings.attribute :proposal_answering_enabled, type: :boolean, default: true
     settings.attribute :official_proposals_enabled, type: :boolean, default: true
     settings.attribute :comments_enabled, type: :boolean, default: true
@@ -25,9 +29,14 @@ Decidim.register_feature(:proposals) do |feature|
     settings.attribute :attachments_allowed, type: :boolean, default: false
     settings.attribute :announcement, type: :text, translated: true, editor: true
     settings.attribute :new_proposal_help_text, type: :text, translated: true, editor: true
+    settings.attribute :proposal_wizard_step_1_help_text, type: :text, translated: true, editor: true
+    settings.attribute :proposal_wizard_step_2_help_text, type: :text, translated: true, editor: true
+    settings.attribute :proposal_wizard_step_3_help_text, type: :text, translated: true, editor: true
   end
 
   feature.settings(:step) do |settings|
+    settings.attribute :endorsements_enabled, type: :boolean, default: true
+    settings.attribute :endorsements_blocked, type: :boolean
     settings.attribute :votes_enabled, type: :boolean
     settings.attribute :votes_blocked, type: :boolean
     settings.attribute :votes_hidden, type: :boolean, default: false
@@ -43,7 +52,7 @@ Decidim.register_feature(:proposals) do |feature|
   end
 
   feature.register_stat :proposals_count, primary: true, priority: Decidim::StatsRegistry::HIGH_PRIORITY do |features, start_at, end_at|
-    Decidim::Proposals::FilteredProposals.for(features, start_at, end_at).not_hidden.count
+    Decidim::Proposals::FilteredProposals.for(features, start_at, end_at).published.not_hidden.count
   end
 
   feature.register_stat :proposals_accepted, primary: true, priority: Decidim::StatsRegistry::HIGH_PRIORITY do |features, start_at, end_at|
@@ -51,12 +60,17 @@ Decidim.register_feature(:proposals) do |feature|
   end
 
   feature.register_stat :votes_count, priority: Decidim::StatsRegistry::HIGH_PRIORITY do |features, start_at, end_at|
-    proposals = Decidim::Proposals::FilteredProposals.for(features, start_at, end_at).not_hidden
+    proposals = Decidim::Proposals::FilteredProposals.for(features, start_at, end_at).published.not_hidden
     Decidim::Proposals::ProposalVote.where(proposal: proposals).count
   end
 
-  feature.register_stat :comments_count, tag: :comments do |features, start_at, end_at|
+  feature.register_stat :endorsements_count, priority: Decidim::StatsRegistry::MEDIUM_PRIORITY do |features, start_at, end_at|
     proposals = Decidim::Proposals::FilteredProposals.for(features, start_at, end_at).not_hidden
+    Decidim::Proposals::ProposalEndorsement.where(proposal: proposals).count
+  end
+
+  feature.register_stat :comments_count, tag: :comments do |features, start_at, end_at|
+    proposals = Decidim::Proposals::FilteredProposals.for(features, start_at, end_at).published.not_hidden
     Decidim::Comments::Comment.where(root_commentable: proposals).count
   end
 
@@ -129,7 +143,8 @@ Decidim.register_feature(:proposals) do |feature|
         user_group: user_group,
         state: state,
         answer: answer,
-        answered_at: Time.current
+        answered_at: Time.current,
+        published_at: Time.current
       )
 
       (n % 3).times do |m|
@@ -152,6 +167,36 @@ Decidim.register_feature(:proposals) do |feature|
         Decidim::Proposals::ProposalVote.create!(proposal: proposal, author: author) unless proposal.answered? && proposal.rejected?
       end
 
+      unless proposal.answered? && proposal.rejected?
+        (n * 2).times do |index|
+          email = "endorsement-author-#{participatory_space.underscored_name}-#{participatory_space.id}-#{n}-endr#{index}@example.org"
+          name = "#{Faker::Name.name} #{participatory_space.id} #{n} endr#{index}"
+
+          author = Decidim::User.find_or_initialize_by(email: email)
+          author.update!(
+            password: "password1234",
+            password_confirmation: "password1234",
+            name: name,
+            nickname: Faker::Twitter.unique.screen_name,
+            organization: feature.organization,
+            tos_agreement: "1",
+            confirmed_at: Time.current
+          )
+          if index.even?
+            group = Decidim::UserGroup.create!(
+              name: Faker::Name.name,
+              document_number: Faker::Code.isbn,
+              phone: Faker::PhoneNumber.phone_number,
+              decidim_organization_id: feature.organization.id,
+              verified_at: Time.current
+            )
+            author.user_groups << group
+            author.save!
+          end
+          Decidim::Proposals::ProposalEndorsement.create!(proposal: proposal, author: author, user_group: author.user_groups.first)
+        end
+      end
+
       (n % 3).times do
         author_admin = Decidim::User.where(organization: feature.organization, admin: true).all.sample
 

data/lib/decidim/proposals/test/factories.rb

@@ -9,6 +9,22 @@ FactoryBot.define do
     manifest_name :proposals
     participatory_space { create(:participatory_process, :with_steps, organization: organization) }
 
+    trait :with_endorsements_enabled do
+      step_settings do
+        {
+          participatory_space.active_step.id => { endorsements_enabled: true }
+        }
+      end
+    end
+
+    trait :with_endorsements_disabled do
+      step_settings do
+        {
+          participatory_space.active_step.id => { endorsements_enabled: false }
+        }
+      end
+    end
+
     trait :with_votes_enabled do
       step_settings do
         {
@@ -25,6 +41,14 @@ FactoryBot.define do
       end
     end
 
+    trait :with_votes_hidden do
+      step_settings do
+        {
+          participatory_space.active_step.id => { votes_hidden: true }
+        }
+      end
+    end
+
     trait :with_vote_limit do
       transient do
         vote_limit 10
@@ -49,6 +73,17 @@ FactoryBot.define do
       end
     end
 
+    trait :with_endorsements_blocked do
+      step_settings do
+        {
+          participatory_space.active_step.id => {
+            endorsements_enabled: true,
+            endorsements_blocked: true
+          }
+        }
+      end
+    end
+
     trait :with_votes_blocked do
       step_settings do
         {
@@ -84,10 +119,18 @@ FactoryBot.define do
       end
     end
 
-    trait :with_maximum_votes_per_proposal do
+    trait :with_threshold_per_proposal do
+      settings do
+        {
+          threshold_per_proposal: 1
+        }
+      end
+    end
+
+    trait :with_can_accumulate_supports_beyond_threshold do
       settings do
         {
-          maximum_votes_per_proposal: 1
+          can_accumulate_supports_beyond_threshold: true
         }
       end
     end
@@ -97,6 +140,9 @@ FactoryBot.define do
     title { Faker::Lorem.sentence }
     body { Faker::Lorem.sentences(3).join("\n") }
     feature { create(:proposal_feature) }
+    published_at { Time.current }
+    address { "#{Faker::Address.street_name}, #{Faker::Address.city}" }
+
     author do
       create(:user, organization: feature.organization) if feature
     end
@@ -128,6 +174,22 @@ FactoryBot.define do
       answer { Decidim::Faker::Localized.sentence }
       answered_at { Time.current }
     end
+
+    trait :draft do
+      published_at nil
+    end
+
+    trait :with_votes do
+      after :create do |proposal|
+        create_list(:proposal_vote, 5, proposal: proposal)
+      end
+    end
+
+    trait :with_endorsements do
+      after :create do |proposal|
+        create_list(:proposal_endorsement, 5, proposal: proposal)
+      end
+    end
   end
 
   factory :proposal_vote, class: "Decidim::Proposals::ProposalVote" do
@@ -135,6 +197,20 @@ FactoryBot.define do
     author { build(:user, organization: proposal.organization) }
   end
 
+  factory :proposal_endorsement, class: "Decidim::Proposals::ProposalEndorsement" do
+    proposal { build(:proposal) }
+    author { build(:user, organization: proposal.organization) }
+  end
+
+  factory :user_group_proposal_endorsement, class: "Decidim::Proposals::ProposalEndorsement" do
+    proposal { build(:proposal) }
+    author { build(:user, organization: proposal.organization) }
+    user_group { create(:user_group) }
+    after(:create) do |support|
+      create(:user_group_membership, user: support.author, user_group: Decidim::UserGroup.find(support.decidim_user_group_id))
+    end
+  end
+
   factory :proposal_note, class: "Decidim::Proposals::ProposalNote" do
     body { Faker::Lorem.sentences(3).join("\n") }
     proposal { build(:proposal) }