decidim-proposals 0.19.0 → 0.22.0

data/db/migrate/20181003074440_fix_user_groups_ids_in_proposals_endorsements.rb

@@ -1,6 +1,10 @@
 # frozen_string_literal: true
 
 class FixUserGroupsIdsInProposalsEndorsements < ActiveRecord::Migration[5.2]
+  class ProposalEndorsement < ApplicationRecord
+    self.table_name = :decidim_proposals_proposal_endorsements
+  end
+
   # rubocop:disable Rails/SkipsModelValidations
   def change
     Decidim::UserGroup.find_each do |group|

data/db/migrate/20191206154128_add_endorsements_counter_cache_to_proposals.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AddEndorsementsCounterCacheToProposals < ActiveRecord::Migration[5.2]
+  def change
+    add_column :decidim_proposals_proposals, :endorsements_count, :integer, null: false, default: 0
+  end
+end

data/db/migrate/20200120215928_move_proposal_endorsements_to_core_endorsements.rb

@@ -0,0 +1,52 @@
+# frozen_string_literal: true
+
+# This migration must be executed after CreateDecidimEndorsements migration in decidim-core.
+class MoveProposalEndorsementsToCoreEndorsements < ActiveRecord::Migration[5.2]
+  class ProposalEndorsement < ApplicationRecord
+    self.table_name = :decidim_proposals_proposal_endorsements
+  end
+  class Endorsement < ApplicationRecord
+    self.table_name = :decidim_endorsements
+  end
+  # Move ProposalEndorsements to Endorsements
+  def up
+    non_duplicated_group_endorsements = ProposalEndorsement.select(
+      "MIN(id) as id, decidim_user_group_id"
+    ).group(:decidim_user_group_id).where.not(decidim_user_group_id: nil).map(&:id)
+
+    ProposalEndorsement.where("id IN (?) OR decidim_user_group_id IS NULL", non_duplicated_group_endorsements).find_each do |prop_endorsement|
+      Endorsement.create!(
+        resource_type: Decidim::Proposals::Proposal.name,
+        resource_id: prop_endorsement.decidim_proposal_id,
+        decidim_author_type: prop_endorsement.decidim_author_type,
+        decidim_author_id: prop_endorsement.decidim_author_id,
+        decidim_user_group_id: prop_endorsement.decidim_user_group_id
+      )
+    end
+    # update new `decidim_proposals_proposal.endorsements_count` counter cache
+    Decidim::Proposals::Proposal.select(:id).all.find_each do |proposal|
+      Decidim::Proposals::Proposal.reset_counters(proposal.id, :endorsements)
+    end
+  end
+
+  def down
+    non_duplicated_group_endorsements = Endorsement.select(
+      "MIN(id) as id, decidim_user_group_id"
+    ).group(:decidim_user_group_id).where.not(decidim_user_group_id: nil).map(&:id)
+
+    Endorsement
+      .where(resource_type: "Decidim::Proposals::Proposal")
+      .where("id IN (?) OR decidim_user_group_id IS NULL", non_duplicated_group_endorsements).find_each do |endorsement|
+      ProposalEndorsement.find_or_create_by!(
+        decidim_proposal_id: endorsement.resource_id,
+        decidim_author_type: endorsement.decidim_author_type,
+        decidim_author_id: endorsement.decidim_author_id,
+        decidim_user_group_id: endorsement.decidim_user_group_id
+      )
+    end
+    # update `decidim_proposals_proposal.proposal_endorsements_count` counter cache
+    Decidim::Proposals::Proposal.select(:id).all.find_each do |proposal|
+      Decidim::Proposals::Proposal.reset_counters(proposal.id, :proposal_endorsements)
+    end
+  end
+end

data/db/migrate/20200203111239_add_proposal_valuation_assignments.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+class AddProposalValuationAssignments < ActiveRecord::Migration[5.2]
+  def change
+    create_table :decidim_proposals_valuation_assignments do |t|
+      t.references :decidim_proposal, null: false, index: { name: "decidim_proposals_valuation_assignment_proposal" }
+      t.references :valuator_role, polymorphic: true, null: false, index: { name: "decidim_proposals_valuation_assignment_valuator_role" }
+
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20200210135152_add_costs_to_proposals.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+class AddCostsToProposals < ActiveRecord::Migration[5.2]
+  def change
+    add_column :decidim_proposals_proposals, :cost, :decimal
+    add_column :decidim_proposals_proposals, :cost_report, :jsonb
+    add_column :decidim_proposals_proposals, :execution_period, :jsonb
+  end
+end

