decidim-meetings 0.30.2 → 0.31.0.rc1

data/app/controllers/decidim/meetings/polls/{answers_controller.rb → responses_controller.rb}

@@ -3,7 +3,7 @@
 module Decidim
   module Meetings
     module Polls
-      class AnswersController < Decidim::Meetings::ApplicationController
+      class ResponsesController < Decidim::Meetings::ApplicationController
         include Decidim::Meetings::PollsResources
         include FormFactory
 
@@ -18,10 +18,10 @@ module Decidim
         end
 
         def create
-          enforce_permission_to(:create, :answer, question:)
-          @form = form(AnswerForm).from_params(params.merge(question:, current_user:))
+          enforce_permission_to(:create, :response, question:)
+          @form = form(ResponseForm).from_params(params.merge(question:, current_user:))
 
-          CreateAnswer.call(@form, questionnaire) do
+          CreateResponse.call(@form, questionnaire) do
             # Both :ok and :invalid render the same template, because
             # validation errors are displayed in the template
             respond_to do |format|
@@ -33,11 +33,11 @@ module Decidim
         private
 
         def question
-          @question ||= questionnaire.questions.find(answer_params[:question_id]) if questionnaire
+          @question ||= questionnaire.questions.find(response_params[:question_id]) if questionnaire
         end
 
-        def answer_params
-          params.require(:answer).permit(:question_id, choices: [:body, :answer_option_id])
+        def response_params
+          params.require(:response).permit(:question_id, choices: [:body, :response_option_id])
         end
       end
     end

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

@@ -6,25 +6,28 @@ module Decidim
     class RegistrationsController < Decidim::Meetings::ApplicationController
       include Decidim::Forms::Concerns::HasQuestionnaire
 
-      def answer
+      def respond
         enforce_permission_to(:join, :meeting, meeting:)
 
         @form = form(Decidim::Forms::QuestionnaireForm).from_params(params, session_token:)
 
-        JoinMeeting.call(meeting, @form) do
+        command = should_join_waitlist? ? JoinWaitlist : JoinMeeting
+        joining_waitlist = should_join_waitlist?
+
+        command.call(meeting, @form) do
           on(:ok) do
-            flash[:notice] = I18n.t("registrations.create.success", scope: "decidim.meetings")
-            redirect_to after_answer_path
+            flash[:notice] = I18n.t(joining_waitlist ? "registrations.waitlist.success" : "registrations.create.success", scope: "decidim.meetings")
+            redirect_to after_response_path
           end
 
           on(:invalid) do
-            flash.now[:alert] = I18n.t("registrations.create.invalid", scope: "decidim.meetings")
-            render template: "decidim/forms/questionnaires/show"
+            flash.now[:alert] = I18n.t(joining_waitlist ? "registrations.waitlist.invalid" : "registrations.create.invalid", scope: "decidim.meetings")
+            render template: "decidim/forms/questionnaires/show", status: :unprocessable_entity
           end
 
           on(:invalid_form) do
-            flash.now[:alert] = I18n.t("answer.invalid", scope: i18n_flashes_scope)
-            render template: "decidim/forms/questionnaires/show"
+            flash.now[:alert] = I18n.t("response.invalid", scope: i18n_flashes_scope)
+            render template: "decidim/forms/questionnaires/show", status: :unprocessable_entity
           end
         end
       end
@@ -47,6 +50,24 @@ module Decidim
         end
       end
 
+      def join_waitlist
+        enforce_permission_to(:join_waitlist, :meeting, meeting:)
+
+        @form = JoinMeetingForm.from_params(params).with_context(current_user:)
+
+        JoinWaitlist.call(meeting, @form) do
+          on(:ok) do
+            flash[:notice] = I18n.t("registrations.waitlist.success", scope: "decidim.meetings")
+            redirect_after_path
+          end
+
+          on(:invalid) do
+            flash.now[:alert] = I18n.t("registrations.waitlist.invalid", scope: "decidim.meetings")
+            redirect_after_path
+          end
+        end
+      end
+
       def destroy
         enforce_permission_to(:leave, :meeting, meeting:)
 
@@ -79,18 +100,24 @@ module Decidim
         end
       end
 
-      def allow_answers?
-        meeting.registrations_enabled? && meeting.registration_form_enabled? && meeting.has_available_slots?
+      def should_join_waitlist?
+        meeting.waitlist_enabled? && !meeting.has_available_slots? && !meeting.has_registration_for?(current_user)
+      end
+
+      def allow_responses?
+        return false unless meeting.registrations_enabled? && meeting.registration_form_enabled?
+
+        meeting.has_available_slots? || should_join_waitlist?
       end
 
