decidim-initiatives 0.20.1 → 0.23.1

data/app/models/decidim/initiatives_type.rb

@@ -4,6 +4,9 @@ module Decidim
   # Initiative type.
   class InitiativesType < ApplicationRecord
     include Decidim::HasResourcePermission
+    include Decidim::TranslatableResource
+
+    translatable_fields :title, :description, :extra_fields_legal_information
 
     belongs_to :organization,
                foreign_key: "decidim_organization_id",
@@ -21,8 +24,8 @@ module Decidim
 
     enum signature_type: [:online, :offline, :any], _suffix: true
 
-    validates :signature_type, presence: true
-    validates :title, :description, presence: true
+    validates :title, :description, :signature_type, presence: true
+    validates :document_number_authorization_handler, presence: true, if: ->(form) { form.collect_user_extra_fields? }
 
     mount_uploader :banner_image, Decidim::BannerImageUploader
 

data/app/models/decidim/initiatives_type_scope.rb

@@ -25,8 +25,12 @@ module Decidim
       greater_than: 0
     }
 
+    def global_scope?
+      decidim_scopes_id.nil?
+    end
+
     def scope_name
-      return { I18n.locale.to_s => I18n.t("decidim.scopes.global") } if decidim_scopes_id.nil?
+      return { I18n.locale.to_s => I18n.t("decidim.scopes.global") } if global_scope?
 
       scope&.name.presence || { I18n.locale.to_s => I18n.t("decidim.initiatives.unavailable_scope") }
     end

data/app/models/decidim/initiatives_vote.rb

@@ -11,37 +11,43 @@ module Decidim
                foreign_key: "decidim_author_id",
                class_name: "Decidim::User"
 
-    belongs_to :user_group,
-               foreign_key: "decidim_user_group_id",
-               class_name: "Decidim::UserGroup",
-               optional: true
-
     belongs_to :initiative,
                foreign_key: "decidim_initiative_id",
                class_name: "Decidim::Initiative",
                inverse_of: :votes
 
-    validates :initiative, uniqueness: { scope: [:author, :user_group] }
+    belongs_to :scope,
+               foreign_key: "decidim_scope_id",
+               class_name: "Decidim::Scope",
+               optional: true
+
+    validates :initiative, uniqueness: { scope: [:author, :scope] }
+    validates :initiative, uniqueness: { scope: [:hash_id, :scope] }
 
     after_commit :update_counter_cache, on: [:create, :destroy]
 
-    scope :supports, -> { where.not(decidim_user_group_id: nil) }
-    scope :votes, -> { where(decidim_user_group_id: nil) }
+    scope :for_scope, ->(scope) { where(scope: scope) }
 
-    # PUBLIC
+    # Public: Generates a hashed representation of the initiative support.
     #
-    # Generates a hashed representation of the initiative support.
+    # Used when exporting the votes as CSV.
     def sha1
-      return unless decidim_user_group_id.nil?
-
       title = translated_attribute(initiative.title)
       description = translated_attribute(initiative.description)
 
       Digest::SHA1.hexdigest "#{authorization_unique_id}#{title}#{description}"
     end
 
+    def decrypted_metadata
+      @decrypted_metadata ||= encrypted_metadata ? encryptor.decrypt(encrypted_metadata) : {}
+    end
+
     private
 
+    def encryptor
+      @encryptor ||= Decidim::Initiatives::DataEncryptor.new(secret: "personal user metadata")
+    end
+
     def authorization_unique_id
       first_authorization = Decidim::Initiatives::UserAuthorizations
                             .for(author)
@@ -51,17 +57,7 @@ module Decidim
     end
 
     def update_counter_cache
-      initiative.initiative_votes_count = Decidim::InitiativesVote
-                                          .votes
-                                          .where(decidim_initiative_id: initiative.id)
-                                          .count
-
-      initiative.initiative_supports_count = Decidim::InitiativesVote
-                                             .supports
-                                             .where(decidim_initiative_id: initiative.id)
-                                             .count
-
-      initiative.save
+      initiative.update_online_votes_counters
     end
   end
 end

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

@@ -35,6 +35,7 @@ module Decidim
           initiative_type_scope_action?
           initiative_committee_action?
           initiative_admin_user_action?
