decidim-meetings 0.26.5 → 0.27.0.rc1

data/app/controllers/decidim/meetings/directory/meetings_controller.rb

@@ -15,34 +15,39 @@ module Decidim
         helper Decidim::FiltersHelper
         helper Decidim::Meetings::MapHelper
         helper Decidim::ResourceHelper
+        helper Decidim::ShortLinkHelper
 
         helper_method :meetings, :search
 
         def calendar
-          render plain: CalendarRenderer.for(current_organization), content_type: "type/calendar"
+          render plain: CalendarRenderer.for(current_organization, params[:filter]), content_type: "type/calendar"
         end
 
         private
 
         def meetings
-          is_past_meetings = params.dig("filter", "date")&.include?("past")
-          @meetings ||= paginate(search.results.order(start_time: is_past_meetings ? :desc : :asc))
+          @meetings ||= paginate(search.result)
         end
 
-        def search_klass
-          ::Decidim::Meetings::Directory::MeetingSearch
+        def search_collection
+          Meeting.where(component: meeting_components).published.not_hidden.visible_for(current_user).with_availability(
+            filter_params[:availability]
+          ).includes(
+            :component,
+            attachments: :file_attachment
+          )
         end
 
         def default_filter_params
           {
-            date: "upcoming",
-            search_text: "",
+            with_any_date: "upcoming",
+            title_or_description_cont: "",
             activity: "all",
-            scope_id: default_filter_scope_params,
-            space: default_filter_space_params,
-            type: default_filter_type_params,
-            origin: default_filter_origin_params,
-            category_id: default_filter_category_params
+            with_any_scope: default_filter_scope_params,
+            with_any_space: default_filter_space_params,
+            with_any_type: default_filter_type_params,
+            with_any_origin: default_filter_origin_params,
+            with_any_global_category: default_filter_category_params
           }
         end
 
@@ -69,10 +74,6 @@ module Decidim
           %w(all global) + current_organization.scopes.pluck(:id).map(&:to_s)
         end
 
-        def context_params
-          { component: meeting_components, organization: current_organization, current_user: current_user }
-        end
-
         def meeting_components
           @meeting_components ||= Decidim::Component
                                   .where(manifest_name: "meetings")

data/app/controllers/decidim/meetings/meetings_controller.rb

@@ -13,6 +13,7 @@ module Decidim
 
       helper Decidim::WidgetUrlsHelper
       helper Decidim::ResourceVersionsHelper
+      helper Decidim::ShortLinkHelper
 
       helper_method :meetings, :meeting, :registration, :search
 
@@ -41,13 +42,13 @@ module Decidim
       end
 
       def index
-        return unless search.results.blank? && params.dig("filter", "date") != %w(past)
+        return unless search.result.blank? && params.dig("filter", "date") != %w(past)
 
-        @past_meetings = search_klass.new(search_params.merge(date: %w(past)))
+        @past_meetings ||= search_with(filter_params.merge(with_any_date: %w(past)))
 
-        if @past_meetings.results.present?
+        if @past_meetings.result.present?
           params[:filter] ||= {}
-          params[:filter][:date] = %w(past)
+          params[:filter][:with_any_date] = %w(past)
           @forced_past_meetings = true
           @search = @past_meetings
         end
@@ -108,16 +109,20 @@ module Decidim
       end
 
       def meetings
-        is_past_meetings = params.dig("filter", "date")&.include?("past")
-        @meetings ||= paginate(search.results.order(start_time: is_past_meetings ? :desc : :asc))
+        @meetings ||= paginate(search.result.order(start_time: :desc))
       end
 
       def registration
         @registration ||= meeting.registrations.find_by(user: current_user)
       end
 
-      def search_klass
-        MeetingSearch
+      def search_collection
+        Meeting.where(component: current_component).published.not_hidden.visible_for(current_user).with_availability(
+          filter_params[:with_availability]
+        ).includes(
+          :component,
+          attachments: :file_attachment
+        )
       end
 
       def meeting_form
@@ -126,14 +131,15 @@ module Decidim
 
       def default_filter_params
         {
-          search_text: "",
-          date: "upcoming",
+          search_text_cont: "",
+          with_any_date: %w(upcoming),
           activity: "all",
-          scope_id: default_filter_scope_params,
-          category_id: default_filter_category_params,
-          state: nil,
-          origin: default_filter_origin_params,
-          type: default_filter_type_params
+          with_availability: "",
+          with_any_scope: default_filter_scope_params,
+          with_any_category: default_filter_category_params,
+          with_any_state: nil,
+          with_any_origin: default_filter_origin_params,
+          with_any_type: default_filter_type_params
         }
       end
     end

