decidim-proposals 0.26.5 → 0.26.8

data/db/migrate/20181003074440_fix_user_groups_ids_in_proposals_endorsements.rb

@@ -5,13 +5,20 @@ class FixUserGroupsIdsInProposalsEndorsements < ActiveRecord::Migration[5.2]
     self.table_name = :decidim_proposals_proposal_endorsements
   end
 
+  class UserGroup < ApplicationRecord
+    self.table_name = :decidim_users
+    self.inheritance_column = nil # disable the default inheritance
+
+    default_scope { where(type: "Decidim::UserGroup") }
+  end
+
   # rubocop:disable Rails/SkipsModelValidations
   def change
-    Decidim::UserGroup.find_each do |group|
+    UserGroup.find_each do |group|
       old_id = group.extended_data["old_user_group_id"]
       next unless old_id
 
-      Decidim::Proposals::ProposalEndorsement
+      ProposalEndorsement
         .where(decidim_user_group_id: old_id)
         .update_all(decidim_user_group_id: group.id)
     end

data/db/migrate/20200708091228_move_proposals_fields_to_i18n.rb

@@ -1,15 +1,38 @@
 # frozen_string_literal: true
 
 class MoveProposalsFieldsToI18n < ActiveRecord::Migration[5.2]
+  class Proposal < ApplicationRecord
+    include Decidim::HasComponent
+
+    self.table_name = :decidim_proposals_proposals
+  end
+
+  class Coauthorship < ApplicationRecord
+    self.table_name = :decidim_coauthorships
+  end
+
+  class UserBaseEntity < ApplicationRecord
+    self.table_name = :decidim_users
+    self.inheritance_column = nil # disable the default inheritance
+  end
+
+  class Organization < ApplicationRecord
+    self.table_name = :decidim_organizations
+  end
+
   def up
     add_column :decidim_proposals_proposals, :new_title, :jsonb
     add_column :decidim_proposals_proposals, :new_body, :jsonb
 
-    reset_column_information
-
     PaperTrail.request(enabled: false) do
-      Decidim::Proposals::Proposal.find_each do |proposal|
-        author = proposal.coauthorships.first.author
+      Proposal.find_each do |proposal|
+        coauthorship = Coauthorship.order(:id).find_by(coauthorable_type: "Decidim::Proposals::Proposal", coauthorable_id: proposal.id)
+        author =
+          if coauthorship.decidim_author_type == "Decidim::Organization"
+            Organization.find_by(id: coauthorship.decidim_author_id)
+          else
+            UserBaseEntity.find_by(id: coauthorship.decidim_author_id)
+          end
 
         locale = if author
                    author.try(:locale).presence || author.try(:default_locale).presence || author.try(:organization).try(:default_locale).presence
@@ -38,17 +61,13 @@ class MoveProposalsFieldsToI18n < ActiveRecord::Migration[5.2]
     rename_column :decidim_proposals_proposals, :new_body, :body
 
     create_indexs
-
-    reset_column_information
   end
 
   def down
     add_column :decidim_proposals_proposals, :new_title, :string
     add_column :decidim_proposals_proposals, :new_body, :string
 
-    reset_column_information
-
-    Decidim::Proposals::Proposal.find_each do |proposal|
+    Proposal.find_each do |proposal|
       proposal.new_title = proposal.title.values.first
       proposal.new_body = proposal.body.values.first
 
@@ -63,15 +82,6 @@ class MoveProposalsFieldsToI18n < ActiveRecord::Migration[5.2]
     rename_column :decidim_proposals_proposals, :new_body, :body
 
     create_indexs
-
-    reset_column_information
-  end
-
-  def reset_column_information
-    Decidim::User.reset_column_information
-    Decidim::Coauthorship.reset_column_information
-    Decidim::Proposals::Proposal.reset_column_information
-    Decidim::Organization.reset_column_information
   end
 
   def remove_indexs

data/db/migrate/20201002085508_fix_proposals_data.rb

@@ -1,14 +1,35 @@
 # frozen_string_literal: true
 
 class FixProposalsData < ActiveRecord::Migration[5.2]
