decidim-debates 0.21.0 → 0.23.2

data/app/helpers/decidim/debates/application_helper.rb

@@ -8,6 +8,9 @@ module Decidim
       include PaginateHelper
       include Decidim::Comments::CommentsHelper
       include Decidim::RichTextEditorHelper
+      include Decidim::EndorsableHelper
+      include Decidim::FollowableHelper
+      include Decidim::CheckBoxesTreeHelper
 
       # If the debate is official or the rich text editor is enabled on the
       # frontend, the debate description is considered as safe content.
@@ -17,7 +20,7 @@ module Decidim
 
       # If the content is safe, HTML tags are sanitized, otherwise, they are stripped.
       def render_debate_description(debate)
-        description = present(debate).description(strip_tags: !safe_content?)
+        description = present(debate).description(strip_tags: !safe_content?, links: true)
 
         safe_content? ? decidim_sanitize(description) : simple_format(description)
       end
@@ -26,6 +29,39 @@ module Decidim
       def text_editor_for_debate_description(form)
         text_editor_for(form, :description)
       end
+
+      # Returns a TreeNode to be used in the list filters to filter debates by
+      # its origin.
+      def filter_origin_values
+        origin_values = []
+        origin_values << TreePoint.new("official", t("decidim.debates.debates.filters.official"))
+        origin_values << TreePoint.new("citizens", t("decidim.debates.debates.filters.citizens"))
+        origin_values << TreePoint.new("user_group", t("decidim.debates.debates.filters.user_groups")) if current_organization.user_groups_enabled?
+
+        TreeNode.new(TreePoint.new("", t("decidim.debates.debates.filters.all")), origin_values)
+      end
+
+      # Options to filter Debates by activity.
+      def activity_filter_values
+        base = [
+          ["all", t("decidim.debates.debates.filters.all")],
+          ["my_debates", t("decidim.debates.debates.filters.my_debates")]
+        ]
+        base += [["commented", t("decidim.debates.debates.filters.commented")]]
+        base
+      end
+
+      # Returns a TreeNode to be used in the list filters to filter debates by
+      # its state.
+      def filter_debates_state_values
+        Decidim::CheckBoxesTreeHelper::TreeNode.new(
+          Decidim::CheckBoxesTreeHelper::TreePoint.new("", t("decidim.debates.debates.filters.all")),
+          [
+            Decidim::CheckBoxesTreeHelper::TreePoint.new("open", t("decidim.debates.debates.filters.state_values.open")),
+            Decidim::CheckBoxesTreeHelper::TreePoint.new("closed", t("decidim.debates.debates.filters.state_values.closed"))
+          ]
+        )
+      end
     end
   end
 end

data/app/models/decidim/debates/debate.rb

@@ -11,7 +11,7 @@ module Decidim
       include Decidim::Resourceable
       include Decidim::Followable
       include Decidim::Comments::Commentable
-      include Decidim::ScopableComponent
+      include Decidim::ScopableResource
       include Decidim::Authorable
       include Decidim::Reportable
       include Decidim::HasReference
@@ -20,11 +20,17 @@ module Decidim
       include Decidim::DataPortability
       include Decidim::NewsletterParticipant
       include Decidim::Searchable
+      include Decidim::TranslatableResource
+      include Decidim::TranslatableAttributes
+      include Decidim::Endorsable
+      include Decidim::Randomable
 
+      belongs_to :last_comment_by, polymorphic: true, foreign_key: "last_comment_by_id", foreign_type: "last_comment_by_type", optional: true
       component_manifest_name "debates"
 
       validates :title, presence: true
 