data/app/events/decidim/meetings/meeting_registration_notification_event.rb

@@ -6,7 +6,7 @@ module Decidim
       include Decidim::Events::NotificationEvent
 
       def notification_title
-        I18n.t("notification_title", i18n_options).html_safe
+        I18n.t("notification_title", **i18n_options).html_safe
       end
 
       def i18n_options

data/app/forms/decidim/meetings/admin/close_meeting_form.rb

@@ -16,7 +16,7 @@ module Decidim
         attribute :attending_organizations, String
         attribute :proposal_ids, Array[Integer]
         attribute :proposals
-        attribute :closed_at, Decidim::Attributes::TimeWithZone, default: ->(_form, _attribute) { Time.current }
+        attribute :closed_at, Decidim::Attributes::TimeWithZone, default: -> { Time.current }
 
         validates :closing_report, translatable_presence: true
         validates :attendees_count, presence: true, numericality: { greater_than_or_equal_to: 0, less_than_or_equal_to: 999, only_integer: true }

data/app/forms/decidim/meetings/admin/meeting_copy_form.rb

@@ -0,0 +1,51 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Meetings
+    module Admin
+      # A form object used to copy a meeting from the admin
+      # dashboard.
+      #
+      class MeetingCopyForm < ::Decidim::Meetings::BaseMeetingForm
+        include TranslatableAttributes
+
+        translatable_attribute :title, String
+        translatable_attribute :description, String
+        translatable_attribute :location, String
+        translatable_attribute :location_hints, String
+
+        attribute :show_embedded_iframe, Boolean, default: false
+        attribute :private_meeting, Boolean
+        attribute :transparent, Boolean
+        attribute :services, Array[MeetingServiceForm]
+
+        mimic :meeting
+
+        validates :online_meeting_url, url: true, if: ->(form) { form.online_meeting? || form.hybrid_meeting? }
+        validates :title, translatable_presence: true
+        validates :description, translatable_presence: true
+        validates :location, translatable_presence: true, if: ->(form) { form.in_person_meeting? || form.hybrid_meeting? }
+
+        def map_model(model)
+          self.services = model.services.map do |service|
+            MeetingServiceForm.new(service.attributes)
+          end
+        end
+
+        def services_to_persist
+          services.reject(&:deleted)
+        end
+
+        def number_of_services
+          services.size
+        end
+
+        alias component current_component
+
+        def questionnaire
+          Decidim::Forms::Questionnaire.new
+        end
+      end
+    end
+  end
+end

data/app/forms/decidim/meetings/admin/meeting_form.rb

@@ -14,7 +14,6 @@ module Decidim
         attribute :transparent, Boolean
         attribute :registration_type, String
         attribute :registration_url, String
-        attribute :available_slots, Integer, default: 0
         attribute :customize_registration_email, Boolean
         attribute :iframe_embed_type, String, default: "none"
         attribute :comments_enabled, Boolean, default: true
@@ -26,13 +25,11 @@ module Decidim
         translatable_attribute :description, String
         translatable_attribute :location, String
         translatable_attribute :location_hints, String
-        translatable_attribute :registration_email_custom_content, String
 
         validates :iframe_embed_type, inclusion: { in: Decidim::Meetings::Meeting.iframe_embed_types }
         validates :title, translatable_presence: true
         validates :description, translatable_presence: true
         validates :registration_type, presence: true
-        validates :available_slots, numericality: { greater_than_or_equal_to: 0 }, presence: true, if: ->(form) { form.on_this_platform? }
         validates :registration_url, presence: true, url: true, if: ->(form) { form.on_different_platform? }
         validates :type_of_meeting, presence: true
         validates :location, translatable_presence: true, if: ->(form) { form.in_person_meeting? || form.hybrid_meeting? }
@@ -75,14 +72,14 @@ module Decidim
         #
         # Returns a Decidim::Scope
         def scope
-          @scope ||= @decidim_scope_id ? current_component.scopes.find_by(id: @decidim_scope_id) : current_component.scope
+          @scope ||= @attributes["decidim_scope_id"].value ? current_component.scopes.find_by(id: @attributes["decidim_scope_id"].value) : current_component.scope
         end
 
         # Scope identifier
         #
         # Returns the scope identifier related to the meeting
         def decidim_scope_id