-      def after_answer_path
+      def after_response_path
         meeting_path(meeting)
       end
 
       # You can implement this method in your controller to change the URL
       # where the questionnaire will be submitted.
       def update_url
-        answer_meeting_registration_path(meeting_id: meeting.id)
+        respond_meeting_registration_path(meeting_id: meeting.id)
       end
 
       def questionnaire_for

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

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Meetings
+    class RegistrationMarkedAsAttendeeEvent < Decidim::Events::SimpleEvent
+      include Decidim::Meetings::MeetingEvent
+    end
+  end
+end

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

@@ -4,6 +4,47 @@ module Decidim
   module Meetings
     class UpcomingMeetingEvent < Decidim::Events::SimpleEvent
       include Decidim::Meetings::MeetingEvent
+
+      i18n_attributes :reminders_before_hours
+
+      def email_intro
+        (custom_message.presence || default_email_intro).to_s.html_safe
+      end
+
+      def i18n_options
+        {
+          resource_title:,
+          resource_path:,
+          resource_url:,
+          participatory_space_url:,
+          participatory_space_title:,
+          reminders_before_hours: resource.send_reminders_before_hours,
+          scope: event_name
+        }
+      end
+
+      private
+
+      def reminder_message
+        translated_attribute(resource.reminder_message_custom_content)
+      end
+
+      def default_email_intro
+        I18n.t("email_intro", **i18n_options)
+      end
+
+      def custom_message
+        template = translated_attribute(resource.reminder_message_custom_content)
+        interpolate_custom_message(template).html_safe
+      end
+
+      def interpolate_custom_message(template)
+        title = translated_attribute(resource.title).to_s
+        hours = resource.send_reminders_before_hours.to_s
+        template
+          .gsub("{{meeting_title}}", title)
+          .gsub("{{before_hours}}", hours)
+      end
     end
   end
 end

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

@@ -4,6 +4,31 @@ module Decidim
   module Meetings
     class UpdateMeetingEvent < Decidim::Events::SimpleEvent
       include Decidim::Meetings::MeetingEvent
+
+      i18n_attributes :changed_fields
+
+      def notification_title
+        I18n.t(
+          "notification_title",
+          scope: i18n_scope,
+          changed_fields: changed_fields,
+          resource_title: translated_attribute(resource.title),
+          resource_path: resource_path
+        ).html_safe
+      end
+
+      private
+
+      def changed_field_keys
+        extra[:changed_fields] || []
+      end
+
+      def changed_fields
+        keys = changed_field_keys
+        return "" if keys.empty?
+
+        keys.map { |key| I18n.t("field_names.#{key}", scope: i18n_scope) }.to_sentence
+      end
     end
   end
 end

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

@@ -11,7 +11,7 @@ module Decidim
         attribute :video_url, String
         attribute :audio_url, String
         attribute :closing_visible, Boolean, default: true
-        attribute :attendees_count, Integer, default: 0
+        attribute :attendees_count, Integer
         attribute :contributions_count, Integer, default: 0
         attribute :attending_organizations, String
         attribute :proposal_ids, Array[Integer]
@@ -27,6 +27,7 @@ module Decidim
         # Returns nothing.
         def map_model(model)
           self.proposal_ids = model.linked_resources(:proposals, "proposals_from_meeting").pluck(:id)
+          self.attendees_count = model.attendees_count || model.registrations.where.not(validated_at: nil).count
         end
 
         def proposals

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

@@ -31,6 +31,10 @@ module Decidim
 
           "meeting-agenda-item-child-id"
         end
+
+        def map_model(model)
+          self.description = model.presenter.editor_description(all_locales: true)
+        end
       end
     end
   end

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

@@ -20,23 +20,28 @@ module Decidim
         attribute :comments_start_time, Decidim::Attributes::TimeWithZone
         attribute :comments_end_time, Decidim::Attributes::TimeWithZone
         attribute :iframe_access_level, String
+        attribute :reminder_enabled, Boolean, default: true
+        attribute :send_reminders_before_hours, Integer, default: Decidim::Meetings.upcoming_meeting_notification.in_hours.to_i
 
         translatable_attribute :title, String
         translatable_attribute :description, Decidim::Attributes::RichText
         translatable_attribute :location, String
         translatable_attribute :location_hints, String
+        translatable_attribute :reminder_message_custom_content, String
 
         validates :iframe_embed_type, inclusion: { in: Decidim::Meetings::Meeting.iframe_embed_types }
-        validates :title, :description, translatable_presence: true
-        validates :title, :description, translated_etiquette: true
+        validates :title, :description, translatable_presence: true, translated_etiquette: true
         validates :registration_type, presence: true
         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? }
