decidim-core 0.15.2 → 0.16.0

data/app/commands/decidim/create_registration.rb

@@ -22,6 +22,8 @@ module Decidim
       create_user
 
       broadcast(:ok, @user)
+    rescue ActiveRecord::RecordInvalid
+      broadcast(:invalid)
     end
 
     private

data/app/commands/decidim/demote_membership.rb

@@ -46,7 +46,7 @@ module Decidim
         event: "decidim.events.groups.demoted_membership",
         event_class: DemotedMembershipEvent,
         resource: membership.user_group,
-        recipient_ids: [membership.user.id],
+        affected_users: [membership.user],
         extra: {
           user_group_name: membership.user_group.name,
           user_group_nickname: membership.user_group.nickname

data/app/commands/decidim/invite_user.rb

@@ -43,7 +43,7 @@ module Decidim
       @user = Decidim::User.new(
         name: form.name,
         email: form.email.downcase,
-        nickname: User.nicknamize(form.name, organization: form.organization),
+        nickname: UserBaseEntity.nicknamize(form.name, organization: form.organization),
         organization: form.organization,
         admin: form.role == "admin",
         roles: form.role == "admin" ? [] : [form.role].compact

data/app/commands/decidim/invite_user_to_group.rb

@@ -47,7 +47,7 @@ module Decidim
         event: "decidim.events.groups.invited_to_group",
         event_class: InvitedToGroupEvent,
         resource: user_group,
-        recipient_ids: [form.user.id],
+        affected_users: [form.user],
         extra: {
           user_group_name: user_group.name,
           user_group_nickname: user_group.nickname

data/app/commands/decidim/join_user_group.rb

@@ -46,18 +46,12 @@ module Decidim
         event: "decidim.events.groups.join_request_created",
         event_class: JoinRequestCreatedEvent,
         resource: user_group,
-        recipient_ids: [manager_ids],
+        affected_users: user_group.managers,
         extra: {
           user_group_name: user_group.name,
           user_group_nickname: user_group.nickname
         }
       )
     end
-
-    def manager_ids
-      Decidim::UserGroupMembership
-        .where(user_group: user_group, role: [:creator, :admin])
-        .pluck(:decidim_user_id)
-    end
   end
 end

data/app/commands/decidim/messaging/reply_to_conversation.rb

@@ -43,7 +43,7 @@ module Decidim
 
       def notify_interlocutors
         conversation.interlocutors(sender).each do |recipient|
-          ConversationMailer.new_message(sender, recipient, conversation).deliver_later if conversation.unread_count(recipient) == 1
+          ConversationMailer.new_message(sender, recipient, conversation, message).deliver_later if conversation.unread_count(recipient) == 1
         end
       end
 

data/app/commands/decidim/promote_membership.rb

@@ -44,7 +44,7 @@ module Decidim
         event: "decidim.events.groups.promoted_to_admin",
         event_class: PromotedToAdminEvent,
         resource: membership.user_group,
-        recipient_ids: [membership.user.id],
+        affected_users: [membership.user],
         extra: {
           user_group_name: membership.user_group.name,
           user_group_nickname: membership.user_group.nickname

data/app/commands/decidim/reject_user_group_join_request.rb

@@ -42,7 +42,7 @@ module Decidim
         event: "decidim.events.groups.join_request_rejected",
         event_class: JoinRequestRejectedEvent,
         resource: membership.user_group,
-        recipient_ids: [membership.user.id],
+        affected_users: [membership.user],
         extra: {
           user_group_name: membership.user_group.name,
           user_group_nickname: membership.user_group.nickname

data/app/commands/decidim/remove_user_from_group.rb

@@ -42,7 +42,7 @@ module Decidim
         event: "decidim.events.groups.removed_from_group",
         event_class: RemovedFromGroupEvent,
         resource: membership.user_group,
-        recipient_ids: [membership.user.id],
+        affected_users: [membership.user],
         extra: {
           user_group_name: membership.user_group.name,
           user_group_nickname: membership.user_group.nickname

data/app/commands/decidim/search.rb

@@ -3,19 +3,20 @@
 module Decidim
   # A command that will act as a search service, with all the business logic for performing searches.
   class Search < Rectify::Command
-    ACCEPTED_FILTERS = [:resource_type, :decidim_scope_id].freeze
-
-    attr_reader :term, :results
+    ACCEPTED_FILTERS = [:decidim_scope_id].freeze
+    HIGHLIGHTED_RESULTS_COUNT = 4
 
     # Public: Initializes the command.
     #
     # @param term: The term to search for.
     # @param organization: The Organization to which the results are constrained.
     # @param filters: (optional) A Hash of SearchableResource attributes to filter for.
-    def initialize(term, organization, filters = {})
+    # @param page_params: (optional) A Hash with `page` and `per_page` options to paginate.
+    def initialize(term, organization, filters = {}, page_params = {})
       @term = term
       @organization = organization
-      @filters = filters
+      @filters = filters.with_indifferent_access
+      @page_params = page_params
     end
 
     # Executes the command. Broadcasts these events:
@@ -25,23 +26,71 @@ module Decidim
     #
     # Returns nothing.
     def call
-      query = SearchableResource.where(organization: @organization, locale: I18n.locale)
-      @filters.each_pair do |attribute_name, value|
-        query = query.where(attribute_name => value) if permit_filter?(attribute_name, value)
+      search_results = Decidim::Searchable.searchable_resources.inject({}) do |results_by_type, (class_name, klass)|
+        result_ids = filtered_query_for(class_name).pluck(:resource_id)
+        results_count = result_ids.count
+
+        results = if filters[:resource_type].present? && filters[:resource_type] == class_name
+                    paginate(klass.order_by_id_list(result_ids))
+                  elsif filters[:resource_type].present?
+                    ApplicationRecord.none
+                  else
+                    klass.order_by_id_list(result_ids.take(HIGHLIGHTED_RESULTS_COUNT))
+                  end
+
+        results_by_type.update(class_name => {
+                                 count: results_count,
+                                 results: results
+                               })
       end
-      @results = if term.present?
-                   query.global_search(I18n.transliterate(term))
+      broadcast(:ok, search_results)
+    end
+
+    private
+
+    attr_reader :page_params, :filters, :organization, :term
+
+    def paginate(collection)
+      return collection if page_params.blank?
+      collection.page(page_params[:page]).per(page_params[:per_page])
+    end
+
+    def clean_filters
+      @clean_filters ||= filters.select do |attribute_name, value|
+        ACCEPTED_FILTERS.include?(attribute_name.to_sym) && value.present?
+      end.merge(decidim_participatory_space: spaces_to_filter).compact
+    end
+
+    def spaces_to_filter
+      return nil if filters[:space_state].blank?
+
+      Decidim.participatory_space_manifests.flat_map do |manifest|
+        public_spaces = manifest.participatory_spaces.call(organization).public_spaces
+        spaces = case filters[:space_state]
+                 when "active"
+                   public_spaces.active_spaces
+                 when "future"
+                   public_spaces.future_spaces
+                 when "past"
+                   public_spaces.past_spaces
                  else
-                   query.all
+                   public_spaces
                  end
-
-      broadcast(:ok, @results.order("datetime DESC"))
+        spaces.select(:id).to_a
+      end
     end
 
-    private
+    def filtered_query_for(class_name)
+      query = SearchableResource.where(organization: organization, locale: I18n.locale)
+      query = query.where(resource_type: class_name)
+
+      clean_filters.each_pair do |attribute_name, value|
+        query = query.where(attribute_name => value)
+      end
 
-    def permit_filter?(attribute_name, value)
-      ACCEPTED_FILTERS.include?(attribute_name.to_sym) && value.present?
+      query = query.order("datetime DESC")
+      query = query.global_search(I18n.transliterate(term)) if term.present?
+      query
     end
   end
 end

data/app/commands/decidim/update_account.rb

@@ -58,7 +58,7 @@ module Decidim
         event: "decidim.events.users.profile_updated",
         event_class: Decidim::ProfileUpdatedEvent,
         resource: @user,
-        recipient_ids: @user.followers.pluck(:id)
+        followers: @user.followers
       )
     end
   end

data/app/commands/decidim/update_notifications_settings.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Decidim
-  # This command updates the user's notifictions settings.
+  # This command updates the user's notifications settings.
   class UpdateNotificationsSettings < Rectify::Command
     # Updates a user's notifications settings.
     #
@@ -26,6 +26,7 @@ module Decidim
     def update_notifications_settings
       @user.email_on_notification = @form.email_on_notification
       @user.newsletter_notifications_at = @form.newsletter_notifications_at
+      @user.notification_types = @form.notification_types
     end
   end
 end

data/app/commands/decidim/update_user_interests.rb

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+module Decidim
+  # This command updates the user's interests.
+  class UpdateUserInterests < Rectify::Command
+    # Updates a user's intersts.
+    #
+    # user - The user to be updated.
+    # form - The form with the data.
+    def initialize(user, form)
+      @user = user
+      @form = form
+    end
+
+    def call
+      return broadcast(:invalid) unless @form.valid?
+
+      update_interests
+      @user.save!
+
+      broadcast(:ok)
+    end
+
+    private
+
+    def update_interests
+      @user.extended_data ||= {}
+      @user.extended_data["interested_scopes"] = selected_scopes_ids
+    end
+
+    def selected_scopes_ids
+      @form.scopes.select(&:checked).map(&:id)
+    end
+  end
+end

data/app/controllers/concerns/decidim/amendments_controller.rb

@@ -0,0 +1,104 @@
+# frozen_string_literal: true
+
+module Decidim
+  class AmendmentsController < Decidim::ApplicationController
+    include Decidim::ApplicationHelper
+    include FormFactory
+
+    before_action :authenticate_user!
+    helper_method :amendable, :emendation
+
+    def new
+      @form = Decidim::Amendable::CreateForm.from_params(params)
+    end
+
+    def create
+      @form = form(Decidim::Amendable::CreateForm).from_params(params)
+      enforce_permission_to :create, :amendment
+
+      Decidim::Amendable::Create.call(@form) do
+        on(:ok) do
+          flash[:notice] = t("created.success", scope: "decidim.amendments")
+          redirect_to Decidim::ResourceLocatorPresenter.new(@amendable).path
+        end
+
+        on(:invalid) do
+          flash[:alert] = t("created.error", scope: "decidim.amendments")
+          redirect_to new_amend_path(amendable_gid: @form.amendable_gid)
+        end
+      end
+    end
+
+    def reject
+      @form = form(Decidim::Amendable::RejectForm).from_params(params)
+      enforce_permission_to :reject, :amendment, amendment: @form.amendable
+
+      Decidim::Amendable::Reject.call(@form) do
+        on(:ok) do
+          flash[:notice] = t("rejected.success", scope: "decidim.amendments")
+        end
+
+        on(:invalid) do
+          flash[:alert] = t("rejected.error", scope: "decidim.amendments")
+        end
+        redirect_to Decidim::ResourceLocatorPresenter.new(@emendation).path
+      end
+    end
+
+    def promote
+      @form = Decidim::Amendable::PromoteForm.from_params(params)
+      enforce_permission_to :promote, :amendment, amendment: @form.emendation
+
+      Decidim::Amendable::Promote.call(@form) do
+        on(:ok) do |proposal|
+          flash[:notice] = I18n.t("promoted.success", scope: "decidim.amendments")
+          redirect_to Decidim::ResourceLocatorPresenter.new(proposal).path
+        end
+
+        on(:invalid) do
+          flash.now[:alert] = t("promoted.error", scope: "decidim.amendments")
+          redirect_to Decidim::ResourceLocatorPresenter.new(@emendation).path
+        end
+      end
+    end
+
+    def review
+      @form = Decidim::Amendable::ReviewForm.from_params(params)
+    end
+
+    def accept
+      @form = Decidim::Amendable::ReviewForm.from_params(params)
+      enforce_permission_to :accept, :amendment, amendment: @form.amendable
+
+      Decidim::Amendable::Accept.call(@form) do
+        on(:ok) do
+          flash[:notice] = t("accepted.success", scope: "decidim.amendments")
+          redirect_to Decidim::ResourceLocatorPresenter.new(@emendation).path
+        end
+
+        on(:invalid) do
+          flash[:alert] = t("accepted.error", scope: "decidim.amendments")
+          redirect_to review_amend_path(id: params[:id])
+        end
+      end
+    end
+
+    private
+
+    def amendable_gid
+      params[:amendable_gid]
+    end
+
+    def amendable
+      @amendable ||= if params[:amendable_gid]
+                       present(GlobalID::Locator.locate_signed(amendable_gid))
+                     else
+                       Decidim::Amendment.find_by(decidim_emendation_id: params[:id]).amendable
+                     end
+    end
+
+    def emendation
+      @emendation ||= present(Decidim::Amendment.find(params[:id]).emendation)
+    end
+  end
+end

data/app/controllers/concerns/decidim/participatory_space_context.rb

@@ -25,12 +25,11 @@ module Decidim
     included do
       include Decidim::NeedsOrganization
 
-      helper ParticipatorySpaceHelpers, IconHelper
+      helper ParticipatorySpaceHelpers, IconHelper, ContextualHelpHelper
       helper_method :current_participatory_space
       helper_method :current_participatory_space_manifest
       helper_method :current_participatory_space_context
-
-      delegate :manifest, to: :current_participatory_space, prefix: true
+      helper_method :help_section, :help_id
     end
 
     private
@@ -43,6 +42,17 @@ module Decidim
       raise NotImplementedError
     end
 
+    def current_participatory_space_manifest
+      return current_participatory_space.manifest if current_participatory_space
+
+      manifest = Decidim.find_participatory_space_manifest(
+        self.class.name.demodulize.underscore.gsub("_controller", "")
+      )
+
+      raise NotImplementedError unless manifest
+      manifest
+    end
+
     def authorize_participatory_space
       enforce_permission_to :read, :participatory_space, current_participatory_space: current_participatory_space
     end
@@ -53,11 +63,12 @@ module Decidim
 
     # Method for current user can visit the space (assembly or proces)
     def current_user_can_visit_space?
-      (current_participatory_space.try(:private_space?) &&
-       current_participatory_space.users.include?(current_user)) ||
+      current_user&.admin ||
+        (current_participatory_space.try(:private_space?) &&
+         current_participatory_space.users.include?(current_user)) ||
         !current_participatory_space.try(:private_space?) ||
         (current_participatory_space.try(:private_space?) &&
-        current_participatory_space.try(:is_transparent?))
+         current_participatory_space.try(:is_transparent?))
     end
 
     def check_current_user_can_visit_space
@@ -65,5 +76,16 @@ module Decidim
       flash[:alert] = I18n.t("participatory_space_private_users.not_allowed", scope: "decidim")
       redirect_to action: "index"
     end
+
+    def help_section
+      @help_section ||= Decidim::ContextualHelpSection.find_content(
+        current_organization,
+        help_id
+      )
+    end
+
+    def help_id
+      @help_id ||= current_participatory_space_manifest.name
+    end
   end
 end

data/app/controllers/concerns/decidim/user_groups.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+require "active_support/concern"
+
+module Decidim
+  # The UserGroups concern must be included in all controllers related
+  # to UserGroups feature. It adds a method to enforce that the feature
+  # is enabled.
+  module UserGroups
+    extend ActiveSupport::Concern
+
+    included do
+      delegate :user_groups, to: :current_user, prefix: false
+      delegate :user_groups_enabled?, to: :current_organization
+
+      helper_method :user_groups, :user_groups_enabled?
+    end
+
+    def enforce_user_groups_enabled
+      raise Decidim::ActionForbidden unless current_organization.user_groups_enabled?
+    end
+  end
+end