decidim-debates 0.29.1 → 0.30.0.rc1

data/config/locales/tr-TR.yml

@@ -3,10 +3,8 @@ tr:
   activemodel:
     attributes:
       debate:
-        category_id: Kategori
         closed_at: Kapandı
         conclusions: Sonuçlar
-        decidim_category_id: Kategori
         description: Açıklama
         end_time: Biter
         information_updates: Bilgi güncellemeleri
@@ -27,7 +25,6 @@ tr:
     components:
       debates:
         actions:
-          create: yaratmak
           endorse: Onayla
         name: Tartışmalar
         settings:
@@ -35,8 +32,6 @@ tr:
             announcement: duyuru
             comments_enabled: Yorumlar etkin
             comments_max_length: Maksimum yorum uzunluğu (Varsayılan değer için 0 bırakın)
-            scope_id: Kapsam
-            scopes_enabled: Kapsamlar etkinleştirildi
           step:
             announcement: duyuru
             comments_blocked: Yorumlar engellendi
@@ -45,8 +40,6 @@ tr:
     debates:
       actions:
         close: Kapat
-        confirm_destroy: Emin misiniz?
-        destroy: Sil
         edit: Düzenle
         new: Yeni Tartışma
         title: Eylemler
@@ -59,8 +52,6 @@ tr:
           create:
             invalid: Tartışmayı oluştururken bir sorun oluştu.
             success: Tartışma başarıyla oluşturuldu.
-          destroy:
-            success: Tartışma başarıyla silindi.
           edit:
             title: Tartışmayı düzenle
             update: Tartışmayı güncelle
@@ -76,8 +67,6 @@ tr:
           update:
             invalid: Bu tartışmayı güncellerken bir sorun oluştu.
             success: Tartışma başarıyla güncellendi.
-        exports:
-          comments: Yorumlar
       admin_log:
         debate:
           close: "%{user_name}, %{space_name} alanındaki %{resource_name} tartışmasını kapattı"
@@ -120,8 +109,6 @@ tr:
           state_values:
             closed: Kapalı
             open: Açık
-        form:
-          select_a_category: Lütfen bir kategori seçin
         index:
           new_debate: Yeni tartışma
         new:
@@ -135,11 +122,9 @@ tr:
           recent: En yeni
           updated: Yeni güncellenmiş
         show:
-          close_debate: Tartışmayı kapat
           debate_closed: Kapalı
           debate_conclusions_are: 'Tartışma bu sonuçlarla %{date} tarihinde kapatıldı:'
           edit_conclusions: Sonuçları düzenleyin
-          edit_debate: Tartışmayı düzenle
           groups_count: Gruplar
           open: Açık tartışma
           participants_count: Katılımcılar
@@ -194,7 +179,7 @@ tr:
       badges:
         commented_debates:
           conditions:
-            - Katılmak için açık bir tartışma seçin
+          - Katılmak için açık bir tartışma seçin
           description: Bu rozet, yorumlarınızı bırakarak farklı tartışmalara aktif olarak katıldığınızda verilir.
           description_another: Bu katılımcı %{score} kez tartışmada yer aldı.
           description_own: '%{score} kez tartışmaya katıldınız.'

data/config/locales/uk.yml

@@ -3,8 +3,6 @@ uk:
   activemodel:
     attributes:
       debate:
-        category_id: Категорія
-        decidim_category_id: Категорія
         description: Опис
         end_time: 'Закінчується:'
         information_updates: Оновлення відомостей
@@ -25,8 +23,6 @@ uk:
   decidim:
     components:
       debates:
-        actions:
-          create: Започаткувати
         name: Обговорення
         settings:
           global:
@@ -37,8 +33,6 @@ uk:
             comments_blocked: Коментарі вимкнено
     debates:
       actions:
-        confirm_destroy: Ви впевнені?
-        destroy: Видалити
         edit: Редагувати
         title: Дії
       admin:
@@ -46,8 +40,6 @@ uk:
           create:
             invalid: При спробі започаткувати обговорення сталася помилка.
             success: Обговорення успішно започатковано.
-          destroy:
-            success: Обговорення успішно видалено.
           edit:
             title: Редагувати обговорення
             update: Оновити обговорення
@@ -80,8 +72,6 @@ uk:
           official: Службове
           origin: Джерело
           search: Шукати
-        form:
-          select_a_category: Будь ласка, виберіть категорію
         index:
           new_debate: Додати обговорення
         new:

data/config/locales/zh-CN.yml

@@ -3,10 +3,8 @@ zh-CN:
   activemodel:
     attributes:
       debate:
