decidim-proposals 0.30.5 → 0.31.0.rc1

data/lib/decidim/proposals/engine.rb

@@ -103,7 +103,7 @@ module Decidim
 
       initializer "decidim_proposals.remove_space_admins" do
         ActiveSupport::Notifications.subscribe("decidim.admin.participatory_space.destroy_admin:after") do |_event_name, data|
-          Decidim::Proposals::ValuationAssignment.where(valuator_role_type: data.fetch(:class_name), valuator_role_id: data.fetch(:role)).destroy_all
+          Decidim::Proposals::EvaluationAssignment.where(evaluator_role_type: data.fetch(:class_name), evaluator_role_id: data.fetch(:role)).destroy_all
         end
       end
 
@@ -111,44 +111,26 @@ module Decidim
         Decidim::Gamification.register_badge(:proposals) do |badge|
           badge.levels = [1, 5, 10, 30, 60]
 
-          badge.valid_for = [:user, :user_group]
+          badge.valid_for = [:user]
 
           badge.reset = lambda { |model|
-            case model
-            when User
-              Decidim::Coauthorship.where(
-                coauthorable_type: "Decidim::Proposals::Proposal",
-                author: model,
-                user_group: nil
-              ).count
-            when UserGroup
-              Decidim::Coauthorship.where(
-                coauthorable_type: "Decidim::Proposals::Proposal",
-                user_group: model
-              ).count
-            end
+            Decidim::Coauthorship.where(
+              coauthorable_type: "Decidim::Proposals::Proposal",
+              author: model
+            ).count
           }
         end
 
         Decidim::Gamification.register_badge(:accepted_proposals) do |badge|
           badge.levels = [1, 5, 15, 30, 50]
 
-          badge.valid_for = [:user, :user_group]
+          badge.valid_for = [:user]
 
           badge.reset = lambda { |model|
-            proposal_ids = case model
-                           when User
-                             Decidim::Coauthorship.where(
-                               coauthorable_type: "Decidim::Proposals::Proposal",
-                               author: model,
-                               user_group: nil
-                             ).select(:coauthorable_id)
-                           when UserGroup
-                             Decidim::Coauthorship.where(
-                               coauthorable_type: "Decidim::Proposals::Proposal",
-                               user_group: model
-                             ).select(:coauthorable_id)
-                           end
+            proposal_ids = Decidim::Coauthorship.where(
+              coauthorable_type: "Decidim::Proposals::Proposal",
+              author: model
+            ).select(:coauthorable_id)
 
             Decidim::Proposals::Proposal.where(id: proposal_ids).accepted.count
           }
@@ -163,60 +145,7 @@ module Decidim
         end
       end
 
-      initializer "decidim_proposals.register_metrics" do
-        Decidim.metrics_registry.register(:proposals) do |metric_registry|
-          metric_registry.manager_class = "Decidim::Proposals::Metrics::ProposalsMetricManage"
-
-          metric_registry.settings do |settings|
-            settings.attribute :highlighted, type: :boolean, default: true
-            settings.attribute :scopes, type: :array, default: %w(home participatory_process)
-            settings.attribute :weight, type: :integer, default: 2
-            settings.attribute :stat_block, type: :string, default: "medium"
-          end
-        end
-
-        Decidim.metrics_registry.register(:accepted_proposals) do |metric_registry|
-          metric_registry.manager_class = "Decidim::Proposals::Metrics::AcceptedProposalsMetricManage"
-
-          metric_registry.settings do |settings|
-            settings.attribute :highlighted, type: :boolean, default: false
-            settings.attribute :scopes, type: :array, default: %w(home participatory_process)
-            settings.attribute :weight, type: :integer, default: 3
-            settings.attribute :stat_block, type: :string, default: "small"
-          end
-        end
-
-        Decidim.metrics_registry.register(:votes) do |metric_registry|
-          metric_registry.manager_class = "Decidim::Proposals::Metrics::VotesMetricManage"
-
-          metric_registry.settings do |settings|
-            settings.attribute :highlighted, type: :boolean, default: true
-            settings.attribute :scopes, type: :array, default: %w(home participatory_process)
-            settings.attribute :weight, type: :integer, default: 3
-            settings.attribute :stat_block, type: :string, default: "medium"
-          end
-        end
-
-        Decidim.metrics_registry.register(:endorsements) do |metric_registry|
-          metric_registry.manager_class = "Decidim::Proposals::Metrics::EndorsementsMetricManage"
-
-          metric_registry.settings do |settings|
-            settings.attribute :highlighted, type: :boolean, default: false
-            settings.attribute :scopes, type: :array, default: %w(participatory_process)
-            settings.attribute :weight, type: :integer, default: 4
-            settings.attribute :stat_block, type: :string, default: "medium"
-          end
-        end
-
-        Decidim.metrics_operation.register(:participants, :proposals) do |metric_operation|
-          metric_operation.manager_class = "Decidim::Proposals::Metrics::ProposalParticipantsMetricMeasure"
-        end
-        Decidim.metrics_operation.register(:followers, :proposals) do |metric_operation|
-          metric_operation.manager_class = "Decidim::Proposals::Metrics::ProposalFollowersMetricMeasure"
-        end
-      end
-
-      initializer "decidim_proposals.webpacker.assets_path" do
+      initializer "decidim_proposals.shakapacker.assets_path" do
         Decidim.register_assets_path File.expand_path("app/packs", root)
       end
 