+        validates :address, presence: true, if: ->(form) { form.needs_address? && form.location.values.any?(&:present?) && form.address.blank? }
+        validates :location, translatable_presence: true, if: ->(form) { form.needs_address? && form.address.present? }
+        validates :address, geocoding: true, if: ->(form) { form.has_address? && !form.geocoded? && form.needs_address? }
         validates :online_meeting_url, url: true, if: ->(form) { form.online_meeting? || form.hybrid_meeting? }
         validates :comments_start_time, date: { before: :comments_end_time, allow_blank: true, if: proc { |obj| obj.comments_end_time.present? } }
         validates :comments_end_time, date: { after: :comments_start_time, allow_blank: true, if: proc { |obj| obj.comments_start_time.present? } }
         validates :clean_type_of_meeting, presence: true
+        validates :send_reminders_before_hours, numericality: { only_integer: true, greater_than: 0 }, if: :reminder_enabled
         validates(
           :iframe_access_level,
           inclusion: { in: Decidim::Meetings::Meeting.iframe_access_levels },
@@ -83,6 +88,26 @@ module Decidim
           type_of_meeting.presence
         end
 
+        def reminder_message_custom_content
+          return unless reminder_enabled
+
+          return super if super.respond_to?(:values) && super.values.any?(&:present?)
+
+          @default_reminder_message ||= if current_organization
+                                          current_organization.available_locales.index_with do |locale|
+                                            I18n.t("decidim.events.meetings.upcoming_meeting.default_body", locale:)
+                                          end
+                                        else
+                                          {}
+                                        end
+        end
+
+        def send_reminders_before_hours
+          return nil unless reminder_enabled
+
+          super.presence&.to_i
+        end
+
         def iframe_access_level_select
           Decidim::Meetings::Meeting.iframe_access_levels.map do |level, _value|
             [

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

@@ -10,7 +10,7 @@ module Decidim
         attribute :position, Integer
         attribute :mandatory, Boolean, default: false
         attribute :question_type, String
-        attribute :answer_options, Array[AnswerOptionForm]
+        attribute :response_options, Array[ResponseOptionForm]
         attribute :max_choices, Integer
         attribute :deleted, Boolean, default: false
 
@@ -21,7 +21,7 @@ module Decidim
         validates :question_type, inclusion: { in: Decidim::Meetings::Question::QUESTION_TYPES }, if: :editable?
         validates :max_choices, numericality: { only_integer: true, greater_than: 1, less_than_or_equal_to: ->(form) { form.number_of_options } }, allow_blank: true, if: :editable?
         validates :body, translatable_presence: true, if: :requires_body?
-        validates :answer_options, presence: true, if: :editable?
+        validates :response_options, presence: true, if: :editable?
 
         def to_param
           return id if id.present?
@@ -34,7 +34,7 @@ module Decidim
         end
 
         def number_of_options
-          answer_options.size
+          response_options.size
         end
 
         private

data/app/forms/decidim/meetings/admin/{answer_option_form.rb → response_option_form.rb}

@@ -3,8 +3,8 @@
 module Decidim
   module Meetings
     module Admin
-      # This class holds a Form to update answer options
-      class AnswerOptionForm < Decidim::Form
+      # This class holds a Form to update response options
+      class ResponseOptionForm < Decidim::Form
         include TranslatableAttributes
 
         attribute :deleted, Boolean, default: false
@@ -16,7 +16,7 @@ module Decidim
         def to_param
           return id if id.present?
 
-          "questionnaire-question-answer-option-id"
+          "questionnaire-question-response-option-id"
         end
       end
     end

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

@@ -25,7 +25,7 @@ module Decidim
 
           errors.add(
             :code,
-            I18n.t("registrations.validate_registration_code.invalid", scope: "decidim.meetings.admin")
+            I18n.t("registrations_attendees.validate_registration_code.invalid", scope: "decidim.meetings.admin")
           )
         end
       end

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

@@ -15,8 +15,6 @@ module Decidim
 
       validates :current_component, presence: true
 
-      validates :address, presence: true, if: ->(form) { form.needs_address? }
-      validates :address, geocoding: true, if: ->(form) { form.has_address? && !form.geocoded? && form.needs_address? }
       validates :start_time, presence: true, date: { before: :end_time }
       validates :end_time, presence: true, date: { after: :start_time }
 

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

@@ -8,7 +8,7 @@ module Decidim
       attribute :proposal_ids, Array[Integer]
       attribute :proposals
       attribute :closed_at, Decidim::Attributes::TimeWithZone, default: -> { Time.current }
-      attribute :attendees_count, Integer, default: 0
+      attribute :attendees_count, Integer
 
       validates :closing_report, presence: true
       validates :attendees_count,
@@ -22,6 +22,7 @@ module Decidim
         self.proposal_ids = model.linked_resources(:proposals, "proposals_from_meeting").pluck(:id)
         presenter = MeetingEditionPresenter.new(model)
         self.closing_report = presenter.closing_report(all_locales: false)
+        self.attendees_count = model.attendees_count || model.registrations.where.not(validated_at: nil).count
       end
 
       def proposals

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

@@ -3,7 +3,6 @@
 module Decidim
   module Meetings
     class JoinMeetingForm < Decidim::Form
-      attribute :user_group_id, Integer
       attribute :public_participation, Boolean, default: false
     end
   end

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

@@ -2,14 +2,13 @@
 
 module Decidim
   module Meetings
-    # This class holds a Form to create/update meetings for Participants and UserGroups.
+    # This class holds a Form to create/update meetings for Participants
     class MeetingForm < ::Decidim::Meetings::BaseMeetingForm
       attribute :title, String
       attribute :description, String
       attribute :location, String
       attribute :location_hints, String
 
-      attribute :user_group_id, Integer
       attribute :registration_type, String
       attribute :registrations_enabled, Boolean, default: false
       attribute :registration_url, String
@@ -18,6 +17,8 @@ module Decidim
       attribute :iframe_embed_type, String, default: "none"
       attribute :iframe_access_level, String
 
+      validates :address, presence: true, if: ->(form) { form.needs_address? }
+      validates :address, geocoding: true, if: ->(form) { form.has_address? && !form.geocoded? && form.needs_address? }
       validates :iframe_embed_type, inclusion: { in: Decidim::Meetings::Meeting.participants_iframe_embed_types }
       validates :title, presence: true, etiquette: true
       validates :description, presence: true, etiquette: true

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

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Meetings
+    # This class holds a Form to save the chosen option for an response
+    class ResponseChoiceForm < Decidim::Form
+      attribute :body, String
+      attribute :position, Integer
+      attribute :response_option_id, Integer
+
+      validates :response_option_id, presence: true
+    end
+  end
+end

data/app/forms/decidim/meetings/{answer_form.rb → response_form.rb}

@@ -2,13 +2,13 @@
 
 module Decidim
   module Meetings
-    # This class holds a Form to save the questionnaire answers from Decidim's public page
-    class AnswerForm < Decidim::Form
+    # This class holds a Form to save the questionnaire responses from Decidim's public page
+    class ResponseForm < Decidim::Form
       include Decidim::TranslationsHelper
 
       attribute :question_id, String
       attribute :body, String
-      attribute :choices, Array[AnswerChoiceForm]
+      attribute :choices, Array[ResponseChoiceForm]
       attribute :current_user, Decidim::User
 
       validates :selected_choices, presence: true
@@ -20,8 +20,8 @@ module Decidim
         @question ||= Decidim::Meetings::Question.find(question_id)
       end
 
-      def answer
-        @answer ||= Decidim::Meetings::Answer.find_by(decidim_user_id: current_user.id, decidim_question_id: question_id) if current_user
+      def response
+        @response ||= Decidim::Meetings::Response.find_by(decidim_user_id: current_user.id, decidim_question_id: question_id) if current_user
       end
 
       def label
@@ -38,12 +38,12 @@ module Decidim
         self.question = model.question
 
         self.choices = model.choices.map do |choice|
-          AnswerChoiceForm.from_model(choice)
+          ResponseChoiceForm.from_model(choice)
         end
       end
 
       def selected_choices
-        choices.select(&:answer_option_id)
+        choices.select(&:response_option_id)
       end
 
       private

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

@@ -15,7 +15,6 @@ module Decidim
 
       def filter_origin_values
         origin_keys = %w(official participants)
-        origin_keys << "user_group" if current_organization.user_groups_enabled?
 
         origin_values = flat_filter_values(*origin_keys, scope: "decidim.meetings.meetings.filters.origin_values")
         origin_values.prepend(["", t("all", scope: "decidim.meetings.meetings.filters.origin_values")])

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

@@ -8,7 +8,7 @@ module Decidim
       include Decidim::Meetings::ApplicationHelper
       include Decidim::TranslationsHelper
       include Decidim::ResourceHelper
-      include Decidim::EndorsableHelper
+      include Decidim::LikeableHelper
 
       # Public: truncates the meeting description
       #
@@ -23,6 +23,19 @@ module Decidim
         CGI.unescapeHTML html_truncate(description, max_length:, tail:)
       end
 
+      def waitlist_status_block(registration)
+        return unless registration.waiting_list?
+
+        render layout: "decidim/meetings/layouts/aside_block", locals: { emoji: "ticket-line" } do
+          content_tag(:div) do
+            safe_join([
+                        content_tag(:h3, t("waitlist.status", scope: "decidim.meetings.meetings.show"), class: "meeting__aside-block__title"),
+                        content_tag(:p, t("waitlist.description", scope: "decidim.meetings.meetings.show"), class: "text-sm")
+                      ])
+          end
+        end
+      end
+
       # Public: The css class applied based on the meeting type to
       #         the css class.
       #
@@ -118,10 +131,6 @@ module Decidim
         end
       end
 
-      def current_user_groups?
-        current_organization.user_groups_enabled? && Decidim::UserGroups::ManageableUserGroups.for(current_user).verified.any?
-      end
-
       # Public: URL to create an event in Google Calendars based on meeting
       # data.
       #

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

@@ -0,0 +1,63 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Meetings
+    # Background job that promotes users from the waitlist to registered status,
+    # depending on available slots in the meeting.
+    class PromoteFromWaitlistJob < ApplicationJob
+      queue_as :default
+
+      def perform(meeting_id)
+        @meeting = Decidim::Meetings::Meeting.find_by(id: meeting_id)
+        return unless @meeting
+
+        promote_users_from_waitlist
+      end
+
+      private
+
+      attr_reader :meeting
+
+      def promote_users_from_waitlist
+        meeting.with_lock do
+          loop do
+            break unless meeting.remaining_slots.positive?
+
+            next_in_waitlist = meeting.registrations.on_waiting_list.first
+            break unless next_in_waitlist
+
+            promote(next_in_waitlist)
+          end
+        end
+      end
+
+      def promote(registration)
+        return unless registration.waiting_list?
+
+        registration.update!(status: :registered)
+        notify_user(registration)
+      end
+
+      def notify_user(registration)
+        send_email_confirmation(registration)
+        send_internal_notification(registration)
+      end
+
+      def send_email_confirmation(registration)
+        Decidim::Meetings::RegistrationMailer.confirmation(registration.user, meeting, registration).deliver_later
+      end
+
+      def send_internal_notification(registration)
+        Decidim::EventsManager.publish(
+          event: "decidim.events.meetings.meeting_registration_confirmed",
+          event_class: Decidim::Meetings::MeetingRegistrationNotificationEvent,
+          resource: meeting,
+          affected_users: [registration.user],
+          extra: {
+            registration_code: registration.code
+          }
+        )
+      end
+    end
+  end
+end

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

@@ -14,7 +14,7 @@ module Decidim
       end
 
       def self.generate_checksum(meeting)
-        Digest::MD5.hexdigest("#{meeting.id}-#{meeting.start_time}")
+        Digest::SHA256.hexdigest("#{meeting.id}-#{meeting.start_time}")
       end
 
       private

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

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require "rqrcode"
+
 module Decidim
   module Meetings
     # A custom mailer for sending notifications to users when
@@ -20,8 +22,11 @@ module Decidim
           @registration = registration
           @organization = @meeting.organization
           @locator = Decidim::ResourceLocatorPresenter.new(@meeting)
+          @registration_code_enabled = meeting.component.settings.registration_code_enabled
+          @qr_filename = "qr-#{@registration.code.parameterize}.png"
 
           add_calendar_attachment
+          add_qr_code_attachment if @registration_code_enabled
 
           subject = I18n.t("confirmation.subject", scope: "decidim.meetings.mailer.registration_mailer")
           mail(to: user.email, subject:)
@@ -30,12 +35,20 @@ module Decidim
 
       private
 
+      def qr_code
+        @qr_code ||= RQRCode::QRCode.new(@registration.validation_code_short_link.short_url)
+      end
+
       def add_calendar_attachment
         calendar = Icalendar::Calendar.new
         calendar.add_event(Calendar::MeetingToEvent.new(@meeting).event)
 
         attachments["meeting-calendar-info.ics"] = calendar.to_ical
       end
+
+      def add_qr_code_attachment
+        attachments[@qr_filename] = qr_code.as_png(size: 500).to_blob
+      end
     end
   end
 end

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

@@ -33,6 +33,11 @@ module Decidim
       def self.log_presenter_class_for(_log)
         Decidim::Meetings::AdminLog::AgendaItemPresenter
       end
+
+      # Returns the presenter for this model
+      def presenter
+        Decidim::Meetings::AgendaItemPresenter.new(self)
+      end
     end
   end
 end