-  def up
-    reset_column_information
+  class Proposal < ApplicationRecord
+    self.table_name = :decidim_proposals_proposals
+  end
+
+  class Coauthorship < ApplicationRecord
+    self.table_name = :decidim_coauthorships
+  end
+
+  class UserBaseEntity < ApplicationRecord
+    self.table_name = :decidim_users
+    self.inheritance_column = nil # disable the default inheritance
+  end
 
+  class Organization < ApplicationRecord
+    self.table_name = :decidim_organizations
+  end
+
+  def up
     PaperTrail.request(enabled: false) do
-      Decidim::Proposals::Proposal.find_each do |proposal|
+      Proposal.find_each do |proposal|
         next if proposal.title.is_a?(Hash) && proposal.body.is_a?(Hash)
 
-        author = proposal.coauthorships.first.author
+        coauthorship = Coauthorship.order(:id).find_by(coauthorable_type: "Decidim::Proposals::Proposal", coauthorable_id: proposal.id)
+        author =
+          if coauthorship.decidim_author_type == "Decidim::Organization"
+            Organization.find_by(id: coauthorship.decidim_author_id)
+          else
+            UserBaseEntity.find_by(id: coauthorship.decidim_author_id)
+          end
 
         locale = author.try(:locale).presence || author.try(:default_locale).presence || author.try(:organization).try(:default_locale).presence
 
@@ -21,16 +42,7 @@ class FixProposalsData < ActiveRecord::Migration[5.2]
         # rubocop:enable Rails/SkipsModelValidations
       end
     end
-
-    reset_column_information
   end
 
   def down; end
-
-  def reset_column_information
-    Decidim::User.reset_column_information
-    Decidim::Coauthorship.reset_column_information
-    Decidim::Proposals::Proposal.reset_column_information
-    Decidim::Organization.reset_column_information
-  end
 end

data/lib/decidim/proposals/component.rb

@@ -28,19 +28,19 @@ Decidim.register_component(:proposals) do |component|
   component.settings(:global) do |settings|
     settings.attribute :scopes_enabled, type: :boolean, default: false
     settings.attribute :scope_id, type: :scope
-    settings.attribute :vote_limit, type: :integer, default: 0
-    settings.attribute :minimum_votes_per_user, type: :integer, default: 0
-    settings.attribute :proposal_limit, type: :integer, default: 0
+    settings.attribute :vote_limit, type: :integer, default: 0, required: true
+    settings.attribute :minimum_votes_per_user, type: :integer, default: 0, required: true
+    settings.attribute :proposal_limit, type: :integer, default: 0, required: true
     settings.attribute :proposal_length, type: :integer, default: 500
     settings.attribute :proposal_edit_time, type: :enum, default: "limited", choices: -> { %w(limited infinite) }
-    settings.attribute :proposal_edit_before_minutes, type: :integer, default: 5
-    settings.attribute :threshold_per_proposal, type: :integer, default: 0
+    settings.attribute :proposal_edit_before_minutes, type: :integer, default: 5, required: true
+    settings.attribute :threshold_per_proposal, type: :integer, default: 0, required: true
     settings.attribute :can_accumulate_supports_beyond_threshold, type: :boolean, default: false
     settings.attribute :proposal_answering_enabled, type: :boolean, default: true
     settings.attribute :default_sort_order, type: :select, default: "default", choices: -> { POSSIBLE_SORT_ORDERS }
     settings.attribute :official_proposals_enabled, type: :boolean, default: true
     settings.attribute :comments_enabled, type: :boolean, default: true
-    settings.attribute :comments_max_length, type: :integer, required: false
+    settings.attribute :comments_max_length, type: :integer, required: true
     settings.attribute :geocoding_enabled, type: :boolean, default: false
     settings.attribute :attachments_allowed, type: :boolean, default: false
     settings.attribute :resources_permissions_enabled, type: :boolean, default: true
@@ -131,6 +131,7 @@ Decidim.register_component(:proposals) do |component|
 
       collection = Decidim::Proposals::Proposal
                    .published