-        category_id: 类别
         closed_at: 关闭于
         conclusions: 四. 结论
-        decidim_category_id: 类别
         description: 描述
         end_time: 结束于
         information_updates: 信息更新
@@ -26,7 +24,6 @@ zh-CN:
     components:
       debates:
         actions:
-          create: 创建
           endorse: 批准
         name: 辩论
         settings:
@@ -34,8 +31,6 @@ zh-CN:
             announcement: 通 知
             comments_enabled: 评论已启用
             comments_max_length: 评论最大长度 (默认值留0)
-            scope_id: 范围
-            scopes_enabled: 范围已启用
           step:
             announcement: 通 知
             comments_blocked: 评论已阻止
@@ -44,8 +39,6 @@ zh-CN:
     debates:
       actions:
         close: 关闭
-        confirm_destroy: 您确定吗？
-        destroy: 删除
         edit: 编辑
         title: 行动
       admin:
@@ -57,8 +50,6 @@ zh-CN:
           create:
             invalid: 有一个问题是如何建立辩论。
             success: 辩论成功创建。
-          destroy:
-            success: 辩论已成功删除。
           edit:
             title: 编辑辩论
             update: 更新辩论
@@ -121,11 +112,9 @@ zh-CN:
           recent: 最新的
           updated: 最近更新
         show:
-          close_debate: 结束辩论
           debate_closed: 已关闭
           debate_conclusions_are: '辩论在 %{date} 结束后得出以下结论：'
           edit_conclusions: 编辑结论
-          edit_debate: 编辑辩论
           groups_count: 群組
           participants_count: 参加者
         update:
@@ -172,7 +161,7 @@ zh-CN:
       badges:
         commented_debates:
           conditions:
-            - 选择要参与的公开辩论
+          - 选择要参与的公开辩论
           description: 当你通过留下评论积极参与不同的辩论时，这个徽章将被授予。
           description_another: 此参与者已经参加了 %{score} 场辩论。
           description_own: 您已经参加了 %{score} 次辩论。

data/config/locales/zh-TW.yml

@@ -3,15 +3,12 @@ zh-TW:
   activemodel:
     attributes:
       debate:
-        category_id: 類別
         closed_at: 關閉於
         conclusions: 結論
-        decidim_category_id: 類別
         description: 說明
         end_time: 結束於
         information_updates: 資訊更新
         instructions: 參加指南
-        scope_id: 範圍
         start_time: 開始於
         title: 標題
         user_group_id: 建立辯論為
@@ -29,7 +26,6 @@ zh-TW:
       debates:
         actions:
           comment: 留言
-          create: 建立
           endorse: 連署
         name: 辯論
         settings:
@@ -37,8 +33,6 @@ zh-TW:
             announcement: 公告
             comments_enabled: 啟用評論功能
             comments_max_length: 評論字數最大長度(若要使用預設值請輸入0)
-            scope_id: 範圍
-            scopes_enabled: 啟用範圍
           step:
             announcement: 公告
             comments_blocked: 留言已封鎖
@@ -48,8 +42,6 @@ zh-TW:
     debates:
       actions:
         close: 關閉
-        confirm_destroy: 您確定嗎？
-        destroy: 刪除
         edit: 編輯
         title: 操作
       admin:
@@ -61,8 +53,6 @@ zh-TW:
           create:
             invalid: 建立辯論時出現問題。
             success: 辯論建立成功。
-          destroy:
-            success: 辯論已成功刪除。
           edit:
             title: 編輯辯論
             update: 更新辯論
@@ -78,8 +68,6 @@ zh-TW:
           update:
             invalid: 更新此辯論時發生問題。
             success: 辯論已成功更新
-        exports:
-          comments: 評論
       admin_log:
         debate:
           close: "%{user_name} 在 %{space_name} 空間關閉了 %{resource_name} 辯論。"
@@ -119,8 +107,6 @@ zh-TW:
           state_values:
             closed: 關閉
             open: 開啟
-        form:
-          select_a_category: 請選擇一個類別
         index:
           new_debate: 新辯論
         new:
@@ -134,11 +120,9 @@ zh-TW:
           recent: 最近
           updated: 最近更新
         show:
-          close_debate: 關閉辯論
           debate_closed: 關閉
           debate_conclusions_are: '此辯論已於 %{date} 結束，以下是總結結論：'
           edit_conclusions: 修改結論
-          edit_debate: 編輯辯論
           groups_count: 群組
           open: 開放性辯論
           participants_count: 參與者
@@ -190,7 +174,7 @@ zh-TW:
       badges:
         commented_debates:
           conditions:
