decidim-debates 0.22.0 → 0.23.0

data/config/locales/zh-TW.yml

@@ -0,0 +1 @@
+zh-TW:

data/db/migrate/20200703134657_close_debates.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+class CloseDebates < ActiveRecord::Migration[5.2]
+  def change
+    add_column :decidim_debates_debates, :closed_at, :datetime
+    add_column :decidim_debates_debates, :conclusions, :jsonb
+    add_index :decidim_debates_debates, :closed_at
+  end
+end

data/db/migrate/20200708072042_fix_debates_i18n_fields.rb

@@ -0,0 +1,48 @@
+# frozen_string_literal: true
+
+class FixDebatesI18nFields < ActiveRecord::Migration[5.2]
+  class User < ApplicationRecord
+    self.table_name = :decidim_users
+  end
+
+  class Debate < ApplicationRecord
+    self.table_name = :decidim_debates_debates
+  end
+
+  class Organization < ApplicationRecord
+    self.table_name = :decidim_organizations
+  end
+
+  def change
+    reset_column_information
+
+    debates.find_each do |debate|
+      locale, org_id = User.where(id: debate.decidim_author_id).pluck(:locale, :decidim_organization_id).first
+      locale = locale.presence || Organization.find(org_id).default_locale
+      locale = locale.to_s
+
+      debate.title = {
+        locale => debate.title[locale]
+      }
+      debate.description = {
+        locale => debate.description[locale]
+      }
+
+      debate.save!(validate: false)
+    end
+
+    reset_column_information
+  end
+
+  def debates
+    Debate
+      .where.not(decidim_author_type: "Decidim::Organization")
+      .select(:id, :decidim_author_id, :title, :description)
+  end
+
+  def reset_column_information
+    User.reset_column_information
+    Debate.reset_column_information
+    Organization.reset_column_information
+  end
+end

data/db/migrate/20200716143929_add_endorsable_to_debates.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+class AddEndorsableToDebates < ActiveRecord::Migration[5.2]
+  def change
+    add_column :decidim_debates_debates, :endorsements_count, :integer, null: false, default: 0
+    add_index :decidim_debates_debates, :endorsements_count, name: "idx_decidim_debates_debates_on_endorsemnts_count"
+  end
+end

data/db/migrate/20200827154116_add_commentable_counter_cache_to_debates.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+class AddCommentableCounterCacheToDebates < ActiveRecord::Migration[5.2]
+  def change
+    add_column :decidim_debates_debates, :comments_count, :integer, null: false, default: 0, index: true
+    Decidim::Debates::Debate.reset_column_information
+
+    # rubocop:disable Rails/SkipsModelValidations
+    Decidim::Debates::Debate.includes(:comments).find_each do |debate|
+      debate.update_columns(comments_count: debate.comments.not_hidden.count)
+    end
+    # rubocop:enable Rails/SkipsModelValidations
+  end
+end

data/db/migrate/20200902133452_add_cached_comment_metadata_to_debates.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+class AddCachedCommentMetadataToDebates < ActiveRecord::Migration[5.2]
+  def change
+    add_column :decidim_debates_debates, :last_comment_at, :datetime
+    add_column :decidim_debates_debates, :last_comment_by_id, :integer
+    add_column :decidim_debates_debates, :last_comment_by_type, :string
+
+    # rubocop:disable Rails/SkipsModelValidations
+    Decidim::Debates::Debate.reset_column_information
+    Decidim::Debates::Debate.includes(comments: [:author, :user_group]).find_each do |debate|
+      last_comment = debate.comments.order("created_at DESC").first
+      next unless last_comment
+
+      debate.update_columns(
+        last_comment_at: last_comment.created_at,
+        last_comment_by_id: last_comment.decidim_author_id,
+        last_comment_by_type: last_comment.decidim_author_type
+      )
+    end
+    # rubocop:enable Rails/SkipsModelValidations
+  end
+end

data/lib/decidim/debates/admin_engine.rb

@@ -12,7 +12,9 @@ module Decidim
       paths["lib/tasks"] = nil
 
       routes do
-        resources :debates
+        resources :debates do
+          resources :debate_closes, only: [:edit, :update]
+        end
         root to: "debates#index"
       end
 

data/lib/decidim/debates/component.rb

@@ -18,11 +18,16 @@ Decidim.register_component(:debates) do |component|
   end
 
   component.settings(:global) do |settings|
+    settings.attribute :scopes_enabled, type: :boolean, default: false
+    settings.attribute :scope_id, type: :scope
     settings.attribute :comments_enabled, type: :boolean, default: true
+    settings.attribute :comments_max_length, type: :integer, required: false
     settings.attribute :announcement, type: :text, translated: true, editor: true
   end
 
   component.settings(:step) do |settings|