+      translatable_fields :title, :description, :instructions, :information_updates
       searchable_fields({
                           participatory_space: { component: :participatory_space },
                           A: :title,
@@ -34,17 +40,23 @@ module Decidim
                         index_on_create: ->(debate) { debate.visible? },
                         index_on_update: ->(debate) { debate.visible? })
 
+      scope :open, -> { where(closed_at: nil) }
+      scope :closed, -> { where.not(closed_at: nil) }
+      scope :authored_by, ->(author) { where(author: author) }
+      scope :commented_by, lambda { |author|
+        joins(:comments).where(
+          decidim_comments_comments:
+          {
+            decidim_author_id: author.id,
+            decidim_author_type: author.class.base_class.name
+          }
+        )
+      }
+
       def self.log_presenter_class_for(_log)
         Decidim::Debates::AdminLog::DebatePresenter
       end
 
-      # Public: Checks whether the debate is official or not.
-      #
-      # Returns a boolean.
-      def official?
-        author.is_a?(Decidim::Organization)
-      end
-
       # Public: Overrides the `reported_content_url` Reportable concern method.
       def reported_content_url
         ResourceLocatorPresenter.new(self).url
@@ -82,6 +94,7 @@ module Decidim
       # Public: Overrides the `accepts_new_comments?` Commentable concern method.
       def accepts_new_comments?
         return false unless open?
+        return false if closed?
 
         commentable? && !comments_blocked?
       end
@@ -118,12 +131,54 @@ module Decidim
       end
 
       def self.newsletter_participant_ids(component)
-        Decidim::Debates::Debate.where(component: component).joins(:component)
-                                .where(decidim_author_type: Decidim::UserBaseEntity.name)
-                                .where.not(author: nil)
-                                .pluck(:decidim_author_id).flatten.compact.uniq
+        authors_ids = Decidim::Debates::Debate.where(component: component)
+                                              .where(decidim_author_type: Decidim::UserBaseEntity.name)
+                                              .where.not(author: nil)
+                                              .group(:decidim_author_id)
+                                              .pluck(:decidim_author_id).flatten.compact
+        commentators_ids = Decidim::Comments::Comment.user_commentators_ids_in(Decidim::Debates::Debate.where(component: component))
+        (authors_ids + commentators_ids).flatten.compact.uniq
+      end
+
+      # Checks whether the user can edit the debate.
+      #
+      # user - the user to check for authorship
+      def editable_by?(user)
+        !closed? && authored_by?(user)
       end
 
+      # Checks whether the debate is closed or not.
+      #
+      def closed?
+        closed_at.present? && conclusions.present?
+      end
+
+      # Checks whether the user can edit the debate.
+      #
+      # user - the user to check for authorship
+      def closeable_by?(user)
+        authored_by?(user)
+      end
+
+      # Public: Updates the comments counter cache. We have to do it these
+      # way in order to properly calculate the counter with hidden
+      # comments.
+      #
+      # rubocop:disable Rails/SkipsModelValidations
+      def update_comments_count
+        comments_count = comments.not_hidden.count
+        last_comment = comments.not_hidden.order("created_at DESC").first
+
+        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,
+          comments_count: comments_count,
+          updated_at: Time.current
+        )
+      end
+      # rubocop:enable Rails/SkipsModelValidations
+
       private
 
       def comments_blocked?

data/app/permissions/decidim/debates/admin/permissions.rb

@@ -12,7 +12,9 @@ module Decidim
           case permission_action.action
           when :create, :read
             allow!
-          when :update, :delete
+          when :update
+            toggle_allow(debate && !debate.closed? && debate.official?)
+          when :delete, :close
             toggle_allow(debate && debate.official?)
           end
 

data/app/permissions/decidim/debates/permissions.rb

@@ -15,6 +15,12 @@ module Decidim
           toggle_allow(can_create_debate?)
         when :report
           allow!
+        when :edit
+          can_edit_debate?
+        when :endorse
+          can_endorse_debate?
+        when :close
+          can_close_debate?
         end
 
         permission_action
@@ -26,6 +32,28 @@ module Decidim
         authorized?(:create) &&
           current_settings&.creation_enabled? && component.participatory_space.can_participate?(user)
       end
+
+      def can_edit_debate?
+        return allow! if debate&.editable_by?(user)
+
+        disallow!
+      end
+
+      def can_close_debate?
+        return allow! if debate&.closeable_by?(user)
+
+        disallow!
+      end
+
+      def can_endorse_debate?
+        return disallow! if debate.closed?
+
+        allow!
+      end
+
+      def debate
+        @debate ||= context.fetch(:debate, nil) || context.fetch(:resource, nil)
+      end
     end
   end
 end

data/app/presenters/decidim/debates/admin_log/debate_presenter.rb

@@ -15,14 +15,18 @@ module Decidim
       class DebatePresenter < Decidim::Log::BasePresenter
         private
 
+        def resource_presenter
+          @resource_presenter ||= Decidim::Debates::Log::ResourcePresenter.new(action_log.resource, h, action_log.extra["resource"])
+        end
+
         def diff_fields_mapping
           {
-            description: :i18n,
+            description: "Decidim::Debates::AdminLog::ValueTypes::DebateTitleDescriptionPresenter",
             end_date: :date,
             information_updates: :i18n,
             instructions: :i18n,
             start_date: :date,
-            title: :i18n
+            title: "Decidim::Debates::AdminLog::ValueTypes::DebateTitleDescriptionPresenter"
           }
         end
 

data/app/presenters/decidim/debates/admin_log/value_types/debate_title_description_presenter.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Debates
+    module AdminLog
+      module ValueTypes
+        # This class presents the given value as a Decidim::Debates::DebateTitleBody. Check
+        # the `DefaultPresenter` for more info on how value presenters work.
+        class DebateTitleDescriptionPresenter < Decidim::Log::ValueTypes::DefaultPresenter
+          def present
+            return unless value
+
+            renderer = Decidim::ContentRenderers::HashtagRenderer.new(h.translated_attribute(value))
+            renderer.render(links: false).html_safe
+          end
+        end
+      end
+    end
+  end
+end

data/app/presenters/decidim/debates/debate_presenter.rb