data/db/migrate/20200212120110_sync_proposals_state_with_amendments_state.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+class SyncProposalsStateWithAmendmentsState < ActiveRecord::Migration[5.2]
+  def up
+    execute <<-SQL.squish
+      UPDATE decidim_proposals_proposals AS proposals
+      SET state = amendments.state
+      FROM decidim_amendments AS amendments
+      WHERE
+        proposals.state IS NULL AND
+        amendments.decidim_emendation_type = 'Decidim::Proposals::Proposal' AND
+        amendments.decidim_emendation_id = proposals.id AND
+        amendments.state IS NOT NULL
+    SQL
+  end
+
+  def down
+    execute <<-SQL.squish
+      UPDATE decidim_proposals_proposals AS proposals
+      SET state = NULL
+      FROM decidim_amendments AS amendments
+      WHERE
+        amendments.decidim_emendation_type = 'Decidim::Proposals::Proposal' AND
+        amendments.decidim_emendation_id = proposals.id AND
+        amendments.state IS NOT NULL
+    SQL
+  end
+end

data/db/migrate/20200227175922_add_state_published_at_to_proposals.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AddStatePublishedAtToProposals < ActiveRecord::Migration[5.2]
+  def change
+    add_column :decidim_proposals_proposals, :state_published_at, :datetime
+  end
+end

data/db/migrate/20200306123652_publish_existing_proposals_state.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+class PublishExistingProposalsState < ActiveRecord::Migration[5.2]
+  def up
+    execute <<-SQL.squish
+      UPDATE decidim_proposals_proposals SET state_published_at = COALESCE(answered_at, published_at) WHERE state IS NOT NULL
+    SQL
+  end
+
+  def down
+    execute <<-SQL.squish
+      UPDATE decidim_proposals_proposals SET state_published_at = NULL
+    SQL
+  end
+end

data/db/migrate/20200730131631_move_proposal_endorsed_event_notifications_to_resource_endorsed_event.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+class MoveProposalEndorsedEventNotificationsToResourceEndorsedEvent < ActiveRecord::Migration[5.2]
+  def up
+    Decidim::Notification.where(event_name: "decidim.events.proposals.proposal_endorsed", event_class: "Decidim::Proposals::ProposalEndorsedEvent").find_each do |notification|
+      notification.update(event_name: "decidim.events.resource_endorsed", event_class: "Decidim::ResourceEndorsedEvent")
+    end
+  end
+
+  def down
+    Decidim::Notification.where(
+      event_name: "decidim.events.resource_endorsed",
+      event_class: "Decidim::ResourceEndorsedEvent",
+      decidim_resource_type: "Decidim::Proposals::Proposal"
+    )
+                         .find_each do |notification|
+      notification.update(event_name: "decidim.events.proposals.proposal_endorsed", event_class: "Decidim::Proposals::ProposalEndorsedEvent")
+    end
+  end
+end

data/lib/decidim/proposals.rb

@@ -17,6 +17,7 @@ module Decidim
     autoload :ParticipatoryTextSection, "decidim/proposals/participatory_text_section"
     autoload :DocToMarkdown, "decidim/proposals/doc_to_markdown"
     autoload :OdtToMarkdown, "decidim/proposals/odt_to_markdown"
+    autoload :Valuatable, "decidim/proposals/valuatable"
 
     include ActiveSupport::Configurable
 

data/lib/decidim/proposals/admin_engine.rb

@@ -10,15 +10,19 @@ module Decidim
       paths["lib/tasks"] = nil
 
       routes do
-        resources :proposals, only: [:index, :new, :create, :edit, :update] do
-          post :update_category, on: :collection
+        resources :proposals, only: [:show, :index, :new, :create, :edit, :update] do
+          resources :valuation_assignments, only: [:destroy]
           collection do
+            post :update_category
+            post :publish_answers
+            post :update_scope
             resource :proposals_import, only: [:new, :create]
             resource :proposals_merge, only: [:create]
             resource :proposals_split, only: [:create]
+            resource :valuation_assignment, only: [:create, :destroy]
           end
           resources :proposal_answers, only: [:edit, :update]
-          resources :proposal_notes, only: [:index, :create]
+          resources :proposal_notes, only: [:create]
         end
 
         resources :participatory_texts, only: [:index] do

data/lib/decidim/proposals/component.rb