+    settings.attribute :endorsements_enabled, type: :boolean, default: true
+    settings.attribute :endorsements_blocked, type: :boolean
     settings.attribute :creation_enabled, type: :boolean, default: false
     settings.attribute :comments_blocked, type: :boolean, default: false
     settings.attribute :announcement, type: :text, translated: true, editor: true
@@ -37,13 +42,19 @@ Decidim.register_component(:debates) do |component|
     Decidim::Follow.where(decidim_followable_type: "Decidim::Debates::Debate", decidim_followable_id: debates_ids).count
   end
 
+  component.register_stat :endorsements_count, priority: Decidim::StatsRegistry::MEDIUM_PRIORITY do |components, _start_at, _end_at|
+    debates_ids = Decidim::Debates::Debate.where(component: components).not_hidden.pluck(:id)
+    Decidim::Endorsement.where(resource_id: debates_ids, resource_type: Decidim::Debates::Debate.name).count
+  end
+
   component.register_resource(:debate) do |resource|
     resource.model_class_name = "Decidim::Debates::Debate"
     resource.card = "decidim/debates/debate"
     resource.searchable = true
+    resource.actions = %w(create endorse)
   end
 
-  component.actions = %w(create)
+  component.actions = %w(create endorse)
 
   component.seeds do |participatory_space|
     admin_user = Decidim::User.find_by(
@@ -51,6 +62,11 @@ Decidim.register_component(:debates) do |component|
       email: "admin@example.org"
     )
 
+    user = Decidim::User.find_by(
+      organization: participatory_space.organization,
+      email: "user@example.org"
+    )
+
     params = {
       name: Decidim::Components::Namer.new(participatory_space.organization.available_locales, :debates).i18n_name,
       manifest_name: :debates,
@@ -92,5 +108,32 @@ Decidim.register_component(:debates) do |component|
 
       Decidim::Comments::Seed.comments_for(debate)
     end
+
+    closed_debate = Decidim::Debates::Debate.last
+    closed_debate.conclusions = Decidim::Faker::Localized.wrapped("<p>", "</p>") do
+      Decidim::Faker::Localized.paragraph(3)
+    end
+    closed_debate.closed_at = Time.current
+    closed_debate.save!
+
+    params = {
+      component: component,
+      category: participatory_space.categories.sample,
+      title: Decidim::Faker::Localized.sentence(2),
+      description: Decidim::Faker::Localized.wrapped("<p>", "</p>") do
+        Decidim::Faker::Localized.paragraph(3)
+      end,
+      instructions: Decidim::Faker::Localized.wrapped("<p>", "</p>") do
+        Decidim::Faker::Localized.paragraph(3)
+      end,
+      author: user
+    }
+
+    Decidim.traceability.create!(
+      Decidim::Debates::Debate,
+      user,
+      params,
+      visibility: "all"
+    )
   end
 end

data/lib/decidim/debates/engine.rb

@@ -12,7 +12,13 @@ module Decidim
       isolate_namespace Decidim::Debates
 
       routes do
-        resources :debates, only: [:index, :show, :new, :create]
+        resources :debates, except: [:destroy] do
+          member do
+            post :close
+          end
+          resources :versions, only: [:show, :index]
+          resource :widget, only: :show, path: "embed"
+        end
         root to: "debates#index"
       end
 

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

@@ -10,8 +10,6 @@ FactoryBot.define do
     description { Decidim::Faker::Localized.wrapped("<p>", "</p>") { generate_localized_debate_title } }
     information_updates { Decidim::Faker::Localized.wrapped("<p>", "</p>") { generate_localized_debate_title } }
     instructions { Decidim::Faker::Localized.wrapped("<p>", "</p>") { generate_localized_debate_title } }
-    start_time { 1.day.from_now }
-    end_time { start_time.advance(hours: 2) }
     component { build(:component, manifest_name: "debates") }
     author { component.try(:organization) }
 
@@ -20,20 +18,37 @@ FactoryBot.define do
       end_time { 1.day.from_now }
     end
 
-    trait :with_author do
+    trait :citizen_author do
+      start_time { nil }
+      end_time { nil }
       author do
         build(:user, organization: component.organization) if component
       end
     end
 
-    trait :with_user_group_author do
+    trait :official do
+      author { component.try(:organization) }
+    end
+
+    trait :user_group_author do
       author do
-        build(:user, organization: component.organization) if component
+        create(:user, organization: component.organization) if component
       end
+
       user_group do
-        build(:user_group, :verified, organization: component.organization, users: [author]) if component
+        create(:user_group, :verified, organization: component.organization, users: [author]) if component
       end
     end
+
+    trait :closed do
+      closed_at { Time.current }
+      conclusions { Decidim::Faker::Localized.wrapped("<p>", "</p>") { generate_localized_debate_title } }
+    end
+
+    after(:build) do |debate|
+      debate.title = Decidim::ContentProcessor.parse_with_processor(:hashtag, debate.title, current_organization: debate.organization).rewrite
+      debate.description = Decidim::ContentProcessor.parse_with_processor(:hashtag, debate.description, current_organization: debate.organization).rewrite
+    end
   end
 
   factory :debates_component, parent: :component do
@@ -46,6 +61,16 @@ FactoryBot.define do
       }
     end
 