@@ -6,8 +6,11 @@ module Decidim
     # Decorator for debates
     #
     class DebatePresenter < SimpleDelegator
+      include Decidim::TranslationsHelper
+      include Decidim::ResourceHelper
       include Decidim::SanitizeHelper
       include Decidim::TranslatableAttributes
+      include ActionView::Helpers::DateHelper
 
       def debate
         __getobj__
@@ -23,15 +26,67 @@ module Decidim
                     end
       end
 
-      def title
-        content = translated_attribute(debate.title)
-        decidim_html_escape(content)
+      def title(links: false, all_locales: false)
+        return unless debate
+
+        handle_locales(debate.title, all_locales) do |content|
+          renderer = Decidim::ContentRenderers::HashtagRenderer.new(decidim_html_escape(content))
+          renderer.render(links: links).html_safe
+        end
+      end
+
+      def description(strip_tags: false, links: false, all_locales: false)
+        return unless debate
+
+        handle_locales(debate.description, all_locales) do |content|
+          content = strip_tags(content) if strip_tags
+          renderer = Decidim::ContentRenderers::HashtagRenderer.new(content)
+          content = renderer.render(links: links).html_safe
+          content = Decidim::ContentRenderers::LinkRenderer.new(content).render if links
+          content
+        end
+      end
+
+      def handle_locales(content, all_locales, &block)
+        if all_locales
+          content.each_with_object({}) do |(key, value), parsed_content|
+            parsed_content[key] = if key == "machine_translations"
+                                    handle_locales(value, all_locales, &block)
+                                  else
+                                    block.call(value)
+                                  end
+          end
+        else
+          yield(translated_attribute(content))
+        end
+      end
+
+      def last_comment_at
+        return unless debate.last_comment_at
+
+        time_ago_in_words(debate.last_comment_at)
+      end
+
+      def last_comment_by
+        debate.last_comment_by&.presenter
+      end
+
+      def participants_count
+        comments_authors.count do |author|
+          author.is_a?(Decidim::User)
+        end
+      end
+
+      def groups_count
+        comments_authors.count do |author|
+          author.is_a?(Decidim::UserGroup)
+        end
       end
 
-      def description(strip_tags: false)
-        content = translated_attribute(debate.description)
-        content = strip_tags(content) if strip_tags
-        content
+      private
+
+      def comments_authors
+        @comments_authors ||= debate.comments.includes(:author, :user_group).map(&:normalized_author).uniq
       end
     end
   end

data/app/presenters/decidim/debates/log/resource_presenter.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Debates
+    module Log
+      class ResourcePresenter < Decidim::Log::ResourcePresenter
+        private
+
+        # Private: Presents resource name.
+        #
+        # Returns an HTML-safe String.
+        def present_resource_name
+          Decidim::Debates::DebatePresenter.new(resource).title
+        end
+      end
+    end
+  end
+end

data/app/presenters/decidim/debates/official_author_presenter.rb

@@ -5,38 +5,10 @@ module Decidim
     #
     # A dummy presenter to abstract out the author of an official debate.
     #
-    class OfficialAuthorPresenter
+    class OfficialAuthorPresenter < Decidim::OfficialAuthorPresenter
       def name
         I18n.t("decidim.debates.models.debate.fields.official_debate")
       end
-
-      def nickname
-        ""
-      end
-
-      def badge
-        ""
-      end
-
-      def profile_path
-        ""
-      end
-
-      def avatar_url
-        ActionController::Base.helpers.asset_path("decidim/default-avatar.svg")
-      end
-
-      def deleted?
-        false
-      end
-
-      def can_be_contacted?
-        false
-      end
-
-      def has_tooltip?
-        false
-      end
     end
   end
 end

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

@@ -9,9 +9,6 @@ module Decidim
         end
 
         def save
-          return @registry if @registry
-
-          @registry = []
           cumulative.each do |key, cumulative_value|
             next if cumulative_value.zero?
 
@@ -21,10 +18,8 @@ module Decidim
                                                            organization: @organization, decidim_category_id: category_id,
                                                            participatory_space_type: space_type, participatory_space_id: space_id)
             record.assign_attributes(cumulative: cumulative_value, quantity: quantity_value)
-            @registry << record
+            record.save!
           end
-          @registry.each(&:save!)
-          @registry
         end
 
         private
@@ -32,8 +27,7 @@ module Decidim
         def query
           return @query if @query
 
-          components = Decidim::Component.where(participatory_space: retrieve_participatory_spaces).published
-          @query = Decidim::Debates::Debate.where(component: components).joins(:component)
+          @query = Decidim::Debates::Debate.where(component: visible_component_ids_from_spaces(retrieve_participatory_spaces)).joins(:component)
                                            .left_outer_joins(:category)
           @query = @query.where("decidim_debates_debates.start_time <= ?", end_time)
           @query = @query.group("decidim_categorizations.decidim_category_id",