decidim-core 0.15.2 → 0.16.0

data/app/models/decidim/user_base_entity.rb

@@ -42,11 +42,5 @@ module Decidim
                        end
                      end
     end
-
-    def following_users
-      @following_users ||= following.select do |f|
-        f.is_a?(Decidim::User) || f.is_a?(Decidim::UserGroup)
-      end
-    end
   end
 end

data/app/models/decidim/user_group.rb

@@ -1,5 +1,8 @@
 # frozen_string_literal: true
 
+require_dependency "devise/models/decidim_validatable"
+require "valid_email2"
+
 module Decidim
   # A UserGroup is an organization of citizens
   class UserGroup < UserBaseEntity
@@ -8,15 +11,22 @@ module Decidim
 
     has_many :memberships, class_name: "Decidim::UserGroupMembership", foreign_key: :decidim_user_group_id, dependent: :destroy
     has_many :users, through: :memberships, class_name: "Decidim::User", foreign_key: :decidim_user_id
+    has_many :managers,
+             -> { where(decidim_user_group_memberships: { role: [:creator, :admin] }) },
+             through: :memberships,
+             class_name: "Decidim::User",
+             foreign_key: :decidim_user_id,
+             source: :user
 
     validates :name, presence: true, uniqueness: { scope: :decidim_organization_id }
-    validates :document_number, presence: true
-    validates :phone, presence: true
 
     validate :correct_state
-    validate :unique_document_number
+    validate :unique_document_number, if: :has_document_number?
+
+    devise :confirmable, :decidim_validatable, confirmation_keys: [:decidim_organization_id, :email]
 
     scope :verified, -> { where.not("extended_data->>'verified_at' IS ?", nil) }
+    scope :not_verified, -> { where("extended_data->>'verified_at' IS ?", nil) }
     scope :rejected, -> { where.not("extended_data->>'rejected_at' IS ?", nil) }
     scope :pending, -> { where("extended_data->>'rejected_at' IS ? AND extended_data->>'verified_at' IS ?", nil, nil) }
 
@@ -96,5 +106,21 @@ module Decidim
 
       errors.add(:document_number, :taken) if is_repeated
     end
+
+    def has_document_number?
+      document_number.present?
+    end
+
+    # Overwites method in `Decidim::Validatable`, as user groups don't have a
+    # password.
+    def password_required?
+      false
+    end
+
+    # Overwites method in `Decidim::Validatable`, as user groups don't have a
+    # password.
+    def password
+      nil
+    end
   end
 end

data/app/permissions/decidim/permissions.rb

@@ -16,6 +16,7 @@ module Decidim
       manage_self_user_action?
       authorization_action?
       follow_action?
+      amend_action?
       notification_action?
       conversation_action?
       user_group_action?
@@ -77,6 +78,17 @@ module Decidim
       toggle_allow(follow&.user == user)
     end
 
+    def amend_action?
+      return unless permission_action.subject == :amendment
+      return allow! if permission_action.action == :create
+      return allow! if permission_action.action == :reject
+      return allow! if permission_action.action == :promote
+      return allow! if permission_action.action == :accept
+
+      amendment = context.fetch(:amendment, nil)
+      toggle_allow(amendment&.amender == user)
+    end
+
     def notification_action?
       return unless permission_action.subject == :notification
       return allow! if permission_action.action == :read

data/app/presenters/decidim/admin_log/organization_presenter.rb

@@ -19,6 +19,7 @@ module Decidim
           .merge(omnipresent_banner_attributes_mapping)
           .merge(highlighted_content_banner_attributes_mapping)
           .merge(appearance_attributes_mapping)
+          .merge(id_documents_attributes_mapping)
       end
 
       def settings_attributes_mapping
@@ -71,13 +72,25 @@ module Decidim
         }
       end
 
+      def id_documents_attributes_mapping
+        {
+          id_documents_methods: :string,
+          id_documents_explanation_text: :i18n
+        }
+      end
+
       def action_string
+        return "decidim.admin_log.organization.update_id_documents_config" if action == "update_id_documents_config"
         "decidim.admin_log.organization.update"
       end
 
       def i18n_labels_scope
         "activemodel.attributes.organization"
       end
+
+      def has_diff?
+        action == "update_id_documents_config" || super
+      end
     end
   end
 end

data/app/presenters/decidim/admin_log/user_group_presenter.rb

