decidim-debates 0.30.1 → 0.31.0.rc1

data/lib/decidim/debates/component.rb

@@ -25,25 +25,41 @@ Decidim.register_component(:debates) do |component|
   end
 
   component.settings(:step) do |settings|
-    settings.attribute :endorsements_enabled, type: :boolean, default: true
-    settings.attribute :endorsements_blocked, type: :boolean
+    settings.attribute :likes_enabled, type: :boolean, default: true
+    settings.attribute :likes_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
   end
 
-  component.register_stat :debates_count, primary: true, priority: Decidim::StatsRegistry::HIGH_PRIORITY do |components, _start_at, _end_at|
+  component.register_stat :debates_count,
+                          primary: true,
+                          priority: Decidim::StatsRegistry::MEDIUM_PRIORITY,
+                          icon_name: "discuss-line",
+                          tooltip_key: "debates_count_tooltip" do |components, _start_at, _end_at|
     Decidim::Debates::Debate.where(component: components).not_hidden.count
   end
 
-  component.register_stat :followers_count, tag: :followers, priority: Decidim::StatsRegistry::LOW_PRIORITY do |components, _start_at, _end_at|
+  component.register_stat :followers_count,
+                          tag: :followers,
+                          icon_name: "user-follow-line",
+                          tooltip_key: "followers_count_tooltip",
+                          priority: Decidim::StatsRegistry::MEDIUM_PRIORITY do |components, _start_at, _end_at|
     debates_ids = Decidim::Debates::Debate.where(component: components).not_hidden.pluck(:id)
     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|
+  component.register_stat :comments_count,
+                          priority: Decidim::StatsRegistry::HIGH_PRIORITY,
+                          icon_name: "chat-1-line",
+                          tooltip_key: "comments_count",
+                          tag: :comments do |components, _start_at, _end_at|
+    Decidim::Debates::Debate.where(component: components).not_hidden.count
+  end
+
+  component.register_stat :likes_count, priority: Decidim::StatsRegistry::LOW_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
+    Decidim::Like.where(resource_id: debates_ids, resource_type: Decidim::Debates::Debate.name).count
   end
 
   component.register_resource(:debate) do |resource|
@@ -51,10 +67,10 @@ Decidim.register_component(:debates) do |component|
     resource.card = "decidim/debates/debate"
     resource.reported_content_cell = "decidim/debates/reported_content"
     resource.searchable = true
-    resource.actions = %w(create endorse comment)
+    resource.actions = %w(create like comment)
   end
 
-  component.actions = %w(create endorse comment)
+  component.actions = %w(create like comment)
 
   component.exports :debates do |exports|
     exports.collection do |component_instance|
@@ -73,7 +89,7 @@ Decidim.register_component(:debates) do |component|
     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 } })
+      ).includes(:author, root_commentable: { component: { participatory_space: :organization } })
     end
 
     exports.include_in_open_data = true

data/lib/decidim/debates/debate_serializer.rb

@@ -40,7 +40,7 @@ module Decidim
           closed_at: resource.closed_at,
           created_at: resource.created_at,
           updated_at: resource.updated_at,
-          endorsements_count: resource.endorsements_count
+          likes_count: resource.likes_count
         }
       end
 
@@ -73,7 +73,7 @@ module Decidim
 
       def user_url(author)
         if author.respond_to?(:nickname)
-          profile_url(author) # is a Decidim::User or Decidim::UserGroup
+          profile_url(author) # is a Decidim::User
         else
           root_url # is a Decidim::Organization
         end

data/lib/decidim/debates/engine.rb

@@ -46,7 +46,7 @@ module Decidim
         Decidim::Gamification.register_badge(:commented_debates) do |badge|
           badge.levels = [1, 5, 10, 30, 50]
 