+                   .not_hidden
                    .where(component: component_instance)
                    .includes(:scope, :category, :component)
 

data/lib/decidim/proposals/engine.rb

@@ -90,6 +90,12 @@ module Decidim
         Cell::ViewModel.view_paths << File.expand_path("#{Decidim::Proposals::Engine.root}/app/views") # for proposal partials
       end
 
+      initializer "decidim_proposals.remove_space_admins" do
+        ActiveSupport::Notifications.subscribe("decidim.system.participatory_space.admin.destroyed") do |_event_name, klass, id|
+          Decidim::Proposals::ValuationAssignment.where(valuator_role_type: klass, valuator_role_id: id).destroy_all
+        end
+      end
+
       initializer "decidim_proposals.add_badges" do
         Decidim::Gamification.register_badge(:proposals) do |badge|
           badge.levels = [1, 5, 10, 30, 60]

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

@@ -32,34 +32,41 @@ module Decidim
             resource,
             current_user
           ) do
-            resource.save!
+            resource.try(:save!)
           end
-          notify(resource)
+
+          notify
         end
 
         private
 
+        attr_reader :initial_state
+
         def resource
-          @resource ||= begin
-            proposal = Decidim::Proposals::Proposal.find_by(id: id)
-            return nil unless proposal
-            return nil if proposal.emendation?
-
-            if proposal.component != component
-              proposal.errors.add(:component, :invalid)
-              return proposal
-            end
-
-            proposal.answer = answer
-            proposal.answered_at = Time.current
-            if POSSIBLE_ANSWER_STATES.include?(state)
-              proposal.state = state
-              proposal.state_published_at = Time.current if component.current_settings.publish_answers_immediately?
-            else
-              proposal.errors.add(:state, :invalid)
-            end
-            proposal
+          @resource ||= fetch_resource
+        end
+
+        def fetch_resource
+          proposal = Decidim::Proposals::Proposal.find_by(id: id)
+          return nil unless proposal
+          return nil if proposal.emendation?
+
+          if proposal.component != component
+            proposal.errors.add(:component, :invalid)
+            return proposal
+          end
+
+          proposal.answer = answer
+          proposal.answered_at = Time.current
+          @initial_state = proposal.state
+
+          if POSSIBLE_ANSWER_STATES.include?(state)
+            proposal.state = state
+            proposal.state_published_at = Time.current if component.current_settings.publish_answers_immediately?
+          else
+            proposal.errors.add(:state, :invalid)
           end
+          proposal
         end
 
         def id
@@ -86,8 +93,9 @@ module Decidim
           context[:current_user]
         end
 
-        def notify(proposal)
-          ::Decidim::Proposals::Admin::NotifyProposalAnswer.call(proposal, proposal.state)
+        def notify
+          state = initial_state || resource.try(:state)
+          ::Decidim::Proposals::Admin::NotifyProposalAnswer.call(resource, state)
         end
       end
     end

data/lib/decidim/proposals/proposal_serializer.rb

@@ -8,6 +8,7 @@ module Decidim
       include Decidim::ApplicationHelper
       include Decidim::ResourceHelper
       include Decidim::TranslationsHelper
+      include HtmlToPlainText
 
       # Public: Initializes the serializer with a proposal.
       def initialize(proposal)
@@ -32,7 +33,7 @@ module Decidim
           },
           component: { id: component.id },
           title: proposal.title,
-          body: proposal.body,
+          body: convert_to_plain_text(proposal.body),
           address: proposal.address,
           latitude: proposal.latitude,
           longitude: proposal.longitude,
@@ -93,6 +94,13 @@ module Decidim
 
         Decidim::ResourceLocatorPresenter.new(proposal.amendable).url
       end
+
+      # Recursively strips HTML tags from given Hash strings using convert_to_text from Premailer
+      def convert_to_plain_text(value)
+        return value.transform_values { |v| convert_to_plain_text(v) } if value.is_a?(Hash)
+
+        convert_to_text(value)
+      end
     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.26.5"