-            - 選擇一個開放辯論加入
+          - 選擇一個開放辯論加入
           description: 當你在不同辯論中發表評論時，會被授予此徽章。
           description_another: 此參與者已參與了 %{score} 個辯論。
           description_own: 您已經參與了 %{score} 場辯論

data/db/migrate/20200827154116_add_commentable_counter_cache_to_debates.rb

@@ -6,7 +6,7 @@ class AddCommentableCounterCacheToDebates < ActiveRecord::Migration[5.2]
     Decidim::Debates::Debate.reset_column_information
 
     # rubocop:disable Rails/SkipsModelValidations
-    Decidim::Debates::Debate.includes(:comments).find_each do |debate|
+    Decidim::Debates::Debate.unscoped.includes(:comments).find_each do |debate|
       debate.update_columns(comments_count: debate.comments.not_hidden.count)
     end
     # rubocop:enable Rails/SkipsModelValidations

data/db/migrate/20200902133452_add_cached_comment_metadata_to_debates.rb

@@ -8,7 +8,7 @@ class AddCachedCommentMetadataToDebates < ActiveRecord::Migration[5.2]
 
     # rubocop:disable Rails/SkipsModelValidations
     Decidim::Debates::Debate.reset_column_information
-    Decidim::Debates::Debate.includes(comments: [:author, :user_group]).find_each do |debate|
+    Decidim::Debates::Debate.unscoped.includes(comments: [:author, :user_group]).find_each do |debate|
       last_comment = debate.comments.order("created_at DESC").first
       next unless last_comment
 

data/db/migrate/20210310120652_add_followable_counter_cache_to_debates.rb

@@ -7,7 +7,7 @@ class AddFollowableCounterCacheToDebates < ActiveRecord::Migration[5.2]
     reversible do |dir|
       dir.up do
         Decidim::Debates::Debate.reset_column_information
-        Decidim::Debates::Debate.find_each do |record|
+        Decidim::Debates::Debate.unscoped.find_each do |record|
           record.class.reset_counters(record.id, :follows)
         end
       end

data/db/migrate/20240828103648_add_deleted_at_to_decidim_debates_debates.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+class AddDeletedAtToDecidimDebatesDebates < ActiveRecord::Migration[7.0]
+  def change
+    add_column :decidim_debates_debates, :deleted_at, :datetime
+    add_index :decidim_debates_debates, :deleted_at
+  end
+end

data/db/migrate/20241017153555_add_comments_layout_to_debates.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AddCommentsLayoutToDebates < ActiveRecord::Migration[7.0]
+  def change
+    add_column :decidim_debates_debates, :comments_layout, :string
+  end
+end

data/decidim-debates.gemspec

@@ -9,7 +9,7 @@ Gem::Specification.new do |s|
   s.version = Decidim::Debates.version
   s.authors = ["Josep Jaume Rey Peroy", "Marc Riera Casals", "Oriol Gual Oliva", "Genis Matutes Pujol"]
   s.email = ["josepjaume@gmail.com", "mrc2407@gmail.com", "oriolgual@gmail.com", "genis.matutes@gmail.com"]
-  s.license = "AGPL-3.0"
+  s.license = "AGPL-3.0-or-later"
   s.homepage = "https://decidim.org"
   s.metadata = {
     "bug_tracker_uri" => "https://github.com/decidim/decidim/issues",
@@ -18,7 +18,7 @@ Gem::Specification.new do |s|
     "homepage_uri" => "https://decidim.org",
     "source_code_uri" => "https://github.com/decidim/decidim"
   }
-  s.required_ruby_version = "~> 3.2.0"
+  s.required_ruby_version = "~> 3.3.0"
 
   s.name = "decidim-debates"
   s.summary = "Decidim debates module"
@@ -35,5 +35,6 @@ Gem::Specification.new do |s|
   s.add_dependency "decidim-core", Decidim::Debates.version
 
   s.add_development_dependency "decidim-admin", Decidim::Debates.version
+  s.add_development_dependency "decidim-assemblies", Decidim::Debates.version
   s.add_development_dependency "decidim-dev", Decidim::Debates.version
 end

data/lib/decidim/api/debate_type.rb

@@ -3,24 +3,28 @@
 module Decidim
   module Debates
     class DebateType < Decidim::Api::Types::BaseObject
-      implements Decidim::Core::CategorizableInterface
+      implements Decidim::Core::TaxonomizableInterface
       implements Decidim::Comments::CommentableInterface
       implements Decidim::Core::AuthorableInterface
-      implements Decidim::Core::ScopableInterface
+      implements Decidim::Core::TimestampsInterface
 
       description "A debate"
 