@@ -20,7 +20,7 @@ module Decidim
 
       def action_string
         case action
-        when "verify", "reject"
+        when "verify", "verify_via_csv", "reject"
           "decidim.admin_log.user_group.#{action}"
         else
           super

data/app/presenters/decidim/admin_log/user_presenter.rb

@@ -16,7 +16,7 @@ module Decidim
 
       def action_string
         case action
-        when "invite", "officialize", "remove_from_admin", "unofficialize"
+        when "grant_id_documents_offline_verification", "invite", "officialize", "remove_from_admin", "unofficialize"
           "decidim.admin_log.user.#{action}"
         else
           super

data/app/presenters/decidim/hashtag_presenter.rb

@@ -8,11 +8,16 @@ module Decidim
     include Rails.application.routes.mounted_helpers
     include ActionView::Helpers::UrlHelper
 
+    def initialize(hashtag, cased_name: nil)
+      super(hashtag)
+      @cased_name = cased_name if cased_name&.downcase == hashtag.name
+    end
+
     #
-    # name presented in a twitter-like style
+    # hashtag presented in a twitter-like style
     #
     def name
-      "##{super}"
+      "##{@cased_name || super}"
     end
 
     delegate :url, to: :hashtag, prefix: true

data/app/presenters/decidim/metric_charts_presenter.rb

@@ -3,11 +3,19 @@
 module Decidim
   # A presenter to render metrics in pages
   class MetricChartsPresenter < Rectify::Presenter
-    attribute :organization, Decidim::Organization
-
     # Public: Render a collection of primary metrics.
     def highlighted
-      highlighted_metrics = Decidim.metrics_registry.highlighted
+      render_highlighted(Decidim.metrics_registry.filtered(highlight: true, scope: "home"))
+    end
+
+    # Public: Render a collection of metrics that are not primary.
+    def not_highlighted
+      render_not_highlighted(Decidim.metrics_registry.filtered(highlight: false, scope: "home"))
+    end
+
+    private
+
+    def render_highlighted(highlighted_metrics)
       safe_join(
         highlighted_metrics.map do |metric|
           render_metrics_data(metric.metric_name, klass: "column medium-4")
@@ -15,14 +23,13 @@ module Decidim
       )
     end
 
-    # Public: Render a collection of metrics that are not primary.
-    def not_highlighted
-      not_highlighted_metrics = Decidim.metrics_registry.not_highlighted
+    def render_not_highlighted(not_highlighted_metrics)
       safe_join(
-        not_highlighted_metrics.in_groups_of(2, [:empty]).map do |metrics_group|
+        not_highlighted_metrics.in_groups_of(2).map do |metrics_group|
           content_tag :div, class: "column medium-4" do
             safe_join(
               metrics_group.map do |metric|
+                next "" if metric.blank?
                 render_metrics_data(metric.metric_name, klass: "column medium-6", graph_klass: "small")
               end
             )
@@ -31,22 +38,48 @@ module Decidim
       )
     end
 
-    private
-
     def render_metrics_data(metric_name, opts = {})
       content_tag :div, class: opts[:klass].presence || "column medium-6" do
-        content_tag :div,
-                    "",
-                    id: "#{metric_name}_chart",
-                    class: "areachart metric-chart #{opts[:graph_klass]}",
-                    data: {
-                      chart: "areachart",
-                      metric: metric_name,
-                      info: {
-                        title: I18n.t("decidim.metrics.#{metric_name}.title"),
-                        object: I18n.t("decidim.metrics.#{metric_name}.object")
-                      }
-                    }
+        concat render_metric_chart(metric_name, opts)
+        concat render_downloader(metric_name) if opts[:download]
+      end
+    end
+
+    def render_metrics_descriptive(metric_name, opts = {})
+      content_tag :div, class: opts[:klass].presence || "column medium-6" do
+        concat content_tag(:h3, opts[:title], class: "metric-title heading3 text-uppercase text-muted")
+        concat content_tag(:p, opts[:description], class: "metric-description text-medium")
+        concat render_metric_chart(metric_name, opts)
+        concat render_downloader(metric_name) if opts[:download]
+      end
+    end
+
+    def render_metric_chart(metric_name, opts = {})
+      data = {
+        chart: "areachart",
+        metric: metric_name,
+        info: {
+          title: I18n.t("decidim.metrics.#{metric_name}.title"),
+          object: I18n.t("decidim.metrics.#{metric_name}.object")
+        }
+      }
+      data.merge!(opts[:data] || {})
+
+      content_tag :div,
+                  "",
+                  id: "#{metric_name}_chart",
+                  class: "areachart metric-chart #{opts[:graph_klass]}",
+                  style: opts[:margin],
+                  data: data
+    end
+
+    def render_downloader(metric_name)
+      content_tag :p, class: "pull-right mt-s" do
+        link_to "#", class: "metric-downloader", data: { metric: metric_name } do
+          content_tag :small, class: "text-small" do
+            content_tag :u, I18n.t("decidim.metrics.download.csv")
+          end
+        end
       end
     end
   end