@@ -235,6 +164,12 @@ module Decidim
           end
         end
       end
+
+      initializer "decidim_proposals.register_mutations", before: "decidim_api.graphiql" do
+        Decidim::MutationRegistry.instance.register(
+          Decidim::Proposals::ProposalsMutationType
+        )
+      end
     end
   end
 end

data/lib/decidim/proposals/evaluable.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Proposals
+    # A set of methods and features related to proposal evaluations.
+    module Evaluable
+      extend ActiveSupport::Concern
+      include Decidim::Comments::Commentable
+
+      included do
+        has_many :evaluation_assignments, foreign_key: "decidim_proposal_id", dependent: :destroy,
+                                          counter_cache: :evaluation_assignments_count, class_name: "Decidim::Proposals::EvaluationAssignment"
+
+        def evaluators
+          evaluator_role_ids = evaluation_assignments.where(proposal: self).pluck(:evaluator_role_id)
+          user_ids = participatory_space.user_roles(:evaluator).where(id: evaluator_role_ids).pluck(:decidim_user_id)
+          participatory_space.organization.users.where(id: user_ids)
+        end
+      end
+    end
+  end
+end

data/lib/decidim/proposals/import/proposal_creator.rb

@@ -26,7 +26,7 @@ module Decidim
         #
         # Returns a proposal
         def produce
-          resource.add_coauthor(context[:current_user], user_group: context[:user_group])
+          resource.add_coauthor(context[:current_user])
 
           resource
         end

data/lib/decidim/proposals/proposal_serializer.rb

@@ -40,9 +40,9 @@ module Decidim
           answered_at: proposal.answered_at,
           votes: (proposal.proposal_votes_count unless
           proposal.component.current_settings.votes_hidden?),