+          initiative_export_action?
           moderator_action?
           allow! if permission_action.subject == :attachment
 
@@ -69,6 +70,8 @@ module Decidim
         def attachment_action?
           return unless permission_action.subject == :attachment
 
+          disallow! && return unless initiative.attachments_enabled?
+
           attachment = context.fetch(:attachment, nil)
           attached = attachment&.attached_to
 
@@ -144,18 +147,24 @@ module Decidim
           when :accept
             allowed = initiative.published? &&
                       initiative.signature_end_date < Date.current &&
-                      initiative.percentage >= 100
+                      initiative.supports_goal_reached?
             toggle_allow(allowed)
           when :reject
             allowed = initiative.published? &&
                       initiative.signature_end_date < Date.current &&
-                      initiative.percentage < 100
+                      !initiative.supports_goal_reached?
             toggle_allow(allowed)
+          when :send_to_technical_validation
+            toggle_allow(allowed_to_send_to_technical_validation?)
           else
             allow!
           end
         end
 
+        def initiative_export_action?
+          allow! if permission_action.subject == :initiatives && permission_action.action == :export
+        end
+
         def moderator_action?
           return unless permission_action.subject == :moderation
 
@@ -180,18 +189,20 @@ module Decidim
           when :update
             toggle_allow(initiative.created?)
           when :send_to_technical_validation
-            allowed = initiative.created? && (
-                        !initiative.created_by_individual? ||
-                        initiative.enough_committee_members?
-                      )
-
-            toggle_allow(allowed)
+            toggle_allow(allowed_to_send_to_technical_validation?)
           when :manage_membership
             toggle_allow(initiative.promoting_committee_enabled?)
           else
             disallow!
           end
         end
+
+        def allowed_to_send_to_technical_validation?
+          initiative.created? && (
+            !initiative.created_by_individual? ||
+            initiative.enough_committee_members?
+          )
+        end
       end
     end
   end

data/app/permissions/decidim/initiatives/permissions.rb

@@ -18,16 +18,18 @@ module Decidim
         list_public_initiatives?
         read_public_initiative?
         search_initiative_types_and_scopes?
+        request_membership?
 
         return permission_action unless user
 
         create_initiative?
-        request_membership?
 
         vote_initiative?
         sign_initiative?
         unvote_initiative?
 
+        initiative_attachment?
+
         permission_action
       end
 
@@ -37,6 +39,10 @@ module Decidim
         @initiative ||= context.fetch(:initiative, nil) || context.fetch(:current_participatory_space, nil)
       end
 
+      def initiative_type
+        @initiative_type ||= context[:initiative_type]
+      end
+
       def list_public_initiatives?
         allow! if permission_action.subject == :initiative &&
                   permission_action.action == :list
@@ -78,16 +84,28 @@ module Decidim
         return unless permission_action.subject == :initiative &&
                       permission_action.action == :request_membership
 
-        can_request = !initiative.published? &&
-                      initiative.promoting_committee_enabled? &&
-                      !initiative.has_authorship?(user) &&
-                      (
-                        Decidim::Initiatives.do_not_require_authorization ||
-                        UserAuthorizations.for(user).any? ||
-                        Decidim::UserGroups::ManageableUserGroups.for(user).verified.any?
-                      )
+        toggle_allow(can_request_membership?)
+      end
+
+      def can_request_membership?
+        return access_request_without_user? if user.blank?
+
+        access_request_membership?
+      end
 
-        toggle_allow(can_request)
+      def access_request_without_user?
+        !initiative.published? && initiative.promoting_committee_enabled? || Decidim::Initiatives.do_not_require_authorization
+      end
+
+      def access_request_membership?
+        !initiative.published? &&
+          initiative.promoting_committee_enabled? &&
+          !initiative.has_authorship?(user) &&
+          (
+            Decidim::Initiatives.do_not_require_authorization ||
+            UserAuthorizations.for(user).any? ||
+            Decidim::UserGroups::ManageableUserGroups.for(user).verified.any?
+          )
       end
 
       def has_initiatives?
@@ -124,13 +142,19 @@ module Decidim
 
         can_unvote = initiative.accepts_online_unvotes? &&
                      initiative.organization&.id == user.organization&.id &&