+      "0.26.8"
     end
   end
 end

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

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+namespace :decidim do
+  namespace :proposals do
+    namespace :upgrade do
+      desc "Removes all proposal valuator records of which the role assignment does not exists"
+      task remove_valuator_orphan_records: :environment do
+        if Decidim.module_installed?("participatory_processes")
+          Decidim::Proposals::ValuationAssignment
+            .where(valuator_role_type: "Decidim::ParticipatoryProcessUserRole")
+            .where
+            .not(valuator_role_id: Decidim::ParticipatoryProcessUserRole.pluck(:id))
+            .destroy_all
+        end
+
+        if Decidim.module_installed?("assemblies")
+          Decidim::Proposals::ValuationAssignment
+            .where(valuator_role_type: "Decidim::AssemblyUserRole")
+            .where
+            .not(valuator_role_id: Decidim::AssemblyUserRole.pluck(:id))
+            .destroy_all
+        end
+
+        if Decidim.module_installed?("conferences")
+          Decidim::Proposals::ValuationAssignment
+            .where(valuator_role_type: "Decidim::ConferenceUserRole")
+            .where
+            .not(valuator_role_id: Decidim::ConferenceUserRole.pluck(:id))
+            .destroy_all
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-proposals
 version: !ruby/object:Gem::Version
-  version: 0.26.5
+  version: 0.26.8
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-02-13 00:00:00.000000000 Z
+date: 2023-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: decidim-comments
@@ -18,28 +18,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.5
+        version: 0.26.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.5
+        version: 0.26.8
 - !ruby/object:Gem::Dependency
   name: decidim-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.5
+        version: 0.26.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.5
+        version: 0.26.8
 - !ruby/object:Gem::Dependency
   name: doc2text
   requirement: !ruby/object:Gem::Requirement
@@ -80,84 +80,98 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.5
+        version: 0.26.8
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.5
+        version: 0.26.8
 - !ruby/object:Gem::Dependency
   name: decidim-assemblies
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.5
+        version: 0.26.8
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.5
+        version: 0.26.8
 - !ruby/object:Gem::Dependency
   name: decidim-budgets
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.5
+        version: 0.26.8
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.5
+        version: 0.26.8
+- !ruby/object:Gem::Dependency
+  name: decidim-conference
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.26.8
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.26.8
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.5
+        version: 0.26.8
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.5
+        version: 0.26.8
 - !ruby/object:Gem::Dependency
   name: decidim-meetings
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.5
+        version: 0.26.8
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.5
+        version: 0.26.8
 - !ruby/object:Gem::Dependency
   name: decidim-participatory_processes
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.5
+        version: 0.26.8
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.5
+        version: 0.26.8
 description: A proposals component for decidim's participatory spaces.
 email:
 - josepjaume@gmail.com
@@ -447,6 +461,7 @@ files:
 - app/views/decidim/proposals/versions/show.html.erb
 - config/assets.rb
 - config/brakeman.ignore
+- config/environment.rb
 - config/locales/am-ET.yml
 - config/locales/ar-SA.yml
 - config/locales/ar.yml
@@ -469,6 +484,7 @@ files:
 - config/locales/et-EE.yml
 - config/locales/et.yml
 - config/locales/eu.yml
+- config/locales/fa-IR.yml
 - config/locales/fi-pl.yml
 - config/locales/fi-plain.yml
 - config/locales/fi.yml
@@ -487,6 +503,7 @@ files:
 - config/locales/it.yml
 - config/locales/ja.yml
 - config/locales/ka-GE.yml
+- config/locales/kaa.yml
 - config/locales/ko-KR.yml
 - config/locales/ko.yml
 - config/locales/lb-LU.yml
@@ -605,6 +622,7 @@ files:
 - lib/decidim/proposals/test/factories.rb
 - lib/decidim/proposals/valuatable.rb
 - lib/decidim/proposals/version.rb
+- lib/tasks/proposals/upgrade/decdim_proposal_upgrade_tasks.rake
 homepage: https://github.com/decidim/decidim
 licenses:
 - AGPL-3.0