-          @decidim_scope_id || scope&.id
+          super || scope&.id
         end
 
         def category
@@ -95,6 +92,15 @@ module Decidim
           type_of_meeting.presence
         end
 
+        def type_of_meeting_select
+          Decidim::Meetings::Meeting::TYPE_OF_MEETING.map do |type|
+            [
+              I18n.t("type_of_meeting.#{type}", scope: "decidim.meetings"),
+              type
+            ]
+          end
+        end
+
         def iframe_access_level_select
           Decidim::Meetings::Meeting.iframe_access_levels.map do |level, _value|
             [
@@ -113,11 +119,6 @@ module Decidim
           end
         end
 
-        # Support for copy meeting
-        def questionnaire
-          Decidim::Forms::Questionnaire.new
-        end
-
         def on_this_platform?
           registration_type == "on_this_platform"
         end

data/app/forms/decidim/meetings/admin/meeting_registration_invite_form.rb

@@ -12,7 +12,7 @@ module Decidim
         attribute :existing_user, Boolean, default: false
 
         validates :name, presence: true, unless: proc { |object| object.existing_user }
-        validates :email, presence: true, 'valid_email_2/email': { disposable: true }, unless: proc { |object| object.existing_user }
+        validates :email, presence: true, "valid_email_2/email": { disposable: true }, unless: proc { |object| object.existing_user }
         validates :user, presence: true, if: proc { |object| object.existing_user }
 
         def user

data/app/forms/decidim/meetings/admin/meeting_registrations_form.rb

@@ -11,9 +11,12 @@ module Decidim
 
         attribute :registrations_enabled, Boolean
         attribute :registration_form_enabled, Boolean
+        attribute :customize_registration_email, Boolean
         attribute :available_slots, Integer
         attribute :reserved_slots, Integer
+
         translatable_attribute :registration_terms, String
+        translatable_attribute :registration_email_custom_content, String
 
         validates :registration_terms, translatable_presence: true, if: ->(form) { form.registrations_enabled? }
         validates :available_slots, :reserved_slots, presence: true, if: ->(form) { form.registrations_enabled? }

data/app/forms/decidim/meetings/answer_form.rb

@@ -10,7 +10,6 @@ module Decidim
       attribute :body, String
       attribute :choices, Array[AnswerChoiceForm]
       attribute :current_user, Decidim::User
-      attribute :answer, Decidim::Meetings::Answer
 
       validates :selected_choices, presence: true
       validate :max_choices, if: -> { question.max_choices }

data/app/forms/decidim/meetings/close_meeting_form.rb

@@ -7,7 +7,7 @@ module Decidim
       attribute :closing_report, String
       attribute :proposal_ids, Array[Integer]
       attribute :proposals
-      attribute :closed_at, Decidim::Attributes::TimeWithZone, default: ->(_form, _attribute) { Time.current }
+      attribute :closed_at, Decidim::Attributes::TimeWithZone, default: -> { Time.current }
       attribute :attendees_count, Integer, default: 0
 
       validates :closing_report, presence: true

data/app/forms/decidim/meetings/meeting_form.rb

@@ -60,14 +60,14 @@ module Decidim
       #
       # Returns a Decidim::Scope
       def scope
-        @scope ||= @decidim_scope_id ? current_component.scopes.find_by(id: @decidim_scope_id) : current_component.scope
+        @scope ||= @attributes["decidim_scope_id"].value ? current_component.scopes.find_by(id: @attributes["decidim_scope_id"].value) : current_component.scope
       end
 
       # Scope identifier
       #
       # Returns the scope identifier related to the meeting
       def decidim_scope_id
-        @decidim_scope_id || scope&.id
+        super || scope&.id
       end
 
       def category

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

@@ -16,7 +16,7 @@ module Decidim
       def filter_origin_values
         origin_values = []
         origin_values << TreePoint.new("official", t("decidim.meetings.meetings.filters.origin_values.official"))
-        origin_values << TreePoint.new("citizens", t("decidim.meetings.meetings.filters.origin_values.citizens")) # todo
+        origin_values << TreePoint.new("participants", t("decidim.meetings.meetings.filters.origin_values.participants")) # todo
         if current_organization.user_groups_enabled?
           origin_values << TreePoint.new("user_group", t("decidim.meetings.meetings.filters.origin_values.user_groups")) # todo
         end
@@ -41,11 +41,13 @@ module Decidim
       end
 
       def filter_date_values
-        [
-          ["all", t("decidim.meetings.meetings.filters.date_values.all")],
-          ["upcoming", t("decidim.meetings.meetings.filters.date_values.upcoming")],
-          ["past", t("decidim.meetings.meetings.filters.date_values.past")]
-        ]
+        TreeNode.new(
+          TreePoint.new("", t("decidim.meetings.meetings.filters.date_values.all")),
+          [
+            TreePoint.new("upcoming", t("decidim.meetings.meetings.filters.date_values.upcoming")),
+            TreePoint.new("past", t("decidim.meetings.meetings.filters.date_values.past"))
+          ]
+        )
       end
 
       # Options to filter meetings by activity.

data/app/helpers/decidim/meetings/directory/application_helper.rb

@@ -27,11 +27,13 @@ module Decidim
         end
 
         def filter_date_values
-          [
-            ["all", t("decidim.meetings.meetings.filters.date_values.all")],
-            ["upcoming", t("decidim.meetings.meetings.filters.date_values.upcoming")],
-            ["past", t("decidim.meetings.meetings.filters.date_values.past")]
-          ]
+          TreeNode.new(
+            TreePoint.new("", t("decidim.meetings.meetings.filters.date_values.all")),
+            [
+              TreePoint.new("upcoming", t("decidim.meetings.meetings.filters.date_values.upcoming")),
+              TreePoint.new("past", t("decidim.meetings.meetings.filters.date_values.past"))
+            ]
+          )
         end
 
         def directory_filter_scopes_values
@@ -107,7 +109,7 @@ module Decidim
         def directory_filter_origin_values
           origin_values = []
           origin_values << TreePoint.new("official", t("decidim.meetings.meetings.filters.origin_values.official"))
-          origin_values << TreePoint.new("citizens", t("decidim.meetings.meetings.filters.origin_values.citizens"))
+          origin_values << TreePoint.new("participants", t("decidim.meetings.meetings.filters.origin_values.participants"))
           origin_values << TreePoint.new("user_group", t("decidim.meetings.meetings.filters.origin_values.user_groups")) if current_organization.user_groups_enabled?
 
           TreeNode.new(

data/app/helpers/decidim/meetings/meetings_helper.rb

@@ -30,12 +30,10 @@ module Decidim
       # Returns a String.
       def meeting_type_badge_css_class(type)
         case type
-        when "private"
+        when "private", "withdraw"
           "alert"
         when "transparent"
           "secondary"
-        when "withdraw"
-          "alert"
         end
       end
 

data/app/jobs/decidim/meetings/send_close_meeting_reminder_job.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Meetings
+    class SendCloseMeetingReminderJob < ApplicationJob
+      queue_as :close_meeting_reminder
+
+      def perform(record)
+        return if record.remindable.closed?
+
+        ::Decidim::ReminderDelivery.create(reminder: record.reminder)
+        ::Decidim::Meetings::CloseMeetingReminderMailer.close_meeting_reminder(record).deliver_now
+        record.update(state: "completed")
+      end
+    end
+  end
+end

data/app/mailers/decidim/meetings/close_meeting_reminder_mailer.rb

@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Meetings
+    # A custom mailer for sending notifications for overdue meetings
+    class CloseMeetingReminderMailer < Decidim::ApplicationMailer
+      include Decidim::TranslationsHelper
+      include ActionView::Helpers::SanitizeHelper
+      include Decidim::ApplicationHelper
+
+      helper Decidim::ResourceHelper
+      helper Decidim::TranslationsHelper
+      helper Decidim::ApplicationHelper
+
+      helper_method :routes
+
+      # Send the user an email reminder to close the meetings
+      #
+      # record - the reminder record specific to a past meeting.
+      def close_meeting_reminder(record)
+        @reminder = record.reminder
+        @user = record.reminder.user
+        with_user(@user) do
+          @meeting = record.remindable
+          @organization = @user.organization
+          mail(
+            to: @user.email,
+            subject: I18n.t(
+              "decidim.meetings.close_meeting_reminder_mailer.close_meeting_reminder.subject",
+              organization_name: @organization.name
+            )
+          )
+        end
+      end
+
+      private
+
+      def routes
+        @routes ||= Decidim::EngineRouter.main_proxy(@reminder.component)
+      end
+    end
+  end
+end

data/app/models/decidim/meetings/agenda_item.rb

@@ -11,7 +11,7 @@ module Decidim
 
       translatable_fields :title, :description
 
-      belongs_to :agenda, foreign_key: "decidim_agenda_id", class_name: "Decidim::Meetings::Agenda"
+      belongs_to :agenda, -> { order(:position) }, foreign_key: "decidim_agenda_id", class_name: "Decidim::Meetings::Agenda"
 
       has_many :agenda_item_children, foreign_key: "parent_id", class_name: "Decidim::Meetings::AgendaItem", inverse_of: :parent, dependent: :destroy
       belongs_to :parent, class_name: "Decidim::Meetings::AgendaItem", inverse_of: :agenda_item_children, optional: true

data/app/models/decidim/meetings/answer.rb

@@ -4,7 +4,7 @@ module Decidim
   module Meetings
     # The data store for an Answer in the Decidim::Meetings
     class Answer < Meetings::ApplicationRecord
-      include Decidim::DataPortability
+      include Decidim::DownloadYourData
 
       belongs_to :user, class_name: "Decidim::User", foreign_key: "decidim_user_id", optional: true
       belongs_to :questionnaire, class_name: "Decidim::Meetings::Questionnaire", foreign_key: "decidim_questionnaire_id"
@@ -24,7 +24,7 @@ module Decidim
       end
 
       def self.export_serializer
-        Decidim::Meetings::DataPortabilityUserAnswersSerializer
+        Decidim::Meetings::DownloadYourDataUserAnswersSerializer
       end
 
       def organization

data/app/models/decidim/meetings/invite.rb

@@ -6,7 +6,7 @@ module Decidim
     class Invite < Meetings::ApplicationRecord
       include Decidim::Traceable
       include Decidim::Loggable
-      include Decidim::DataPortability
+      include Decidim::DownloadYourData
 
       belongs_to :meeting, foreign_key: "decidim_meeting_id", class_name: "Decidim::Meetings::Meeting"
       belongs_to :user, foreign_key: "decidim_user_id", class_name: "Decidim::User"
@@ -14,7 +14,7 @@ module Decidim
       validates :user, uniqueness: { scope: :meeting }
 
       def self.export_serializer
-        Decidim::Meetings::DataPortabilityInviteSerializer
+        Decidim::Meetings::DownloadYourDataInviteSerializer
       end
 
       def self.log_presenter_class_for(_log)

data/app/models/decidim/meetings/meeting.rb

@@ -25,6 +25,7 @@ module Decidim
       include Decidim::Authorable
       include Decidim::TranslatableResource
       include Decidim::Publicable
+      include Decidim::FilterableResource
 
       TYPE_OF_MEETING = %w(in_person online hybrid).freeze
       REGISTRATION_TYPE = %w(registration_disabled on_this_platform on_different_platform).freeze
@@ -59,16 +60,31 @@ module Decidim
       scope :upcoming, -> { where(arel_table[:end_time].gteq(Time.current)) }
       scope :withdrawn, -> { where(state: "withdrawn") }
       scope :except_withdrawn, -> { where.not(state: "withdrawn").or(where(state: nil)) }
+      scope :with_availability, lambda { |state_key|
+        case state_key
+        when "withdrawn"
+          withdrawn
+        else
+          except_withdrawn
+        end
+      }
+      scope_search_multi :with_any_date, [:upcoming, :past]
+      scope :with_any_space, lambda { |*target_space|
+        target_spaces = target_space.compact.compact_blank
+
+        return self if target_spaces.blank? || target_spaces.include?("all")
 
-      scope :visible_meeting_for, lambda { |user|
+        joins(:component).where(
+          decidim_components: { participatory_space_type: target_spaces.map(&:classify) }
+        )
+      }
+
+      scope :visible_for, lambda { |user|
         (all.distinct if user&.admin?) ||
           if user.present?
-            spaces = Decidim.participatory_space_registry.manifests.filter_map do |manifest|
-              table_name = manifest.model_class_name.constantize.try(:table_name)
-              next if table_name.blank?
-
+            spaces = Decidim.participatory_space_registry.manifests.map do |manifest|
               {
-                name: table_name.singularize,
+                name: manifest.model_class_name.constantize.table_name.singularize,
                 class_name: manifest.model_class_name
               }
             end
@@ -112,6 +128,10 @@ module Decidim
 
       scope :visible, -> { where("decidim_meetings_meetings.private_meeting != ? OR decidim_meetings_meetings.transparent = ?", true, true) }
 
+      scope :authored_by, ->(author) { where(decidim_author_id: author) }
+
+      scope_search_multi :with_any_type, TYPE_OF_MEETING.map(&:to_sym)
+
       TYPE_OF_MEETING.each do |type|
         scope type.to_sym, -> { where(type_of_meeting: type.to_sym) }
         scope "not_#{type}".to_sym, -> { where.not(type_of_meeting: type.to_sym) }
@@ -218,7 +238,7 @@ module Decidim
       end
 
       def current_user_can_visit_meeting?(user)
-        Decidim::Meetings::Meeting.visible_meeting_for(user).exists?(id: id)
+        Decidim::Meetings::Meeting.visible_for(user).exists?(id: id)
       end
 
       def iframe_access_level_allowed_for_user?(user)
@@ -345,13 +365,9 @@ module Decidim
         order(Arel::Nodes::InfixOperation.new("", field, Arel.sql("DESC")))
       end
 
-      ransacker :type do
-        Arel.sql(%("decidim_meetings_meetings"."type_of_meeting"))
-      end
-
-      ransacker :title do
-        Arel.sql(%{cast("decidim_meetings_meetings"."title" as text)})
-      end
+      # Create i18n ransackers for :title and :description.
+      # Create the :search_text ransacker alias for searching from both of these.
+      ransacker_i18n_multi :search_text, [:title, :description]
 
       ransacker :id_string do
         Arel.sql(%{cast("decidim_meetings_meetings"."id" as text)})
@@ -361,13 +377,12 @@ module Decidim
         Arel.sql("(start_time > NOW())")
       end
 
-      ransacker :origin do
-        Arel.sql("CASE
-            WHEN decidim_author_type = 'Decidim::Organization' THEN 'official'
-            WHEN decidim_author_type = 'Decidim::UserBaseEntity' AND decidim_user_group_id IS NOT NULL THEN 'user_group'
-            WHEN decidim_author_type = 'Decidim::UserBaseEntity' AND decidim_user_group_id IS NULL THEN 'citizen'
-            ELSE 'unknown' END
-        ")
+      def self.ransackable_scopes(_auth_object = nil)
+        [:with_any_type, :with_any_date, :with_any_space, :with_any_origin, :with_any_scope, :with_any_category, :with_any_global_category]
+      end
+
+      def self.ransack(params = {}, options = {})
+        MeetingSearch.new(self, params, options)
       end
 
       private

data/app/models/decidim/meetings/questionnaire.rb

@@ -4,6 +4,8 @@ module Decidim
   module Meetings
     # The data store for a Questionnaire in the Decidim::Meetings component.
     class Questionnaire < Meetings::ApplicationRecord
+      include Decidim::Traceable
+
       belongs_to :questionnaire_for, polymorphic: true
 
       has_many :questions, -> { order(:position) }, class_name: "Question", foreign_key: "decidim_questionnaire_id", dependent: :destroy
@@ -18,6 +20,10 @@ module Decidim
       def all_questions_unpublished?
         questions.all?(&:unpublished?)
       end
+
+      def self.log_presenter_class_for(_log)
+        Decidim::Meetings::AdminLog::QuestionnairePresenter
+      end
     end
   end
 end

data/app/models/decidim/meetings/registration.rb

@@ -4,7 +4,7 @@ module Decidim
   module Meetings
     # The data store for a Registration in the Decidim::Meetings component.
     class Registration < Meetings::ApplicationRecord
-      include Decidim::DataPortability
+      include Decidim::DownloadYourData
 
       belongs_to :meeting, foreign_key: "decidim_meeting_id", class_name: "Decidim::Meetings::Meeting"
       belongs_to :user, foreign_key: "decidim_user_id", class_name: "Decidim::User"
@@ -23,7 +23,7 @@ module Decidim
       end
 
       def self.export_serializer
-        Decidim::Meetings::DataPortabilityRegistrationSerializer
+        Decidim::Meetings::DownloadYourDataRegistrationSerializer
       end
 
       # Pluck all Decidim::UserGroup ID's