-                     initiative.votes.where(decidim_author_id: user.id, decidim_user_group_id: decidim_user_group_id).any? &&
-                     (can_user_support?(initiative) || Decidim::UserGroups::ManageableUserGroups.for(user).verified.any?) &&
+                     initiative.votes.where(author: user).any? &&
                      authorized?(:vote, resource: initiative, permissions_holder: initiative.type)
 
         toggle_allow(can_unvote)
       end
 
+      def initiative_attachment?
+        return unless permission_action.action == :add_attachment &&
+                      permission_action.subject == :initiative
+
+        toggle_allow(initiative_type.attachments_enabled?)
+      end
+
       def public_report_content_action?
         return unless permission_action.action == :create &&
                       permission_action.subject == :moderation
@@ -155,8 +179,7 @@ module Decidim
       def can_vote?
         initiative.votes_enabled? &&
           initiative.organization&.id == user.organization&.id &&
-          initiative.votes.where(decidim_author_id: user.id, decidim_user_group_id: decidim_user_group_id).empty? &&
-          (can_user_support?(initiative) || Decidim::UserGroups::ManageableUserGroups.for(user).verified.any?) &&
+          initiative.votes.where(author: user).empty? &&
           authorized?(:vote, resource: initiative, permissions_holder: initiative.type)
       end
 

data/app/presenters/decidim/initiatives/initiative_stats_presenter.rb

@@ -6,16 +6,12 @@ module Decidim
     class InitiativeStatsPresenter < Rectify::Presenter
       attribute :initiative, Decidim::Initiative
 
-      def supports_count
-        initiative.initiative_supports_count
-      end
-
       def comments_count
         Rails.cache.fetch(
           "initiative/#{initiative.id}/comments_count",
           expires_in: Decidim::Initiatives.stats_cache_expiration_time
         ) do
-          Decidim::Comments::Comment.where(root_commentable: initiative).count
+          initiative.comments_count
         end
       end
 

data/app/queries/decidim/initiatives/admin/manageable_initiatives.rb

@@ -7,57 +7,25 @@ module Decidim
       # Regular users will get only their initiatives. Administrators will
       # retrieve all initiatives.
       class ManageableInitiatives < Rectify::Query
-        attr_reader :organization, :user, :q, :state
-
         # Syntactic sugar to initialize the class and return the queried objects
         #
-        # organization - Decidim::Organization
-        # user         - Decidim::User
-        # query        - String
-        # state        - String
-        def self.for(organization, user, query, state)
-          new(organization, user, query, state).query
+        # user - Decidim::User
+        def self.for(user)
+          new(user).query
         end
 
         # Initializes the class.
         #
-        # organization - Decidim::Organization
-        # user         - Decidim::User
-        # query        - String
-        # state        - String
-        def initialize(organization, user, query, state)
-          @organization = organization
+        # user - Decidim::User
+        def initialize(user)
           @user = user
-          @q = query
-          @state = state
         end
 
         # Retrieves all initiatives / Initiatives created by the user.
         def query
-          if user.admin?
-            base = Initiative
-                   .where(organization: organization)
-                   .with_state(state)
-          else
-            ids = InitiativesCreated.by(user).with_state(state).pluck(:id)
-            ids += InitiativesPromoted.by(user).with_state(state).pluck(:id)
-            base = Initiative.where(id: ids)
-          end
-
-          return base if q.blank?
-
-          organization.available_locales.each_with_index do |loc, index|
-            base = if index.zero?
-                     base.where("title->>? ilike ?", loc, "%#{q}%")
-                         .or(Initiative.where("description->>? ilike ?", loc, "%#{q}%"))
-                   else
-                     base
-                       .or(Initiative.where("title->>? ilike ?", loc, "%#{q}%"))
-                       .or(Initiative.where("description->>? ilike ?", loc, "%#{q}%"))
-                   end
-          end
+          return Initiative.where(organization: @user.organization) if @user.admin?
 
-          base
+          Initiative.where(id: InitiativesCreated.by(@user) + InitiativesPromoted.by(@user))
         end
       end
     end