data/app/presenters/decidim/user_presenter.rb

@@ -40,14 +40,6 @@ module Decidim
       link_to nickname, profile_path, class: "user-mention"
     end
 
-    def followers_count
-      __getobj__.followers.count
-    end
-
-    def following_count
-      __getobj__.following_users.count
-    end
-
     def can_be_contacted?
       true
     end
@@ -60,5 +52,9 @@ module Decidim
     def can_follow?
       true
     end
+
+    def has_tooltip?
+      true
+    end
   end
 end

data/app/queries/decidim/messaging/user_conversations.rb

@@ -17,7 +17,7 @@ module Decidim
 
       def query
         Conversation
-          .includes(:participations)
+          .joins(:participations)
           .where(decidim_messaging_participations: { decidim_participant_id: user.id })
       end
 

data/app/queries/decidim/metric_manage.rb

@@ -9,9 +9,9 @@ module Decidim
     end
 
     def initialize(day_string, organization)
-      @day = day_string.present? ? Date.parse(day_string) : Time.zone.today - 1.day
+      @day = day_string.present? ? Date.parse(day_string) : Time.zone.yesterday
       raise ArgumentError, "[ERROR] Malformed `day` argument. Format must be `YYYY-MM-DD` and in the past" if @day > Time.zone.today
-      @day ||= Time.zone.today - 1.day
+      @day ||= Time.zone.yesterday
       @organization = organization
       @metric_name = metric_name
     end
@@ -55,5 +55,19 @@ module Decidim
     def quantity
       @quantity ||= cumulative
     end
+
+    # Search for all Participatory Space manifests and then all records available
+    # Limited to ParticipatoryProcesses only
+    def retrieve_participatory_spaces
+      Decidim.participatory_space_manifests.map do |space_manifest|
+        next unless space_manifest.name == :participatory_processes # Temporal limitation
+        space_manifest.participatory_spaces.call(@organization)
+      end.flatten.compact
+    end
+
+    # Search for all components published, within a fixed list of available
+    def retrieve_components(participatory_space)
+      participatory_space.components.published
+    end
   end
 end

data/app/queries/decidim/metric_measure.rb

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+module Decidim
+  # This class execute some measures related to Metrics, and return its results
+  #
+  #  - day: Date object
+  #  - resource: Object used to make measurements. Object class is dependant within each measure
+  class MetricMeasure
+    def initialize(day, resource)
+      @day = day.try(:to_date) || Time.zone.yesterday
+      raise ArgumentError, "[ERROR] Malformed `day` argument. Format must be `YYYY-MM-DD` and in the past" if @day > Time.zone.today
+      @day ||= Time.zone.yesterday
+      @resource = resource
+    end
+
+    def valid?
+      @day.present? && @resource.present?
+    end
+
+    # this method must be overwritten for each Measure class
+    def calculate
+      raise StandardError, "Not implemented"
+    end
+
+    private
+
+    def start_time
+      @start_time ||= @day.beginning_of_day
+    end
+
+    def end_time
+      @end_time ||= @day.end_of_day
+    end
+  end
+end

data/app/queries/decidim/metrics/followers_metric_manage.rb

