decidim-core 0.26.2 → 0.27.0.rc2

data/app/mailers/concerns/decidim/multitenant_asset_host.rb

@@ -18,15 +18,23 @@ module Decidim
       def set_asset_host
         return if Rails.application.config.action_mailer.asset_host.present?
 
-        self.asset_host = ->(_mail) { "#{protocol}://#{@organization.host}" }
+        self.asset_host = ->(_mail) { "#{protocol}://#{@organization.host}#{port_fragment}" }
       end
 
       private
 
       def protocol
-        return "https" if Decidim.force_ssl
+        asset_url_options.protocol
+      end
+
+      def port_fragment
+        return if asset_url_options.default_port?
+
+        ":#{asset_url_options.port}"
+      end
 
-        "http"
+      def asset_url_options
+        @asset_url_options ||= UrlOptionResolver.new
       end
     end
   end

data/app/mailers/decidim/application_mailer.rb

@@ -23,7 +23,7 @@ module Decidim
         port: @organization.smtp_settings["port"],
         user_name: @organization.smtp_settings["user_name"],
         password: Decidim::AttributeEncryptor.decrypt(@organization.smtp_settings["encrypted_password"])
-      ) { |_k, o, v| v.presence || o }.reject! { |_k, v| v.blank? }
+      ) { |_k, o, v| v.presence || o }.compact_blank!
     end
   end
 end

data/app/mailers/decidim/block_user_mailer.rb

@@ -5,17 +5,18 @@ module Decidim
   # when their account was blocked
   class BlockUserMailer < ApplicationMailer
     def notify(user, justification)