-      field :id, GraphQL::Types::ID, "The internal ID for this debate", null: false
-      field :title, Decidim::Core::TranslatedFieldType, "The title for this debate", null: true
       field :description, Decidim::Core::TranslatedFieldType, "The description for this debate", null: true
-      field :instructions, Decidim::Core::TranslatedFieldType, "The instructions for this debate", null: true
-      field :start_time, Decidim::Core::DateTimeType, "The start time for this debate", null: true
       field :end_time, Decidim::Core::DateTimeType, "The end time for this debate", null: true
+      field :id, GraphQL::Types::ID, "The internal ID for this debate", null: false
       field :image, GraphQL::Types::String, "The image of this debate", null: true
-      field :created_at, Decidim::Core::DateTimeType, "When this debate was created", null: true
-      field :updated_at, Decidim::Core::DateTimeType, "When this debate was updated", null: true
       field :information_updates, Decidim::Core::TranslatedFieldType, "The information updates for this debate", null: true
+      field :instructions, Decidim::Core::TranslatedFieldType, "The instructions for this debate", null: true
       field :reference, GraphQL::Types::String, "The reference for this debate", null: true
+      field :start_time, Decidim::Core::DateTimeType, "The start time for this debate", null: true
+      field :title, Decidim::Core::TranslatedFieldType, "The title for this debate", null: true
+
+      def self.authorized?(object, context)
+        context[:debate] = object
+
+        super && allowed_to?(:read, :debate, object, context)
+      end
     end
   end
 end

data/lib/decidim/api/debates_type.rb

@@ -2,22 +2,19 @@
 
 module Decidim
   module Debates
-    class DebatesType < Decidim::Api::Types::BaseObject
-      implements Decidim::Core::ComponentInterface
-
+    class DebatesType < Decidim::Core::ComponentType
       graphql_name "Debates"
       description "A debates component of a participatory space."
 
-      field :debates, Decidim::Debates::DebateType.connection_type, null: true, connection: true
+      field :debate, Decidim::Debates::DebateType, "A single Debate object", null: true do
+        argument :id, GraphQL::Types::ID, "The id of the Debate requested", required: true
+      end
+      field :debates, Decidim::Debates::DebateType.connection_type, "A collection of Debates", null: true, connection: true
 
       def debates
         Debate.where(component: object).includes(:component)
       end
 
-      field :debate, Decidim::Debates::DebateType, null: true do
-        argument :id, GraphQL::Types::ID, required: true
-      end
-
       def debate(**args)
         Debate.where(component: object).find_by(id: args[:id])
       end

data/lib/decidim/debates/admin_engine.rb

@@ -14,6 +14,13 @@ module Decidim
       routes do
         resources :debates do
           resources :debate_closes, only: [:edit, :update]
+
+          member do
+            patch :soft_delete
+            patch :restore
+          end
+
+          get :manage_trash, on: :collection
         end
         root to: "debates#index"
       end

data/lib/decidim/debates/component.rb

@@ -17,11 +17,11 @@ 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 :taxonomy_filters, type: :taxonomy_filters
     settings.attribute :comments_enabled, type: :boolean, default: true
     settings.attribute :comments_max_length, type: :integer, required: true
     settings.attribute :announcement, type: :text, translated: true, editor: true
+    settings.attribute :attachments_allowed, type: :boolean, default: false
   end
 
   component.settings(:step) do |settings|
@@ -56,13 +56,28 @@ Decidim.register_component(:debates) do |component|
 
   component.actions = %w(create endorse comment)
 
-  component.exports :comments do |exports|
+  component.exports :debates do |exports|
+    exports.collection do |component_instance|
+      Decidim::Debates::Debate
+        .not_hidden
+        .where(component: component_instance)
+        .includes(:taxonomies, component: { participatory_space: :organization })
+    end
+
+    exports.include_in_open_data = true
+
+    exports.serializer Decidim::Debates::DebateSerializer
+  end
+
+  component.exports :debate_comments do |exports|
     exports.collection do |component_instance|
       Decidim::Comments::Export.comments_for_resource(
         Decidim::Debates::Debate, component_instance
-      )
+      ).includes(:author, :user_group, root_commentable: { component: { participatory_space: :organization } })
     end
 
+    exports.include_in_open_data = true
+
     exports.serializer Decidim::Comments::CommentSerializer
   end
 

data/lib/decidim/debates/debate_serializer.rb