-          badge.valid_for = [:user, :user_group]
+          badge.valid_for = [:user]
 
           badge.reset = lambda do |user|
             debates = Decidim::Comments::Comment.where(
@@ -62,49 +62,18 @@ module Decidim
             comment = Decidim::Comments::Comment.find(data[:comment_id])
             next unless comment.decidim_root_commentable_type == "Decidim::Debates::Debate"
 
-            if comment.user_group.present?
-              comments = Decidim::Comments::Comment.where(
-                decidim_root_commentable_id: comment.decidim_root_commentable_id,
-                decidim_root_commentable_type: comment.decidim_root_commentable_type,
-                user_group: comment.user_group
-              )
-
-              Decidim::Gamification.increment_score(comment.user_group, :commented_debates) if comments.count == 1
-            elsif comment.author.present?
-              comments = Decidim::Comments::Comment.where(
-                decidim_root_commentable_id: comment.decidim_root_commentable_id,
-                decidim_root_commentable_type: comment.decidim_root_commentable_type,
-                author: comment.author
-              )
-
-              Decidim::Gamification.increment_score(comment.author, :commented_debates) if comments.count == 1
-            end
-          end
-        end
-      end
-
-      initializer "decidim_debates.register_metrics" do
-        Decidim.metrics_registry.register(:debates) do |metric_registry|
-          metric_registry.manager_class = "Decidim::Debates::Metrics::DebatesMetricManage"
+            comments = Decidim::Comments::Comment.where(
+              decidim_root_commentable_id: comment.decidim_root_commentable_id,
+              decidim_root_commentable_type: comment.decidim_root_commentable_type,
+              author: comment.author
+            )
 
-          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: 3
-            settings.attribute :stat_block, type: :string, default: "small"
+            Decidim::Gamification.increment_score(comment.author, :commented_debates) if comments.count == 1
           end
         end
-
-        Decidim.metrics_operation.register(:participants, :debates) do |metric_operation|
-          metric_operation.manager_class = "Decidim::Debates::Metrics::DebateParticipantsMetricMeasure"
-        end
-
-        Decidim.metrics_operation.register(:followers, :debates) do |metric_operation|
-          metric_operation.manager_class = "Decidim::Debates::Metrics::DebateFollowersMetricMeasure"
-        end
       end
 
-      initializer "decidim_debates.webpacker.assets_path" do
+      initializer "decidim_debates.shakapacker.assets_path" do
         Decidim.register_assets_path File.expand_path("app/packs", root)
       end
 

data/lib/decidim/debates/seeds.rb

@@ -33,7 +33,7 @@ module Decidim
           Decidim::Component.create!(params)
         end
 
-        5.times do |x|
+        number_of_records.times do |x|
           finite = x != 2
           if finite
             start_time = [rand(1..20).weeks.from_now, rand(1..20).weeks.ago].sample

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

@@ -21,7 +21,18 @@ FactoryBot.define do
     comments_layout { "single_column" }
     deleted_at { nil }
 
-    trait :open_ama do
+    trait :with_likes do
+      after :create do |post, evaluator|
+        5.times.collect do
+          create(:like,
+                 resource: post,
+                 skip_injection: evaluator.skip_injection,
+                 author: build(:user, :confirmed, skip_injection: evaluator.skip_injection, organization: post.participatory_space.organization))
+        end
+      end
+    end
+
+    trait :ongoing_ama do
       start_time { 1.day.ago }
       end_time { 1.day.from_now }
     end
@@ -38,16 +49,6 @@ FactoryBot.define do
       author { component.try(:organization) }
     end
 
-    trait :user_group_author do
-      author do
-        create(:user, organization: component.organization, skip_injection:) if component
-      end
-
-      user_group do
-        create(:user_group, :verified, organization: component.organization, users: [author], skip_injection:) if component
-      end
-    end
-
     trait :hidden do
       after :create do |debate, evaluator|
         create(:moderation, hidden_at: Time.current, reportable: debate, skip_injection: evaluator.skip_injection)
@@ -60,8 +61,8 @@ FactoryBot.define do
     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
+      debate.title = Decidim::ContentProcessor.parse(debate.title, current_organization: debate.organization).rewrite
+      debate.description = Decidim::ContentProcessor.parse_with_processor(:inline_images, debate.description, current_organization: debate.organization).rewrite
     end
   end
 
@@ -98,32 +99,32 @@ FactoryBot.define do
     end
 
     trait :with_votes_enabled do
-      # Needed for endorsements tests
+      # Needed for likes tests
     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
     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

data/lib/decidim/debates/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-debates
 version: !ruby/object:Gem::Version
-  version: 0.30.1
+  version: 0.31.0.rc1
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -11,7 +11,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-06-17 00:00:00.000000000 Z
+date: 2025-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: decidim-comments
@@ -19,70 +19,70 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.30.1
+        version: 0.31.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.30.1
+        version: 0.31.0.rc1
 - !ruby/object:Gem::Dependency
   name: decidim-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.30.1
+        version: 0.31.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.30.1
+        version: 0.31.0.rc1
 - !ruby/object:Gem::Dependency
   name: decidim-admin
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.30.1
+        version: 0.31.0.rc1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.30.1
+        version: 0.31.0.rc1
 - !ruby/object:Gem::Dependency
   name: decidim-assemblies
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.30.1
+        version: 0.31.0.rc1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.30.1
+        version: 0.31.0.rc1
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.30.1
+        version: 0.31.0.rc1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.30.1
+        version: 0.31.0.rc1
 description: A debates component for decidim's participatory spaces.
 email:
 - josepjaume@gmail.com
@@ -145,9 +145,6 @@ files:
 - app/presenters/decidim/debates/admin_log/value_types/debate_title_description_presenter.rb
 - app/presenters/decidim/debates/debate_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/download_your_data_debate_serializer.rb
 - app/services/decidim/debates/debate_search.rb
 - app/services/decidim/debates/diff_renderer.rb
@@ -278,6 +275,7 @@ files:
 - db/migrate/20210519201932_add_comments_availability_columns_to_debates_table.rb
 - db/migrate/20240828103648_add_deleted_at_to_decidim_debates_debates.rb
 - db/migrate/20241017153555_add_comments_layout_to_debates.rb
+- db/migrate/20250515115545_rename_debates_endorsements_count_to_likes.rb
 - decidim-debates.gemspec
 - lib/decidim/api/debate_type.rb
 - lib/decidim/api/debates_type.rb

data/app/queries/decidim/debates/metrics/debate_followers_metric_measure.rb

@@ -1,31 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
-  module Debates
-    module Metrics
-      # Searches for unique Users following the next objects
-      #  - Debates
-      class DebateFollowersMetricMeasure < Decidim::MetricMeasure
-        def valid?
-          super && @resource.is_a?(Decidim::Component)
-        end
-
-        def calculate
-          debates = Decidim::Debates::Debate.where(component: @resource).joins(:component)
-
-          debates_followers = Decidim::Follow.where(followable: debates).joins(:user)
-                                             .where(decidim_follows: { created_at: ..end_time })
-          cumulative_users = debates_followers.pluck(:decidim_user_id)
-
-          debates_followers = debates_followers.where(decidim_follows: { created_at: start_time.. })
-          quantity_users = debates_followers.pluck(:decidim_user_id)
-
-          {
-            cumulative_users: cumulative_users.uniq,
-            quantity_users: quantity_users.uniq
-          }
-        end
-      end
-    end
-  end
-end

data/app/queries/decidim/debates/metrics/debate_participants_metric_measure.rb

@@ -1,27 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
-  module Debates
-    module Metrics
-      # Searches for Participants in the following actions
-      #  - Create a debate (Debates)
-      class DebateParticipantsMetricMeasure < Decidim::MetricMeasure
-        def valid?
-          super && @resource.is_a?(Decidim::Component)
-        end
-
-        def calculate
-          debates = Decidim::Debates::Debate.where(component: @resource).joins(:component)
-                                            .where(decidim_debates_debates: { created_at: ..end_time })
-                                            .where(decidim_author_type: Decidim::UserBaseEntity.name)
-                                            .where.not(author: nil)
-
-          {
-            cumulative_users: debates.pluck(:decidim_author_id),
-            quantity_users: debates.where(decidim_debates_debates: { created_at: start_time.. }).pluck(:decidim_author_id)
-          }
-        end
-      end
-    end
-  end
-end

data/app/queries/decidim/debates/metrics/debates_metric_manage.rb

@@ -1,45 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
-  module Debates
-    module Metrics
-      class DebatesMetricManage < Decidim::MetricManage
-        def metric_name
-          "debates"
-        end
-
-        def save
-          cumulative.each do |key, cumulative_value|
-            next if cumulative_value.zero?
-
-            quantity_value = quantity[key] || 0
-            taxonomy_id, space_type, space_id = key
-            record = Decidim::Metric.find_or_initialize_by(day: @day.to_s, metric_type: @metric_name,
-                                                           organization: @organization, decidim_taxonomy_id: taxonomy_id,
-                                                           participatory_space_type: space_type, participatory_space_id: space_id)
-            record.assign_attributes(cumulative: cumulative_value, quantity: quantity_value)
-            record.save!
-          end
-        end
-
-        private
-
-        def query
-          return @query if @query
-
-          @query = Decidim::Debates::Debate.where(component: visible_components_from_spaces(retrieve_participatory_spaces)).joins(:component)
-                                           .left_outer_joins(:taxonomizations)
-          @query = @query.where(decidim_debates_debates: { start_time: ..end_time })
-          @query = @query.group("decidim_taxonomizations.taxonomy_id",
-                                :participatory_space_type,
-                                :participatory_space_id)
-          @query
-        end
-
-        def quantity
-          @quantity ||= query.where(decidim_debates_debates: { start_time: start_time.. }).count
-        end
-      end
-    end
-  end
-end