-      @user = user
-      @organization = user.organization
-      @justification = justification
-      mail(
-        to: user.email,
-        subject: I18n.t(
+      with_user(user) do
+        @user = user
+        @organization = user.organization
+        @justification = justification
+        subject = I18n.t(
           "decidim.block_user_mailer.notify.subject",
           organization_name: @organization.name,
           justification: @justification
         )
-      )
+
+        mail(to: user.email, subject: subject)
+      end
     end
   end
 end

data/app/mailers/decidim/export_mailer.rb

@@ -27,12 +27,12 @@ module Decidim
     end
 
     # Public: Sends a notification email with a link to retrieve
-    # the result of a data_portability export in a zipped file.
+    # the result of a download_your_data export in a zipped file.
     #
     # user - The user to be notified.
     #
     # Returns nothing.
-    def data_portability_export(user, filename, password)
+    def download_your_data_export(user, filename, password)
       @user = user
       @organization = user.organization
       @filename = filename

data/app/mailers/decidim/newsletter_mailer.rb

@@ -3,12 +3,12 @@
 module Decidim
   class NewsletterMailer < ApplicationMailer
     helper Decidim::SanitizeHelper
+    helper Decidim::TranslationsHelper
+
     include Decidim::NewslettersHelper
 
     layout "decidim/newsletter_base"
 
-    add_template_helper Decidim::TranslationsHelper
-
     helper_method :cell
 
     def newsletter(user, newsletter)

data/app/mailers/decidim/newsletters_opt_in_mailer.rb

@@ -2,14 +2,16 @@
 
 module Decidim
   # A custom mailer for Decidim so we can notify users to verify
-  # his own newsletter notifications settings. GDPR releated
+  # their own newsletter notifications settings. GDPR releated
   class NewslettersOptInMailer < ApplicationMailer
     def notify(user, token)
-      @user = user
-      @organization = user.organization
-      @token = token
+      with_user(user) do
+        @user = user
+        @organization = user.organization
+        @token = token
 
-      mail(to: user.email, subject: I18n.t("decidim.newsletters_opt_in_mailer.notify.subject", organization_name: @organization.name))
+        mail(to: user.email, subject: I18n.t("decidim.newsletters_opt_in_mailer.notify.subject", organization_name: @organization.name))
+      end
     end
   end
 end

data/app/mailers/decidim/notifications_digest_mailer.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+module Decidim
+  # A custom mailer for sending notifications to users when
+  # a events are received.
+  class NotificationsDigestMailer < Decidim::ApplicationMailer
+    helper Decidim::ResourceHelper
+    SIZE_LIMIT = 10
+
+    def digest_mail(user, notification_ids)
+      with_user(user) do
+        notifications = Decidim::Notification.where(id: notification_ids)
+        @user = user
+        @organization = user.organization
+        @notifications_digest = Decidim::NotificationsDigestPresenter.new(user)
+        @display_see_more_message = notifications.size > SIZE_LIMIT
+        @notifications = notifications[0...SIZE_LIMIT].map { |notification| Decidim::NotificationToMailerPresenter.new(notification) }
+
+        mail(to: user.email, subject: @notifications_digest.subject)
+      end
+    end
+  end
+end

data/app/mailers/decidim/user_report_mailer.rb

@@ -4,18 +4,17 @@ module Decidim
   # A custom mailer to notify Decidim users
   # that they have been reported
   class UserReportMailer < ApplicationMailer
-    def notify(admin, token, reason, user)
-      @user = user
-      @organization = user.organization
-      @token = token
-      @reason = reason
+    def notify(admin, report)
+      @report = report
       @admin = admin
-      mail(to: admin.email, subject: I18n.t(
-        "decidim.user_report_mailer.notify.subject",
-        organization_name: @organization.name,
-        reason: @reason,
-        token: @token
-      ))
+      @organization = report.moderation.user.organization
+      with_user(admin) do
+        mail(to: admin.email, subject: I18n.t(
+          "decidim.user_report_mailer.notify.subject",
+          organization_name: report.moderation.user.organization.name,
+          reason: @report.reason
+        ))
+      end
     end
   end
 end

data/app/models/decidim/action_log.rb

@@ -37,9 +37,57 @@ module Decidim
                class_name: "Decidim::Area",
                optional: true
 
-    validates :organization, :user, :action, presence: true
+    scope :with_resource_type, lambda { |resource_type_key|
+      if publicable_public_resource_types.include?(resource_type_key)
+        where(resource_type: resource_type_key).where.not(action: "create")
+      elsif public_resource_types.include?(resource_type_key)
+        where(resource_type: resource_type_key)
+      else
+        with_all_resources
+      end
+    }
+
+    scope :with_new_resource_type, lambda { |resource_type_key|
+      if publicable_public_resource_types.include?(resource_type_key)
+        where(resource_type: resource_type_key, action: "publish")
+      elsif public_resource_types.include?(resource_type_key)
+        where(resource_type: resource_type_key, action: "create")
+      else
+        with_all_new_resources
+      end
+    }
+
+    scope :with_private_resources, lambda {
+      where(
+        "(action <> ? AND resource_type IN (?)) OR (resource_type IN (?))",
+        "create",
+        publicable_public_resource_types,
+        (private_resource_types + public_resource_types - publicable_public_resource_types)
+      )
+    }
+
+    scope :with_all_resources, lambda {
+      where(
+        "(action <> ? AND resource_type IN (?)) OR (resource_type IN (?))",
+        "create",
+        publicable_public_resource_types,
+        (public_resource_types - publicable_public_resource_types)
+      )
+    }
+
+    scope :with_all_new_resources, lambda {
+      where(
+        "(action = ? AND resource_type IN (?)) OR (action = ? AND resource_type IN (?))",
+        "publish",
+        publicable_public_resource_types,
+        "create",
+        (public_resource_types - publicable_public_resource_types)
+      )
+    }
+
+    validates :action, presence: true
     validates :resource, presence: true, if: ->(log) { log.action != "delete" }
-    validates :visibility, presence: true, inclusion: { in: %w(admin-only public-only all) }
+    validates :visibility, presence: true, inclusion: { in: %w(private-only admin-only public-only all) }
 
     # To ensure records can't be deleted
     before_destroy { |_record| raise ActiveRecord::ReadOnlyRecord }
@@ -49,6 +97,42 @@ module Decidim
       where(visibility: %w(admin-only all))
     end
 
+    # All the resource types that are eligible to be included as an activity.
+    def self.public_resource_types
+      @public_resource_types ||= %w(
+        Decidim::Accountability::Result
+        Decidim::Blogs::Post
+        Decidim::Comments::Comment
+        Decidim::Consultations::Question
+        Decidim::Debates::Debate
+        Decidim::Meetings::Meeting
+        Decidim::Proposals::Proposal
+        Decidim::Surveys::Survey
+        Decidim::Assembly
+        Decidim::Consultation
+        Decidim::Initiative
+        Decidim::ParticipatoryProcess
+      ).select do |klass|
+        klass.safe_constantize.present?
+      end
+    end
+
+    def self.private_resource_types
+      @private_resource_types ||= %w(
+        Decidim::Budgets::Order
+      ).select do |klass|
+        klass.safe_constantize.present?
+      end
+    end
+
+    def self.publicable_public_resource_types
+      @publicable_public_resource_types ||= public_resource_types.select { |klass| klass.constantize.column_names.include?("published_at") }
+    end
+
+    def self.ransackable_scopes(_auth_object = nil)
+      [:with_resource_type]
+    end
+
     # Overwrites the method so that records cannot be modified.
     #
     # Returns a Boolean.
@@ -130,16 +214,16 @@ module Decidim
     end
 
     # Whether this activity or log is visible for a given user (can also be nil)
-    #
-    # Returns a True/False.
     def visible_for?(user)
-      return false if resource_lazy.blank?
-      return false if participatory_space_lazy.blank?
-      return false if resource_lazy.respond_to?(:deleted?) && resource_lazy.deleted?
-      return false if resource_lazy.respond_to?(:hidden?) && resource_lazy.hidden?
-      return false if resource_lazy.respond_to?(:can_participate?) && !resource_lazy.can_participate?(user)
-
-      true
+      resource_lazy.present? &&
+        participatory_space_lazy.present? &&
+        !resource_lazy.try(:deleted?) &&
+        !resource_lazy.try(:hidden?) &&
+        (!resource_lazy.respond_to?(:can_participate?) || resource_lazy.try(:can_participate?, user))
+    rescue NameError => e
+      Rails.logger.warn "Failed resource for #{self.class.name}(id=#{id}): #{e.message}"
+
+      false
     end
   end
 end

data/app/models/decidim/amendment.rb

@@ -8,7 +8,6 @@ module Decidim
     belongs_to :amender, foreign_key: "decidim_user_id", class_name: "Decidim::User"
     belongs_to :emendation, foreign_key: "decidim_emendation_id", foreign_type: "decidim_emendation_type", polymorphic: true
 
-    validates :amendable, :amender, :emendation, presence: true
     validates :state, presence: true, inclusion: { in: STATES }
 
     def draft?

data/app/models/decidim/area.rb

@@ -20,8 +20,7 @@ module Decidim
                inverse_of: :areas,
                optional: true
 
-    validates :name, :organization, presence: true
-    validates :name, uniqueness: { scope: [:organization, :area_type] }
+    validates :name, presence: true, uniqueness: { scope: [:organization, :area_type] }
 
     before_destroy :abort_if_dependencies
 

data/app/models/decidim/area_type.rb

@@ -5,6 +5,7 @@ module Decidim
   # (terriotrial, sectorial, etc.)
   class AreaType < ApplicationRecord
     include Decidim::TranslatableResource
+    include Decidim::Traceable
 
     translatable_fields :name, :plural
 
@@ -20,5 +21,9 @@ module Decidim
     def translated_name
       Decidim::AreaTypePresenter.new(self).translated_name
     end
+
+    def self.log_presenter_class_for(_log)
+      Decidim::AdminLog::AreaTypePresenter
+    end
   end
 end

data/app/models/decidim/attachment.rb

@@ -6,6 +6,8 @@ module Decidim
   class Attachment < ApplicationRecord
     include Decidim::HasUploadValidations
     include Decidim::TranslatableResource
+    include Traceable
+
     before_save :set_content_type_and_size, if: :attached?
 
     translatable_fields :title, :description
@@ -92,5 +94,9 @@ module Decidim
       self.content_type = file.content_type
       self.file_size = file.byte_size
     end
+
+    def self.log_presenter_class_for(_log)
+      Decidim::AdminLog::AttachmentPresenter
+    end
   end
 end

data/app/models/decidim/attachment_collection.rb

@@ -4,6 +4,7 @@ module Decidim
   # Categories serve as a taxonomy for attachments to use for while in the
   # context of a participatory space.
   class AttachmentCollection < ApplicationRecord
+    include Traceable
     include Decidim::TranslatableResource
 
     translatable_fields :name, :description
@@ -15,5 +16,9 @@ module Decidim
     def unused?
       attachments.empty?
     end
+
+    def self.log_presenter_class_for(_log)
+      Decidim::AdminLog::AttachmentCollectionPresenter
+    end
   end
 end

data/app/models/decidim/category.rb

@@ -5,8 +5,10 @@ module Decidim
   # context of a participatory process.
   class Category < ApplicationRecord
     include Decidim::TranslatableResource
+    include Decidim::FilterableResource
+    include Decidim::Traceable
 
-    translatable_fields :name, :description
+    translatable_fields :name
 
     belongs_to :participatory_space, foreign_key: "decidim_participatory_space_id", foreign_type: "decidim_participatory_space_type", polymorphic: true
     has_many :subcategories, foreign_key: "parent_id", class_name: "Decidim::Category", dependent: :destroy, inverse_of: :parent
@@ -38,11 +40,13 @@ module Decidim
       categorizations.empty?
     end
 
-    # Allow ransacker to search for a key in a hstore column (`name`.`en`)
-    ransacker :name do |parent|
-      Arel::Nodes::InfixOperation.new("->>", parent.table[:name], Arel::Nodes.build_quoted(I18n.locale.to_s))
+    def self.log_presenter_class_for(_log)
+      Decidim::AdminLog::CategoryPresenter
     end
 
+    # Allow ransacker to search for a key in a hstore column (`name`.`en`)
+    ransacker_i18n :name
+
     private
 
     # This is done since we only allow one level of subcategories.
@@ -55,6 +59,7 @@ module Decidim
 
     def subcategories_have_same_participatory_space
       return unless parent
+      return if participatory_space == parent.participatory_space
 
       self.participatory_space = parent.participatory_space
     end

data/app/models/decidim/coauthorship.rb

@@ -6,8 +6,6 @@ module Decidim
 
     belongs_to :coauthorable, polymorphic: true, counter_cache: true
 
-    validates :coauthorable, presence: true
-
     after_commit :author_is_follower, on: [:create]
 
     def identity

data/app/models/decidim/contextual_help_section.rb

@@ -3,13 +3,17 @@
 module Decidim
   class ContextualHelpSection < ApplicationRecord
     include Decidim::TranslatableResource
+    include Decidim::Traceable
 
     translatable_fields :content
 
     belongs_to :organization, class_name: "Decidim::Organization"
-    validates :organization, presence: true
     validates :content, presence: true
 
+    def self.log_presenter_class_for(_log)
+      Decidim::AdminLog::ContextualHelpSectionPresenter
+    end
+
     # Public: Finds content given an id
     #
     # organization - The Organization to scope the content to

data/app/models/decidim/follow.rb

@@ -2,7 +2,7 @@
 
 module Decidim
   class Follow < ApplicationRecord
-    include Decidim::DataPortability
+    include Decidim::DownloadYourData
 
     belongs_to :followable, foreign_key: "decidim_followable_id", foreign_type: "decidim_followable_type", polymorphic: true, counter_cache: true
     belongs_to :user, foreign_key: "decidim_user_id", class_name: "Decidim::User"
@@ -20,7 +20,7 @@ module Decidim
     end
 
     def self.export_serializer
-      Decidim::DataPortabilitySerializers::DataPortabilityFollowSerializer
+      Decidim::DownloadYourDataSerializers::DownloadYourDataFollowSerializer
     end
 
     def self.user_follower_ids_for_participatory_spaces(spaces)

data/app/models/decidim/gamification/badge_score.rb

@@ -6,7 +6,6 @@ module Decidim
       self.table_name = "decidim_gamification_badge_scores"
 
       belongs_to :user, class_name: "Decidim::UserBaseEntity"
-      validates :user, presence: true
       validates :value, numericality: { greater_than_or_equal_to: 0 }
     end
   end

data/app/models/decidim/identity.rb

@@ -3,7 +3,7 @@
 module Decidim
   # Store user's social identities
   class Identity < ApplicationRecord
-    include Decidim::DataPortability
+    include Decidim::DownloadYourData
 
     belongs_to :user, foreign_key: :decidim_user_id, class_name: "Decidim::User"
     belongs_to :organization, foreign_key: :decidim_organization_id, class_name: "Decidim::Organization"
@@ -18,7 +18,7 @@ module Decidim
     end
 
     def self.export_serializer
-      Decidim::DataPortabilitySerializers::DataPortabilityIdentitySerializer
+      Decidim::DownloadYourDataSerializers::DownloadYourDataIdentitySerializer
     end
 
     private

data/app/models/decidim/messaging/conversation.rb

@@ -10,7 +10,7 @@ module Decidim
     class Conversation < ApplicationRecord
       self.table_name = "decidim_messaging_conversations"
 
-      include Decidim::DataPortability
+      include Decidim::DownloadYourData
 
       has_many :participations, foreign_key: :decidim_conversation_id,
                                 class_name: "Decidim::Messaging::Participation",
@@ -110,7 +110,7 @@ module Decidim
       end
 
       #
-      # Given a user, returns her interlocutors in this conversation
+      # Given a user, returns their interlocutors in this conversation
       #
       # @param user [Decidim::User] The user to find interlocutors for
       #
@@ -121,7 +121,7 @@ module Decidim
       end
 
       #
-      # Given a user, returns if ALL the interlocutors allow her to join the conversation
+      # Given a user, returns if ALL the interlocutors allow the user to join the conversation
       #
       # @return Boolean
       #
@@ -173,7 +173,7 @@ module Decidim
       end
 
       def self.export_serializer
-        Decidim::DataPortabilitySerializers::DataPortabilityConversationSerializer
+        Decidim::DownloadYourDataSerializers::DownloadYourDataConversationSerializer
       end
     end
   end

data/app/models/decidim/messaging/message.rb

@@ -26,8 +26,7 @@ module Decidim
                foreign_key: :decidim_message_id,
                inverse_of: :message
 
-      validates :sender, :body, presence: true
-      validates :body, length: { maximum: ->(_message) { Decidim.config.maximum_conversation_message_length } }
+      validates :body, presence: true, length: { maximum: ->(_message) { Decidim.config.maximum_conversation_message_length } }
 
       default_scope { order(created_at: :asc) }
 

data/app/models/decidim/messaging/participation.rb

@@ -17,8 +17,6 @@ module Decidim
                  foreign_key: :decidim_participant_id,
                  class_name: "Decidim::UserBaseEntity"
 
-      validates :conversation, :participant, presence: true
-
       validates :decidim_conversation_id, uniqueness: { scope: :decidim_participant_id }
     end
   end

data/app/models/decidim/messaging/receipt.rb

@@ -13,8 +13,6 @@ module Decidim
       belongs_to :recipient, foreign_key: "decidim_recipient_id", class_name: "Decidim::User"
       belongs_to :message, foreign_key: "decidim_message_id", class_name: "Decidim::Messaging::Message"
 
-      validates :recipient, :message, presence: true
-
       scope :recipient, ->(recipient) { where(recipient: recipient) }
       scope :unread_by, ->(user) { recipient(user).unread }
       scope :unread, -> { where(read_at: nil) }

data/app/models/decidim/notification.rb

@@ -2,11 +2,23 @@
 
 module Decidim
   class Notification < ApplicationRecord
-    include Decidim::DataPortability
+    include Decidim::DownloadYourData
 
     belongs_to :resource, foreign_key: "decidim_resource_id", foreign_type: "decidim_resource_type", polymorphic: true
     belongs_to :user, foreign_key: "decidim_user_id", class_name: "Decidim::User"
 
+    # Daily notifications should contain all notifications within the previous
+    # day from the given day.
+    scope :daily, ->(time: Time.now.utc) { where(created_at: (time - 1.day).all_day) }
+
+    # Weekly notifications should contain all notifications within the previous
+    # week counting from the end of the previous day until the start of the day
+    # 1 week ago from the previous day.
+    scope :weekly, lambda { |time: Time.now.utc|
+      end_of_previous_day = (time - 1.day).end_of_day
+      where(created_at: (end_of_previous_day - 7.days).beginning_of_day..end_of_previous_day)
+    }
+
     def event_class_instance
       @event_class_instance ||= event_class.constantize.new(
         resource: resource,
@@ -26,7 +38,7 @@ module Decidim
     end
 
     def self.export_serializer
-      Decidim::DataPortabilitySerializers::DataPortabilityNotificationSerializer
+      Decidim::DownloadYourDataSerializers::DownloadYourDataNotificationSerializer
     end
   end
 end

data/app/models/decidim/oauth_application.rb

@@ -9,7 +9,18 @@ module Decidim
     belongs_to :organization, foreign_key: "decidim_organization_id", class_name: "Decidim::Organization", inverse_of: :oauth_applications
 
     has_one_attached :organization_logo
-    validates_upload :organization_logo, uploader: OAuthApplicationLogoUploader
+
+    # validates_upload cannot be used here because the file is not necessarily
+    # attached to any organization yet when creating a new OAuth application.
+    # The organization becomes mapped after the OAuth application is created
+    # but the logo needs to be uploaded in the front-end already before that.
+    validates(
+      :organization_logo,
+      file_size: { less_than_or_equal_to: ->(record) { record.maximum_upload_size } },
+      uploader_content_type: true,
+      uploader_image_dimensions: true
+    )
+    attached_config[:organization_logo] = OpenStruct.new(uploader: OAuthApplicationLogoUploader)
 
     def owner
       organization

data/app/models/decidim/organization.rb

@@ -22,12 +22,12 @@ module Decidim
 
     has_many :static_pages, foreign_key: "decidim_organization_id", class_name: "Decidim::StaticPage", inverse_of: :organization, dependent: :destroy
     has_many :static_page_topics, class_name: "Decidim::StaticPageTopic", inverse_of: :organization, dependent: :destroy
-    has_many :scopes, -> { order(name: :asc) }, foreign_key: "decidim_organization_id", class_name: "Decidim::Scope", inverse_of: :organization
-    has_many :scope_types, -> { order(name: :asc) }, foreign_key: "decidim_organization_id", class_name: "Decidim::ScopeType", inverse_of: :organization
-    has_many :areas, -> { order(name: :asc) }, foreign_key: "decidim_organization_id", class_name: "Decidim::Area", inverse_of: :organization
-    has_many :area_types, -> { order(name: :asc) }, foreign_key: "decidim_organization_id", class_name: "Decidim::AreaType", inverse_of: :organization
-    has_many :admins, -> { where(admin: true) }, foreign_key: "decidim_organization_id", class_name: "Decidim::User"
-    has_many :users_with_any_role, -> { where.not(roles: []) }, foreign_key: "decidim_organization_id", class_name: "Decidim::User"
+    has_many :scopes, -> { order(name: :asc) }, foreign_key: "decidim_organization_id", class_name: "Decidim::Scope", inverse_of: :organization, dependent: :destroy
+    has_many :scope_types, -> { order(name: :asc) }, foreign_key: "decidim_organization_id", class_name: "Decidim::ScopeType", inverse_of: :organization, dependent: :destroy
+    has_many :areas, -> { order(name: :asc) }, foreign_key: "decidim_organization_id", class_name: "Decidim::Area", inverse_of: :organization, dependent: :destroy
+    has_many :area_types, -> { order(name: :asc) }, foreign_key: "decidim_organization_id", class_name: "Decidim::AreaType", inverse_of: :organization, dependent: :destroy
+    has_many :admins, -> { where(admin: true) }, foreign_key: "decidim_organization_id", class_name: "Decidim::User", dependent: :destroy
+    has_many :users_with_any_role, -> { where.not(roles: []) }, foreign_key: "decidim_organization_id", class_name: "Decidim::User", dependent: :destroy
     has_many :users, foreign_key: "decidim_organization_id", class_name: "Decidim::User", dependent: :destroy
     has_many :user_entities, foreign_key: "decidim_organization_id", class_name: "Decidim::UserBaseEntity", dependent: :destroy
     has_many :oauth_applications, foreign_key: "decidim_organization_id", class_name: "Decidim::OAuthApplication", inverse_of: :organization, dependent: :destroy
@@ -146,7 +146,7 @@ module Decidim
     # Returns the presenter for this author, to be used in the views.
     # Required by ActsAsAuthor.
     def presenter
-      Decidim::Debates::OfficialAuthorPresenter.new
+      Decidim::OfficialAuthorPresenter.new
     end
 
     def static_pages_accessible_for(user)