@@ -0,0 +1,83 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Debates
+    # This class serializes a Debate so can be exported to CSV, JSON or other
+    # formats.
+    class DebateSerializer < Decidim::Exporters::Serializer
+      include Decidim::ApplicationHelper
+      include Decidim::ResourceHelper
+
+      # Public: Exports a hash with the serialized data for this resource.
+      def serialize
+        {
+          id: resource.id,
+          author: {
+            **author_fields
+          },
+          title: resource.title,
+          description: resource.description,
+          instructions: resource.instructions,
+          start_time: resource.start_time,
+          end_time: resource.end_time,
+          information_updates: resource.information_updates,
+          taxonomies:,
+          participatory_space: {
+            id: resource.participatory_space.id,
+            url: Decidim::ResourceLocatorPresenter.new(resource.participatory_space).url
+          },
+          component: { id: component.id },
+          reference: resource.reference,
+          comments: resource.comments_count,
+          follows_count: resource.follows_count,
+          url: Decidim::ResourceLocatorPresenter.new(resource).url,
+          last_comment_at: resource.last_comment_at,
+          last_comment_by: {
+            **last_comment_by_fields
+          },
+          comments_enabled: resource.comments_enabled,
+          conclusions: resource.conclusions,
+          closed_at: resource.closed_at,
+          created_at: resource.created_at,
+          updated_at: resource.updated_at,
+          endorsements_count: resource.endorsements_count
+        }
+      end
+
+      private
+
+      def last_comment_by_fields
+        return {} unless resource.last_comment_by
+        return {} if resource.last_comment_by.respond_to?(:deleted?) && resource.last_comment_by.deleted?
+
+        {
+          id: resource.last_comment_by.id,
+          name: user_name(resource.last_comment_by),
+          url: user_url(resource.last_comment_by)
+        }
+      end
+
+      def author_fields
+        return {} if resource.author.respond_to?(:deleted?) && resource.author.deleted?
+
+        {
+          id: resource.author.id,
+          name: user_name(resource.author),
+          url: user_url(resource.author)
+        }
+      end
+
+      def user_name(author)
+        translated_attribute(author.name)
+      end
+
+      def user_url(author)
+        if author.respond_to?(:nickname)
+          profile_url(author) # is a Decidim::User or Decidim::UserGroup
+        else
+          root_url # is a Decidim::Organization
+        end
+      end
+    end
+  end
+end

data/lib/decidim/debates/seeds.rb

@@ -4,7 +4,7 @@ require "decidim/components/namer"
 
 module Decidim
   module Debates
-    class Seeds
+    class Seeds < Decidim::Seeds
       attr_reader :participatory_space
 
       def initialize(participatory_space:)
@@ -12,11 +12,6 @@ module Decidim
       end
 
       def call
-        admin_user = Decidim::User.find_by(
-          organization: participatory_space.organization,
-          email: "admin@example.org"
-        )
-
         user = Decidim::User.find_by(
           organization: participatory_space.organization,
           email: "user@example.org"
@@ -49,7 +44,6 @@ module Decidim
           end
           params = {
             component:,
-            category: participatory_space.categories.sample,
             title: Decidim::Faker::Localized.sentence(word_count: 2),
             description: Decidim::Faker::Localized.wrapped("<p>", "</p>") do
               Decidim::Faker::Localized.paragraph(sentence_count: 3)
@@ -81,7 +75,6 @@ module Decidim
 
         params = {
           component:,
-          category: participatory_space.categories.sample,
           title: Decidim::Faker::Localized.sentence(word_count: 2),
           description: Decidim::Faker::Localized.wrapped("<p>", "</p>") do
             Decidim::Faker::Localized.paragraph(sentence_count: 3)

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

@@ -18,6 +18,8 @@ FactoryBot.define do
     instructions { generate_localized_description(:debate_instructions, skip_injection:) }
     component { build(:debates_component, skip_injection:) }
     author { component.try(:organization) }
+    comments_layout { "single_column" }
+    deleted_at { nil }
 
     trait :open_ama do
       start_time { 1.day.ago }
@@ -46,6 +48,12 @@ FactoryBot.define do
       end
     end
 
+    trait :hidden do
+      after :create do |debate, evaluator|
+        create(:moderation, hidden_at: Time.current, reportable: debate, skip_injection: evaluator.skip_injection)
+      end
+    end
+
     trait :closed do
       closed_at { Time.current }
       conclusions { generate_localized_description(:debate_conclusions, skip_injection:) }

data/lib/decidim/debates/version.rb

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

data/lib/decidim/debates.rb

@@ -9,5 +9,6 @@ require "decidim/debates/component"
 module Decidim
   # Base module for this engine.
   module Debates
+    autoload :DebateSerializer, "decidim/debates/debate_serializer"
   end
 end