@@ -34,12 +34,16 @@ Decidim.register_component(:proposals) do |component|
     settings.attribute :comments_enabled, type: :boolean, default: true
     settings.attribute :geocoding_enabled, type: :boolean, default: false
     settings.attribute :attachments_allowed, type: :boolean, default: false
+    settings.attribute :allow_card_image, type: :boolean, default: false
     settings.attribute :resources_permissions_enabled, type: :boolean, default: true
     settings.attribute :collaborative_drafts_enabled, type: :boolean, default: false
-    settings.attribute :participatory_texts_enabled, type: :boolean, default: false
+    settings.attribute :participatory_texts_enabled,
+                       type: :boolean, default: false,
+                       readonly: ->(context) { Decidim::Proposals::Proposal.where(component: context[:component]).any? }
     settings.attribute :amendments_enabled, type: :boolean, default: false
     settings.attribute :amendments_wizard_help_text, type: :text, translated: true, editor: true, required: false
     settings.attribute :announcement, type: :text, translated: true, editor: true
+    settings.attribute :new_proposal_body_template, type: :text, translated: true, editor: false, required: false
     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
@@ -56,10 +60,14 @@ Decidim.register_component(:proposals) do |component|
     settings.attribute :comments_blocked, type: :boolean, default: false
     settings.attribute :creation_enabled, type: :boolean
     settings.attribute :proposal_answering_enabled, type: :boolean, default: true
+    settings.attribute :publish_answers_immediately, type: :boolean, default: true
+    settings.attribute :answers_with_costs, type: :boolean, default: false
     settings.attribute :amendment_creation_enabled, type: :boolean, default: true
     settings.attribute :amendment_reaction_enabled, type: :boolean, default: true
     settings.attribute :amendment_promotion_enabled, type: :boolean, default: true
-    settings.attribute :amendments_visibility, type: :string, default: "all"
+    settings.attribute :amendments_visibility,
+                       type: :enum, default: "all",
+                       choices: -> { Decidim.config.amendments_visibility_options }
     settings.attribute :announcement, type: :text, translated: true, editor: true
     settings.attribute :automatic_hashtags, type: :text, editor: false, required: false
     settings.attribute :suggested_hashtags, type: :text, editor: false, required: false
@@ -86,14 +94,14 @@ Decidim.register_component(:proposals) do |component|
     Decidim::Proposals::FilteredProposals.for(components, start_at, end_at).accepted.not_hidden.count
   end
 
-  component.register_stat :votes_count, priority: Decidim::StatsRegistry::HIGH_PRIORITY do |components, start_at, end_at|
+  component.register_stat :supports_count, priority: Decidim::StatsRegistry::HIGH_PRIORITY do |components, start_at, end_at|
     proposals = Decidim::Proposals::FilteredProposals.for(components, start_at, end_at).published.not_hidden
     Decidim::Proposals::ProposalVote.where(proposal: proposals).count
   end
 
   component.register_stat :endorsements_count, priority: Decidim::StatsRegistry::MEDIUM_PRIORITY do |components, start_at, end_at|
     proposals = Decidim::Proposals::FilteredProposals.for(components, start_at, end_at).not_hidden
-    Decidim::Proposals::ProposalEndorsement.where(proposal: proposals).count
+    Decidim::Endorsement.where(resource_id: proposals.pluck(:id), resource_type: Decidim::Proposals::Proposal.name).count
   end
 
   component.register_stat :comments_count, tag: :comments do |components, start_at, end_at|
@@ -101,12 +109,25 @@ Decidim.register_component(:proposals) do |component|
     Decidim::Comments::Comment.where(root_commentable: proposals).count
   end
 
+  component.register_stat :followers_count, tag: :followers, priority: Decidim::StatsRegistry::LOW_PRIORITY do |components, start_at, end_at|
+    proposals_ids = Decidim::Proposals::FilteredProposals.for(components, start_at, end_at).published.not_hidden.pluck(:id)
+    Decidim::Follow.where(decidim_followable_type: "Decidim::Proposals::Proposal", decidim_followable_id: proposals_ids).count
+  end
+
   component.exports :proposals do |exports|
-    exports.collection do |component_instance|
-      Decidim::Proposals::Proposal
-        .published
-        .where(component: component_instance)
-        .includes(:category, component: { participatory_space: :organization })
+    exports.collection do |component_instance, user|
+      space = component_instance.participatory_space
+
+      collection = Decidim::Proposals::Proposal
+                   .published
+                   .where(component: component_instance)
+                   .includes(:category, :component)
+
+      if space.user_roles(:valuator).where(user: user).any?
+        collection.with_valuation_assigned_to(user, space)
+      else
+        collection
+      end
     end
 
     exports.include_in_open_data = true