data/app/serializers/decidim/initiatives/initiative_serializer.rb

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Initiatives
+    class InitiativeSerializer < Decidim::Exporters::Serializer
+      # Serializes an inititative
+      def serialize
+        {
+          id: resource.id,
+          title: resource.title,
+          description: resource.description,
+          state: resource.state,
+          created_at: resource.created_at,
+          published_at: resource.published_at,
+          signature_end_date: resource.signature_end_date,
+          signature_type: resource.signature_type,
+          signatures: resource.supports_count,
+          scope: {
+            name: resource.scope&.name
+          },
+          type: {
+            title: resource.type&.title
+          },
+          authors: {
+            id: resource.author_users.map(&:id),
+            name: resource.author_users.map(&:name)
+          }
+        }
+      end
+    end
+  end
+end

data/app/services/decidim/initiatives/diff_renderer.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Initiatives
+    class DiffRenderer < BaseDiffRenderer
+      private
+
+      # Lists which attributes will be diffable and how they should be rendered.
+      def attribute_types
+        {
+          description: :i18n_html,
+          title: :i18n,
+          state: :string
+        }
+      end
+    end
+  end
+end

data/app/services/decidim/initiatives/initiative_search.rb

@@ -16,7 +16,9 @@ module Decidim
       def base_query
         Decidim::Initiative
           .includes(scoped_type: [:scope])
+          .joins("JOIN decidim_users ON decidim_users.id = decidim_initiatives.decidim_author_id")
           .where(organization: options[:organization])
+          .published
       end
 
       # Handle the search_text filter
@@ -29,22 +31,38 @@ module Decidim
               "%#{search_text}%"
             )
           )
+          .or(
+            query.where(
+              "cast(decidim_initiatives.id as text) ILIKE ?", "%#{search_text}%"
+            )
+          )
+          .or(
+            query.where(
+              "decidim_users.name ILIKE ? OR decidim_users.nickname ILIKE ?", "%#{search_text}%", "%#{search_text}%"
+            )
+          )
       end
 
       # Handle the state filter
       def search_state
-        case state
-        when "closed"
-          query.closed
-        else # Assume open
-          query.open
-        end
+        accepted = state.member?("accepted") ? query.accepted : nil
+        rejected = state.member?("rejected") ? query.rejected : nil
+        answered = state.member?("answered") ? query.answered : nil
+        open = state.member?("open") ? query.open : nil
+        closed = state.member?("closed") ? query.closed : nil
+
+        query
+          .where(id: accepted)
+          .or(query.where(id: rejected))
+          .or(query.where(id: answered))
+          .or(query.where(id: open))
+          .or(query.where(id: closed))
       end
 
-      def search_type
-        return query if type == "all"
+      def search_type_id
+        return query if type_ids.include?("all")
 
-        types = InitiativesTypeScope.where(decidim_initiatives_types_id: type).pluck(:id)
+        types = InitiativesTypeScope.where(decidim_initiatives_types_id: type_ids).pluck(:id)
 
         query.where(scoped_type: types)
       end
@@ -58,13 +76,39 @@ module Decidim
       end
 
       def search_scope_id
-        return if scope_id.nil?
+        return query if scope_ids.include?("all")
 
-        query
-          .joins(:scoped_type)
-          .where(
-            "decidim_initiatives_type_scopes.decidim_scopes_id": scope_id
-          )
+        clean_scope_ids = scope_ids
+
+        conditions = []
+        conditions << "decidim_initiatives_type_scopes.decidim_scopes_id IS NULL" if clean_scope_ids.delete("global")
+        conditions.concat(["? = ANY(decidim_scopes.part_of)"] * clean_scope_ids.count) if clean_scope_ids.any?
+
+        query.joins(:scoped_type).references(:decidim_scopes).where(conditions.join(" OR "), *clean_scope_ids.map(&:to_i))
+      end
+
+      def search_area_id
+        return query if area_ids.include?("all")
+
+        query.where(decidim_area_id: area_ids)
+      end
+
+      private
+
+      # Private: Returns an array with checked type ids.
+      def type_ids
+        [type_id].flatten
+      end
+
+      # Private: Returns an array with checked scope ids.
+      def scope_ids
+        [scope_id].flatten
+      end
+
+      # Private: Returns an array with checked area ids, handling area_types which are coded as its
+      # areas ids joined by _.
+      def area_ids
+        area_id.map { |id| id.split("_") }.flatten.uniq
       end
     end
   end