-          endorsements: {
-            total_count: proposal.endorsements.size,
-            user_endorsements:
+          likes: {
+            total_count: proposal.likes.size,
+            user_likes:
           },
           comments: proposal.comments_count,
           attachments: proposal.attachments.size,
@@ -89,8 +89,8 @@ module Decidim
         Decidim::ResourceLocatorPresenter.new(proposal).url
       end
 
-      def user_endorsements
-        proposal.endorsements.for_listing.map { |identity| identity.normalized_author&.name }
+      def user_likes
+        proposal.likes.for_listing.map { |identity| identity.author&.name }
       end
 
       def original_proposal_url
@@ -107,22 +107,20 @@ module Decidim
       end
 
       def author_fields
-        is_author_user_group = resource.coauthorships.map(&:decidim_user_group_id).any?
-
         {
           id: resource.authors.map(&:id),
           name: resource.authors.map do |author|
-            author_name(is_author_user_group ? resource.coauthorships.first.user_group : author)
+            author_name(author)
           end,
           url: resource.authors.map do |author|
-            author_url(is_author_user_group ? resource.coauthorships.first.user_group : author)
+            author_url(author)
           end
         }
       end
 
       def author_name(author)
         if author.respond_to?(:name)
-          translated_attribute(author.name) # is a Decidim::User or Decidim::Organization or Decidim::UserGroup
+          translated_attribute(author.name) # is a Decidim::User or Decidim::Organization
         elsif author.respond_to?(:title)
           translated_attribute(author.title) # is a Decidim::Meetings::Meeting
         end
@@ -130,7 +128,7 @@ module Decidim
 
       def author_url(author)
         if author.respond_to?(:nickname)
-          profile_url(author) # is a Decidim::User or Decidim::UserGroup
+          profile_url(author) # is a Decidim::User
         elsif author.respond_to?(:title)
           meeting_url(author) # is a Decidim::Meetings::Meeting
         else

data/lib/decidim/proposals/seeds.rb

@@ -17,7 +17,9 @@ module Decidim
 
         Decidim::Proposals.create_default_states!(component, admin_user)
 
-        5.times do |n|
+        number_of_records = slow_seeds? ? 10 : rand(25..50)
+
+        (5..number_of_records).to_a.sample.times do |n|
           proposal = create_proposal!(component:)
 
           if proposal.state.nil? && component.settings.amendments_enabled?
@@ -50,7 +52,12 @@ module Decidim
 
       def create_component!
         step_settings = if participatory_space.allows_steps?
-                          { participatory_space.active_step.id => { votes_enabled: true, votes_blocked: false, creation_enabled: true } }
+                          { participatory_space.active_step.id => {
+                            votes_enabled: true,
+                            votes_blocked: [false, true].sample,
+                            votes_hidden: [false, true].sample,
+                            creation_enabled: true
+                          } }
                         else
                           {}
                         end
@@ -61,7 +68,10 @@ module Decidim
           published_at: Time.current,
           participatory_space:,
           settings: {
-            vote_limit: 0,
+            minimum_votes_per_user: (0..2).to_a.sample,
+            vote_limit: (0..5).to_a.sample,
+            threshold_per_proposal: [0, (10..100).to_a.sample].sample,
+            can_accumulate_votes_beyond_threshold: [true, false].sample,
             attachments_allowed: [true, false].sample,
             amendments_enabled: participatory_space.id.odd?,
             collaborative_drafts_enabled: true,
@@ -146,15 +156,13 @@ module Decidim
       end
 
       def random_coauthor
-        n = rand(5)
-        n = 3 if n == 2 && !Decidim.module_installed?(:meetings)
+        n = rand(4)
+        n = 2 if n == 1 && !Decidim.module_installed?(:meetings)
 
         case n
         when 0
           Decidim::User.where(organization:).sample
         when 1
-          Decidim::UserGroup.where(organization:).sample
-        when 2
           meeting_component = participatory_space.components.find_by(manifest_name: "meetings")
 
           Decidim::Meetings::Meeting.where(component: meeting_component).sample
@@ -164,7 +172,7 @@ module Decidim
       end
 
       def random_nickname
-        "#{::Faker::X.unique.screen_name}-#{SecureRandom.hex(4)}"[0, 20]
+        "#{::Faker::Twitter.unique.screen_name}-#{SecureRandom.hex(4)}"[0, 20]
       end
 
       def random_email(suffix:)
@@ -176,25 +184,6 @@ module Decidim
       def create_emendation!(proposal:)
         author = find_or_initialize_user_by(email: random_email(suffix: "amendment"))
 
-        group = Decidim::UserGroup.create!(
-          name: ::Faker::Name.name,
-          nickname: random_nickname,
-          email: ::Faker::Internet.email,
-          extended_data: {
-            document_number: ::Faker::Code.isbn,
-            phone: ::Faker::PhoneNumber.phone_number,
-            verified_at: Time.current
-          },
-          organization:,
-          confirmed_at: Time.current
-        )
-
-        Decidim::UserGroupMembership.create!(
-          user: author,
-          role: "creator",
-          user_group: group
-        )
-
         params = {
           component: proposal.component,
           title: Decidim::Faker::Localized.literal(proposal.title[I18n.locale]),
@@ -212,7 +201,7 @@ module Decidim
           visibility: "public-only"
         ) do
           emendation = Decidim::Proposals::Proposal.new(params)
-          emendation.add_coauthor(author, user_group: author.user_groups.first)
+          emendation.add_coauthor(author)
           emendation.save!
           emendation
         end

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

@@ -29,18 +29,18 @@ FactoryBot.define do
       Decidim::Proposals.create_default_states!(proposal_component, nil, with_traceability: false)
     end
 
-    trait :with_endorsements_enabled do
+    trait :with_likes_enabled do
       step_settings do
         {
-          participatory_space.active_step.id => { endorsements_enabled: true }
+          participatory_space.active_step.id => { likes_enabled: true }
         }
       end
     end
 
-    trait :with_endorsements_disabled do
+    trait :with_likes_disabled do
       step_settings do
         {
-          participatory_space.active_step.id => { endorsements_enabled: false }
+          participatory_space.active_step.id => { likes_enabled: false }
         }
       end
     end
@@ -105,12 +105,12 @@ FactoryBot.define do
       end
     end
 
-    trait :with_endorsements_blocked do
+    trait :with_likes_blocked do
       step_settings do
         {
           participatory_space.active_step.id => {
-            endorsements_enabled: true,
-            endorsements_blocked: true
+            likes_enabled: true,
+            likes_blocked: true
           }
         }
       end
@@ -233,23 +233,6 @@ FactoryBot.define do
       end
     end
 
-    trait :with_extra_hashtags do
-      transient do
-        automatic_hashtags { "AutoHashtag AnotherAutoHashtag" }
-        suggested_hashtags { "SuggestedHashtag AnotherSuggestedHashtag" }
-      end
-
-      step_settings do
-        {
-          participatory_space.active_step.id => {
-            automatic_hashtags:,
-            suggested_hashtags:,
-            creation_enabled: true
-          }
-        }
-      end
-    end
-
     trait :without_publish_answers_immediately do
       step_settings do
         {
@@ -296,8 +279,6 @@ FactoryBot.define do
   factory :proposal, class: "Decidim::Proposals::Proposal" do
     transient do
       users { nil }
-      # user_groups correspondence to users is by sorting order
-      user_groups { [] }
       skip_injection { false }
       state { :not_answered }
     end
@@ -334,14 +315,13 @@ FactoryBot.define do
                         evaluator.body
                       end
 
-      proposal.title = Decidim::ContentProcessor.parse_with_processor(:hashtag, proposal.title, current_organization: proposal.organization).rewrite
-      proposal.body = Decidim::ContentProcessor.parse_with_processor(:hashtag, proposal.body, current_organization: proposal.organization).rewrite
+      proposal.title = Decidim::ContentProcessor.parse(proposal.title, current_organization: proposal.organization).rewrite
+      proposal.body = Decidim::ContentProcessor.parse_with_processor(:inline_images, proposal.body, current_organization: proposal.organization).rewrite
 
       if proposal.component
         users = evaluator.users || [create(:user, :confirmed, organization: proposal.component.participatory_space.organization, skip_injection: evaluator.skip_injection)]
-        users.each_with_index do |user, idx|
-          user_group = evaluator.user_groups[idx]
-          proposal.coauthorships.build(author: user, user_group:)
+        users.each do |user|
+          proposal.coauthorships.build(author: user)
         end
       end
     end
@@ -362,15 +342,6 @@ FactoryBot.define do
       end
     end
 
-    trait :user_group_author do
-      after :build do |proposal, evaluator|
-        proposal.coauthorships.clear
-        user = create(:user, organization: proposal.component.participatory_space.organization, skip_injection: evaluator.skip_injection)
-        user_group = create(:user_group, :verified, organization: user.organization, users: [user], skip_injection: evaluator.skip_injection)
-        proposal.coauthorships.build(author: user, user_group:)
-      end
-    end
-
     trait :official do
       after :build do |proposal|
         proposal.coauthorships.clear
@@ -410,9 +381,9 @@ FactoryBot.define do
 
     trait :accepted_not_published do
       state { :accepted }
+      answer { generate_localized_title }
       answered_at { Time.current }
       state_published_at { nil }
-      answer { generate_localized_title }
     end
 
     trait :with_answer do
@@ -442,12 +413,12 @@ FactoryBot.define do
       end
     end
 
-    trait :with_endorsements do
+    trait :with_likes do
       after :create do |proposal, evaluator|
         5.times.collect do
-          create(:endorsement, resource: proposal,
-                               author: build(:user, :confirmed, organization: proposal.participatory_space.organization, skip_injection: evaluator.skip_injection),
-                               skip_injection: evaluator.skip_injection)
+          create(:like, resource: proposal,
+                        author: build(:user, :confirmed, organization: proposal.participatory_space.organization, skip_injection: evaluator.skip_injection),
+                        skip_injection: evaluator.skip_injection)
         end
       end
     end
@@ -514,8 +485,6 @@ FactoryBot.define do
     transient do
       skip_injection { false }
       users { nil }
-      # user_groups correspondence to users is by sorting order
-      user_groups { [] }
     end
 
     title { generate_localized_title(:collaborative_draft_title, skip_injection:)["en"] }
@@ -527,9 +496,8 @@ FactoryBot.define do
     after(:build) do |collaborative_draft, evaluator|
       if collaborative_draft.component
         users = evaluator.users || [create(:user, organization: collaborative_draft.component.participatory_space.organization, skip_injection: evaluator.skip_injection)]
-        users.each_with_index do |user, idx|
-          user_group = evaluator.user_groups[idx]
-          collaborative_draft.coauthorships.build(author: user, user_group:)
+        users.each do |user|
+          collaborative_draft.coauthorships.build(author: user)
         end
       end
     end
@@ -566,15 +534,15 @@ FactoryBot.define do
     component { create(:proposal_component, skip_injection:) }
   end
 
-  factory :valuation_assignment, class: "Decidim::Proposals::ValuationAssignment" do
+  factory :evaluation_assignment, class: "Decidim::Proposals::EvaluationAssignment" do
     transient do
       skip_injection { false }
     end
     proposal
-    valuator_role do
+    evaluator_role do
       space = proposal.component.participatory_space
       organization = space.organization
-      build(:participatory_process_user_role, role: :valuator, skip_injection:, user: build(:user, organization:, skip_injection:))
+      build(:participatory_process_user_role, role: :evaluator, skip_injection:, user: build(:user, organization:, skip_injection:))
     end
   end
 end

data/lib/decidim/proposals/version.rb

@@ -4,7 +4,7 @@ module Decidim
   # This holds decidim-proposals version.
   module Proposals
     def self.version
-      "0.30.5"
+      "0.31.0.rc1"
     end
   end
 end

data/lib/decidim/proposals.rb

@@ -22,20 +22,20 @@ 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"
+    autoload :Evaluable, "decidim/proposals/evaluable"
 
     include ActiveSupport::Configurable
 
     # Public Setting that defines how many proposals will be shown in the
     # participatory_space_highlighted_elements view hook
     config_accessor :participatory_space_highlighted_proposals_limit do
-      4
+      Decidim::Env.new("PROPOSALS_PARTICIPATORY_SPACE_HIGHLIGHTED_PROPOSALS_LIMIT", 4).to_i
     end
 
     # Public Setting that defines how many proposals will be shown in the
     # process_group_highlighted_elements view hook
     config_accessor :process_group_highlighted_proposals_limit do
-      3
+      Decidim::Env.new("PROPOSALS_PROCESS_GROUP_HIGHLIGHTED_PROPOSALS_LIMIT", 3).to_i
     end
 
     def self.proposal_states_colors

data/lib/tasks/proposals/upgrade/decidim_proposals_upgrade_tasks.rake

@@ -37,29 +37,29 @@ namespace :decidim_proposals do
       puts "FINISHED"
     end
 
-    desc "Removes all proposal valuator records of which the role assignment does not exists"
-    task remove_valuator_orphan_records: :environment do
+    desc "Removes all proposal evaluator records of which the role assignment does not exists"
+    task remove_evaluator_orphan_records: :environment do
       if Decidim.module_installed?("participatory_processes")
-        Decidim::Proposals::ValuationAssignment
-          .where(valuator_role_type: "Decidim::ParticipatoryProcessUserRole")
+        Decidim::Proposals::EvaluationAssignment
+          .where(evaluator_role_type: "Decidim::ParticipatoryProcessUserRole")
           .where
-          .not(valuator_role_id: Decidim::ParticipatoryProcessUserRole.pluck(:id))
+          .not(evaluator_role_id: Decidim::ParticipatoryProcessUserRole.pluck(:id))
           .destroy_all
       end
 
       if Decidim.module_installed?("assemblies")
-        Decidim::Proposals::ValuationAssignment
-          .where(valuator_role_type: "Decidim::AssemblyUserRole")
+        Decidim::Proposals::EvaluationAssignment
+          .where(evaluator_role_type: "Decidim::AssemblyUserRole")
           .where
-          .not(valuator_role_id: Decidim::AssemblyUserRole.pluck(:id))
+          .not(evaluator_role_id: Decidim::AssemblyUserRole.pluck(:id))
           .destroy_all
       end
 
       if Decidim.module_installed?("conferences")
-        Decidim::Proposals::ValuationAssignment
-          .where(valuator_role_type: "Decidim::ConferenceUserRole")
+        Decidim::Proposals::EvaluationAssignment
+          .where(evaluator_role_type: "Decidim::ConferenceUserRole")
           .where
-          .not(valuator_role_id: Decidim::ConferenceUserRole.pluck(:id))
+          .not(evaluator_role_id: Decidim::ConferenceUserRole.pluck(:id))
           .destroy_all
       end
     end