@@ -166,15 +187,17 @@ Decidim.register_component(:proposals) do |component|
     end
 
     5.times do |n|
-      state, answer = if n > 3
-                        ["accepted", Decidim::Faker::Localized.sentence(10)]
-                      elsif n > 2
-                        ["rejected", nil]
-                      elsif n > 1
-                        ["evaluating", nil]
-                      else
-                        [nil, nil]
-                      end
+      state, answer, state_published_at = if n > 3
+                                            ["accepted", Decidim::Faker::Localized.sentence(10), Time.current]
+                                          elsif n > 2
+                                            ["rejected", nil, Time.current]
+                                          elsif n > 1
+                                            ["evaluating", nil, Time.current]
+                                          elsif n.positive?
+                                            ["accepted", Decidim::Faker::Localized.sentence(10), nil]
+                                          else
+                                            [nil, nil, nil]
+                                          end
 
       params = {
         component: component,
@@ -184,7 +207,8 @@ Decidim.register_component(:proposals) do |component|
         body: Faker::Lorem.paragraphs(2).join("\n"),
         state: state,
         answer: answer,
-        answered_at: Time.current,
+        answered_at: state.present? ? Time.current : nil,
+        state_published_at: state_published_at,
         published_at: Time.current
       }
 
@@ -247,7 +271,7 @@ Decidim.register_component(:proposals) do |component|
           scope: Faker::Boolean.boolean(0.5) ? global : scopes.sample,
           title: "#{proposal.title} #{Faker::Lorem.sentence(1)}",
           body: "#{proposal.body} #{Faker::Lorem.sentence(3)}",
-          state: nil,
+          state: "evaluating",
           answer: nil,
           answered_at: Time.current,
           published_at: Time.current
@@ -290,11 +314,11 @@ Decidim.register_component(:proposals) do |component|
           about: Faker::Lorem.paragraph(2)
         )
 
-        Decidim::Proposals::ProposalVote.create!(proposal: proposal, author: author) unless proposal.answered? && proposal.rejected?
+        Decidim::Proposals::ProposalVote.create!(proposal: proposal, author: author) unless proposal.published_state? && proposal.rejected?
         Decidim::Proposals::ProposalVote.create!(proposal: emendation, author: author) if emendation
       end
 
-      unless proposal.answered? && proposal.rejected?
+      unless proposal.published_state? && 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}"
@@ -329,7 +353,7 @@ Decidim.register_component(:proposals) do |component|
               user_group: group
             )
           end
-          Decidim::Proposals::ProposalEndorsement.create!(proposal: proposal, author: author, user_group: author.user_groups.first)
+          Decidim::Endorsement.create!(resource: proposal, author: author, user_group: author.user_groups.first)
         end
       end
 

data/lib/decidim/proposals/engine.rb

@@ -17,9 +17,6 @@ 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 :complete
@@ -50,8 +47,7 @@ module Decidim
       end
 
       initializer "decidim_proposals.assets" do |app|
-        app.config.assets.precompile += %w(decidim_proposals_manifest.js
-                                           decidim/proposals/identity_selector_dialog.js)
+        app.config.assets.precompile += %w(decidim_proposals_manifest.js)
       end
 
       initializer "decidim.content_processors" do |_app|
@@ -112,7 +108,7 @@ module Decidim
           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")
+            proposal.update(state: "accepted", state_published_at: Time.current)
           end
         end
       end

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