@@ -0,0 +1,64 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Metrics
+    # Metric manager for Followers's registries
+    # Searches for unique Followers for registered MetricOperations
+    class FollowersMetricManage < Decidim::MetricManage
+      def metric_name
+        "followers"
+      end
+
+      def save
+        return @registry if @registry
+        @registry = []
+        query.each do |key, results|
+          cumulative_value = results[:cumulative_users].count
+          next if cumulative_value.zero?
+          quantity_value = results[:quantity_users].count || 0
+          space_type, space_id = key
+          record = Decidim::Metric.find_or_initialize_by(day: @day.to_s, metric_type: @metric_name,
+                                                         participatory_space_type: space_type, participatory_space_id: space_id,
+                                                         organization: @organization)
+          record.assign_attributes(cumulative: cumulative_value, quantity: quantity_value)
+          @registry << record
+        end
+        @registry.each(&:save!)
+        @registry
+      end
+
+      private
+
+      # Creates a Hashed structure with number of Followers grouped by
+      #
+      #  - ParticipatorySpace (type & ID)
+      def query
+        return @query if @query
+
+        @query = retrieve_participatory_spaces.each_with_object({}) do |participatory_space, grouped_participants|
+          key = [participatory_space.class.name, participatory_space.id]
+          grouped_participants[key] = { cumulative_users: [], quantity_users: [] }
+          if (operation_manifest = Decidim.metrics_operation.for(:followers, participatory_space.manifest.name))
+            space_participants = operation_manifest.calculate(@day, participatory_space)
+            grouped_participants[key].merge!(space_participants || {}) do |_key, grouped_users, space_users|
+              grouped_users | space_users
+            end
+          end
+
+          components = retrieve_components(participatory_space)
+          components.each do |component|
+            operation_manifest = Decidim.metrics_operation.for(:followers, component.manifest_name)
+            next grouped_participants unless operation_manifest
+            component_participants = operation_manifest.calculate(@day, component)
+            grouped_participants[key].merge!(component_participants || {}) do |_key, grouped_users, component_users|
+              grouped_users | component_users
+            end
+          end
+
+          grouped_participants
+        end
+        @query
+      end
+    end
+  end
+end

data/app/queries/decidim/metrics/participants_metric_manage.rb

@@ -0,0 +1,72 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Metrics
+    # Metric manager for Participant's registries
+    # Searches for Participants for registered MetricOperations
+    class ParticipantsMetricManage < Decidim::MetricManage
+      # This list limits the number of components involved in this Metric
+      AVAILABLE_COMPONENTS = %w(proposals debates surveys budgets).freeze
+
+      def metric_name
+        "participants"
+      end
+
+      def save
+        return @registry if @registry
+        @registry = []
+        query.each do |key, results|
+          cumulative_value = results[:cumulative_users].count
+          next if cumulative_value.zero?
+          quantity_value = results[:quantity_users].count || 0
+          space_type, space_id = key
+          record = Decidim::Metric.find_or_initialize_by(day: @day.to_s, metric_type: @metric_name,
+                                                         participatory_space_type: space_type, participatory_space_id: space_id,
+                                                         organization: @organization)
+          record.assign_attributes(cumulative: cumulative_value, quantity: quantity_value)
+          @registry << record
+        end
+        @registry.each(&:save!)
+        @registry
+      end
+
+      private
+
+      # Creates a Hashed structure with number of Participants grouped by
+      #
+      #  - ParticipatorySpace (type & ID)
+      def query
+        return @query if @query
+
+        @query = retrieve_participatory_spaces.each_with_object({}) do |participatory_space, grouped_participants|
+          key = [participatory_space.class.name, participatory_space.id]
+          grouped_participants[key] = { cumulative_users: [], quantity_users: [] }
+          components = retrieve_components(participatory_space)
+          components.each do |component|
+            operation_manifest = Decidim.metrics_operation.for(:participants, component.manifest_name)
+            next grouped_participants unless operation_manifest
+            component_participants = operation_manifest.calculate(@day, component)
+            grouped_participants[key].merge!(component_participants || {}) do |_key, grouped_users, component_users|
+              grouped_users | component_users
+            end
+          end
+
+          # Special case for comments ONLY
+          operation_manifest = Decidim.metrics_operation.for(:participants, :comments)
+          next grouped_participants unless operation_manifest
+          comments_participants = operation_manifest.calculate(@day, participatory_space)
+          grouped_participants[key].merge!(comments_participants || {}) do |_key, grouped_users, comment_users|
+            grouped_users | comment_users
+          end
+          grouped_participants
+        end
+        @query
+      end
+
+      # Search for all components published, within a fixed list of available
+      def retrieve_components(participatory_space)
+        super.where(manifest_name: AVAILABLE_COMPONENTS)
+      end
+    end
+  end
+end