+    trait :with_comments_blocked do
+      step_settings do
+        {
+          participatory_space.active_step.id => {
+            comments_blocked: true
+          }
+        }
+      end
+    end
+
     trait :with_creation_enabled do
       step_settings do
         {
@@ -53,5 +78,36 @@ FactoryBot.define do
         }
       end
     end
+
+    trait :with_votes_enabled do
+      # Needed for endorsements tests
+    end
+
+    trait :with_endorsements_blocked do
+      step_settings do
+        {
+          participatory_space.active_step.id => {
+            endorsements_enabled: true,
+            endorsements_blocked: true
+          }
+        }
+      end
+    end
+
+    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
   end
 end

data/lib/decidim/debates/version.rb

@@ -4,7 +4,7 @@ module Decidim
   # This holds the decidim-debates version.
   module Debates
     def self.version
-      "0.22.0"
+      "0.23.0"
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-debates
 version: !ruby/object:Gem::Version
-  version: 0.22.0
+  version: 0.23.0
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-09-01 00:00:00.000000000 Z
+date: 2020-11-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: decidim-comments
@@ -19,28 +19,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.22.0
+        version: 0.23.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.22.0
+        version: 0.23.0
 - !ruby/object:Gem::Dependency
   name: decidim-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.22.0
+        version: 0.23.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.22.0
+        version: 0.23.0
 - !ruby/object:Gem::Dependency
   name: kaminari
   requirement: !ruby/object:Gem::Requirement
@@ -81,28 +81,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.22.0
+        version: 0.23.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.22.0
+        version: 0.23.0
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.22.0
+        version: 0.23.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.22.0
+        version: 0.23.0
 description: A debates component for decidim's participatory spaces.
 email:
 - josepjaume@gmail.com
@@ -126,18 +126,29 @@ files:
 - app/cells/decidim/debates/debate_m/single_date.erb
 - app/cells/decidim/debates/debate_m/tags.erb
 - app/cells/decidim/debates/debate_m_cell.rb
+- app/commands/decidim/debates/admin/close_debate.rb
 - app/commands/decidim/debates/admin/create_debate.rb
 - app/commands/decidim/debates/admin/update_debate.rb
+- app/commands/decidim/debates/close_debate.rb
 - app/commands/decidim/debates/create_debate.rb
+- app/commands/decidim/debates/update_debate.rb
 - app/controllers/decidim/debates/admin/application_controller.rb
+- app/controllers/decidim/debates/admin/debate_closes_controller.rb
 - app/controllers/decidim/debates/admin/debates_controller.rb
 - app/controllers/decidim/debates/application_controller.rb
 - app/controllers/decidim/debates/debates_controller.rb
+- app/controllers/decidim/debates/orderable.rb
+- app/controllers/decidim/debates/versions_controller.rb
+- app/controllers/decidim/debates/widgets_controller.rb
+- app/events/decidim/debates/close_debate_event.rb
 - app/events/decidim/debates/create_debate_event.rb
 - app/events/decidim/debates/creation_disabled_event.rb
 - app/events/decidim/debates/creation_enabled_event.rb
+- app/forms/decidim/debates/admin/close_debate_form.rb
 - app/forms/decidim/debates/admin/debate_form.rb
+- app/forms/decidim/debates/close_debate_form.rb
 - app/forms/decidim/debates/debate_form.rb
+- app/helpers/decidim/debates/admin/application_helper.rb
 - app/helpers/decidim/debates/application_helper.rb
 - app/helpers/decidim/debates/debate_cells_helper.rb
 - app/jobs/decidim/debates/settings_change_job.rb
@@ -146,44 +157,58 @@ files:
 - app/permissions/decidim/debates/admin/permissions.rb
 - app/permissions/decidim/debates/permissions.rb
 - app/presenters/decidim/debates/admin_log/debate_presenter.rb
+- app/presenters/decidim/debates/admin_log/value_types/debate_title_description_presenter.rb
 - app/presenters/decidim/debates/debate_presenter.rb
+- app/presenters/decidim/debates/log/resource_presenter.rb
 - app/presenters/decidim/debates/official_author_presenter.rb
 - app/queries/decidim/debates/metrics/debate_followers_metric_measure.rb
 - app/queries/decidim/debates/metrics/debate_participants_metric_measure.rb
 - app/queries/decidim/debates/metrics/debates_metric_manage.rb
 - app/serializers/decidim/debates/data_portability_debate_serializer.rb
 - app/services/decidim/debates/debate_search.rb