@@ -0,0 +1,49 @@
+# frozen_string_literal: true
+
+require "decidim/dev/test/rspec_support/capybara_data_picker"
+
+module Capybara
+  module ProposalsPicker
+    include DataPicker
+
+    RSpec::Matchers.define :have_proposals_picked do |expected|
+      match do |proposals_picker|
+        data_picker = proposals_picker.data_picker
+
+        expected.each do |proposal|
+          expect(data_picker).to have_selector(".picker-values div input[value='#{proposal.id}']", visible: :all)
+          expect(data_picker).to have_selector(:xpath, "//div[contains(@class,'picker-values')]/div/a[text()[contains(.,\"#{proposal.title}\")]]")
+        end
+      end
+    end
+
+    RSpec::Matchers.define :have_proposals_not_picked do |expected|
+      match do |proposals_picker|
+        data_picker = proposals_picker.data_picker
+
+        expected.each do |proposal|
+          expect(data_picker).not_to have_selector(".picker-values div input[value='#{proposal.id}']", visible: :all)
+          expect(data_picker).not_to have_selector(:xpath, "//div[contains(@class,'picker-values')]/div/a[text()[contains(.,\"#{proposal.title}\")]]")
+        end
+      end
+    end
+
+    def proposals_pick(proposals_picker, proposals)
+      data_picker = proposals_picker.data_picker
+
+      expect(data_picker).to have_selector(".picker-prompt")
+      data_picker.find(".picker-prompt").click
+
+      proposals.each do |proposal|
+        data_picker_choose_value(proposal.id)
+      end
+      data_picker_close
+
+      expect(proposals_picker).to have_proposals_picked(proposals)
+    end
+  end
+end
+
+RSpec.configure do |config|
+  config.include Capybara::ProposalsPicker, type: :system
+end

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

@@ -223,6 +223,14 @@ FactoryBot.define do
       end
     end
 
+    trait :with_card_image_allowed do
+      settings do
+        {
+          allow_card_image: true
+        }
+      end
+    end
+
     trait :with_extra_hashtags do
       transient do
         automatic_hashtags { "AutoHashtag AnotherAutoHashtag" }
@@ -239,6 +247,16 @@ FactoryBot.define do
         }
       end
     end
+
+    trait :without_publish_answers_immediately do
+      step_settings do
+        {
+          participatory_space.active_step.id => {
+            publish_answers_immediately: false
+          }
+        }
+      end
+    end
   end
 
   factory :proposal, class: "Decidim::Proposals::Proposal" do
@@ -299,26 +317,41 @@ FactoryBot.define do
     trait :evaluating do
       state { "evaluating" }
       answered_at { Time.current }
+      state_published_at { Time.current }
     end
 
     trait :accepted do
       state { "accepted" }
       answered_at { Time.current }
+      state_published_at { Time.current }
     end
 
     trait :rejected do
       state { "rejected" }
       answered_at { Time.current }
+      state_published_at { Time.current }
     end
 
     trait :withdrawn do
       state { "withdrawn" }
     end
 
+    trait :accepted_not_published do
+      state { "accepted" }
+      answered_at { Time.current }
+      state_published_at { nil }
+      answer { generate_localized_title }
+    end
+
     trait :with_answer do
       state { "accepted" }
       answer { generate_localized_title }
       answered_at { Time.current }
+      state_published_at { Time.current }
+    end
+
+    trait :not_answered do
+      state { nil }
     end
 
     trait :draft do
@@ -339,25 +372,29 @@ FactoryBot.define do
 
     trait :with_endorsements do
       after :create do |proposal|
-        create_list(:proposal_endorsement, 5, proposal: proposal)
+        5.times.collect do
+          create(:endorsement, resource: proposal, author: build(:user, organization: proposal.participatory_space.organization))
+        end
       end
     end
-  end
 
-  factory :proposal_vote, class: "Decidim::Proposals::ProposalVote" do
-    proposal { build(:proposal) }
-    author { build(:user, organization: proposal.organization) }
+    trait :with_amendments do
+      after :create do |proposal|
+        create_list(:proposal_amendment, 5, amendable: proposal)
+      end
+    end
   end
 
-  factory :proposal_endorsement, class: "Decidim::Proposals::ProposalEndorsement" do
+  factory :proposal_vote, class: "Decidim::Proposals::ProposalVote" 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, verified_at: Time.current, organization: proposal.organization, users: [author]) }
+  factory :proposal_amendment, class: "Decidim::Amendment" do
+    amendable { build(:proposal) }
+    emendation { build(:proposal, component: amendable.component) }
+    amender { build(:user, organization: amendable.component.participatory_space.organization) }
+    state { Decidim::Amendment::STATES.sample }
   end
 
   factory :proposal_note, class: "Decidim::Proposals::ProposalNote" do
@@ -408,4 +445,13 @@ FactoryBot.define do
     description { "<script>alert(\"DESCRIPTION\");</script>\n" + Faker::Lorem.sentences(3).join("\n") }
     component { create(:proposal_component) }
   end
+
+  factory :valuation_assignment, class: "Decidim::Proposals::ValuationAssignment" do
+    proposal
+    valuator_role do
+      space = proposal.component.participatory_space
+      organization = space.organization
+      build :participatory_process_user_role, role: :valuator, user: build(:user, organization: organization)
+    end
+  end
 end