+- app/services/decidim/debates/diff_renderer.rb
 - app/types/decidim/debates/debate_type.rb
 - app/types/decidim/debates/debates_type.rb
+- app/views/decidim/debates/admin/debate_closes/edit.html.erb
 - app/views/decidim/debates/admin/debates/_form.html.erb
 - app/views/decidim/debates/admin/debates/edit.html.erb
 - app/views/decidim/debates/admin/debates/index.html.erb
 - app/views/decidim/debates/admin/debates/new.html.erb
+- app/views/decidim/debates/debates/_close_debate_modal.html.erb
 - app/views/decidim/debates/debates/_count.html.erb
 - app/views/decidim/debates/debates/_debate.html.erb
 - app/views/decidim/debates/debates/_debates.html.erb
 - app/views/decidim/debates/debates/_filters.html.erb
 - app/views/decidim/debates/debates/_filters_small_view.html.erb
+- app/views/decidim/debates/debates/_form.html.erb
+- app/views/decidim/debates/debates/edit.html.erb
 - app/views/decidim/debates/debates/index.html.erb
 - app/views/decidim/debates/debates/index.js.erb
 - app/views/decidim/debates/debates/new.html.erb
 - app/views/decidim/debates/debates/show.html.erb
+- app/views/decidim/debates/versions/index.html.erb
+- app/views/decidim/debates/versions/show.html.erb
+- config/locales/am-ET.yml
 - config/locales/ar-SA.yml
 - config/locales/ar.yml
 - config/locales/bg-BG.yml
+- config/locales/bg.yml
 - config/locales/ca.yml
 - config/locales/cs-CZ.yml
 - config/locales/cs.yml
 - config/locales/da-DK.yml
+- config/locales/da.yml
 - config/locales/de.yml
 - config/locales/el-GR.yml
 - config/locales/el.yml
 - config/locales/en.yml
 - config/locales/eo-UY.yml
+- config/locales/eo.yml
 - config/locales/es-MX.yml
 - config/locales/es-PY.yml
 - config/locales/es.yml
 - config/locales/et-EE.yml
+- config/locales/et.yml
 - config/locales/eu.yml
 - config/locales/fi-pl.yml
 - config/locales/fi-plain.yml
@@ -193,16 +218,24 @@ files:
 - config/locales/ga-IE.yml
 - config/locales/gl.yml
 - config/locales/hr-HR.yml
+- config/locales/hr.yml
 - config/locales/hu.yml
 - config/locales/id-ID.yml
 - config/locales/is-IS.yml
+- config/locales/is.yml
 - config/locales/it.yml
 - config/locales/ja-JP.yml
+- config/locales/ja.yml
+- config/locales/ko-KR.yml
+- config/locales/ko.yml
 - config/locales/lt-LT.yml
-- config/locales/lv-LV.yml
+- config/locales/lt.yml
+- config/locales/lv.yml
 - config/locales/mt-MT.yml
+- config/locales/mt.yml
 - config/locales/nl.yml
 - config/locales/no.yml
+- config/locales/om-ET.yml
 - config/locales/pl.yml
 - config/locales/pt-BR.yml
 - config/locales/pt.yml
@@ -211,10 +244,16 @@ files:
 - config/locales/sk-SK.yml
 - config/locales/sk.yml
 - config/locales/sl.yml
+- config/locales/so-SO.yml
 - config/locales/sr-CS.yml
 - config/locales/sv.yml
+- config/locales/ti-ER.yml
 - config/locales/tr-TR.yml
 - config/locales/uk.yml
+- config/locales/vi-VN.yml
+- config/locales/vi.yml
+- config/locales/zh-CN.yml
+- config/locales/zh-TW.yml
 - db/migrate/20170118141619_create_debates.rb
 - db/migrate/20180117100413_add_debate_information_updates.rb
 - db/migrate/20180118132243_add_author_to_debates.rb
@@ -225,6 +264,11 @@ files:
 - db/migrate/20181003081235_fix_user_groups_ids_on_debates.rb
 - db/migrate/20181016132850_add_organization_as_author_to_debates.rb
 - db/migrate/20200320105918_index_foreign_keys_in_decidim_debates_debates.rb
+- db/migrate/20200703134657_close_debates.rb
+- db/migrate/20200708072042_fix_debates_i18n_fields.rb
+- db/migrate/20200716143929_add_endorsable_to_debates.rb
+- db/migrate/20200827154116_add_commentable_counter_cache_to_debates.rb
+- db/migrate/20200902133452_add_cached_comment_metadata_to_debates.rb
 - lib/decidim/debates.rb
 - lib/decidim/debates/admin.rb
 - lib/decidim/debates/admin_engine.rb
@@ -244,14 +288,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.5'
+      version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Decidim debates module