decidim-meetings 0.30.5 → 0.31.0.rc1

data/app/commands/decidim/meetings/admin/update_questionnaire.rb

@@ -73,12 +73,12 @@ module Decidim
           }
 
           update_nested_model(form_question, question_attributes, @questionnaire.questions) do |question|
-            form_question.answer_options.each do |form_answer_option|
-              answer_option_attributes = {
-                body: form_answer_option.body
+            form_question.response_options.each do |form_response_option|
+              response_option_attributes = {
+                body: form_response_option.body
               }
 
-              update_nested_model(form_answer_option, answer_option_attributes, question.answer_options)
+              update_nested_model(form_response_option, response_option_attributes, question.response_options)
             end
           end
         end

data/app/commands/decidim/meetings/admin/update_registrations.rb

@@ -8,14 +8,16 @@ module Decidim
         fetch_form_attributes :registrations_enabled, :registration_form_enabled
 
         def run_after_hooks
-          return unless resource.previous_changes["registrations_enabled"].present? && resource.registrations_enabled?
+          if resource.previous_changes["registrations_enabled"].present? && resource.registrations_enabled?
+            Decidim::EventsManager.publish(
+              event: "decidim.events.meetings.registrations_enabled",
+              event_class: Decidim::Meetings::MeetingRegistrationsEnabledEvent,
+              resource:,
+              followers: resource.followers
+            )
+          end
 
-          Decidim::EventsManager.publish(
-            event: "decidim.events.meetings.registrations_enabled",
-            event_class: Decidim::Meetings::MeetingRegistrationsEnabledEvent,
-            resource:,
-            followers: resource.followers
-          )
+          promote_from_waitlist!
         end
 
         protected
@@ -33,6 +35,16 @@ module Decidim
           end
           super.merge(extra_params)
         end
+
+        def promote_from_waitlist!
+          slot_changes = resource.previous_changes.keys & %w(available_slots reserved_slots)
+          return if slot_changes.empty?
+          return if resource.available_slots.zero?
+          return unless resource.remaining_slots.positive?
+          return unless resource.registrations.on_waiting_list.exists?
+
+          Decidim::Meetings::PromoteFromWaitlistJob.perform_later(resource.id)
+        end
       end
     end
   end

data/app/commands/decidim/meetings/create_meeting.rb

@@ -2,7 +2,7 @@
 
 module Decidim
   module Meetings
-    # This command is executed when a participant or user group creates a Meeting from the public
+    # This command is executed when a participant creates a Meeting from the public
     # views.
     class CreateMeeting < Decidim::Commands::CreateResource
       fetch_form_attributes :end_time, :start_time, :address, :latitude, :longitude,
@@ -40,7 +40,7 @@ module Decidim
       def resource_class = Decidim::Meetings::Meeting
 
       def attributes
-        parsed_title = Decidim::ContentProcessor.parse_with_processor(:hashtag, form.title, current_organization: form.current_organization).rewrite
+        parsed_title = Decidim::ContentProcessor.parse(form.title, current_organization: form.current_organization).rewrite
         parsed_description = Decidim::ContentProcessor.parse(form.description, current_organization: form.current_organization).rewrite
 
         super.merge({
@@ -49,7 +49,6 @@ module Decidim
                       location: { I18n.locale => form.location },
                       location_hints: { I18n.locale => form.location_hints },
                       author: form.current_user,
-                      decidim_user_group_id: form.user_group_id,
                       registration_terms: { I18n.locale => form.registration_terms },
                       type_of_meeting: form.clean_type_of_meeting,
                       published_at: Time.current

data/app/commands/decidim/meetings/{create_answer.rb → create_response.rb}

@@ -2,8 +2,8 @@
 
 module Decidim
   module Meetings
-    # This command is executed when the user creates an Answer in a meeting poll.
-    class CreateAnswer < Decidim::Command
+    # This command is executed when the user creates an Response in a meeting poll.
+    class CreateResponse < Decidim::Command
       delegate :current_user, to: :form
 
       def initialize(form, questionnaire)
@@ -11,14 +11,14 @@ module Decidim
         @questionnaire = questionnaire
       end
 
-      # Creates the answer if valid.
+      # Creates the response if valid.
       #
       # Broadcasts :ok if successful, :invalid otherwise.
       def call
         return broadcast(:invalid) if form.invalid?
 
         transaction do
-          answer_question
+          response_question
         end
 
         broadcast(:ok)
@@ -26,27 +26,27 @@ module Decidim
 
       private
 
-      attr_reader :form, :answer
+      attr_reader :form, :response
 
       def invalid?
         form.invalid?
       end
 
-      def answer_question
-        answer = Answer.new(
+      def response_question
+        response = Response.new(
           user: current_user,
           questionnaire: @questionnaire,
           question: form.question
         )
 
         form.selected_choices.each do |choice|
-          answer.choices.build(
-            body: choice.body || translated_attribute(AnswerOption.find_by(id: choice.answer_option_id)&.body),
-            decidim_answer_option_id: choice.answer_option_id
+          response.choices.build(
+            body: choice.body || translated_attribute(ResponseOption.find_by(id: choice.response_option_id)&.body),
+            decidim_response_option_id: choice.response_option_id
           )
         end
 
-        answer.save!
+        response.save!
       end
     end
   end

data/app/commands/decidim/meetings/join_meeting.rb

@@ -11,7 +11,6 @@ module Decidim
       # form - A form object with params; can be a questionnaire.
       def initialize(meeting, form)
         @meeting = meeting
-        @user_group = Decidim::UserGroup.find_by(id: form.user_group_id)
         @form = form
       end
 
@@ -22,7 +21,7 @@ module Decidim
       def call
         return broadcast(:invalid) unless can_join_meeting?
         return broadcast(:invalid_form) unless form.valid?
-        return broadcast(:invalid) if answer_questionnaire == :invalid
+        return broadcast(:invalid) if response_questionnaire == :invalid
 
         meeting.with_lock do
           create_registration
@@ -38,16 +37,16 @@ module Decidim
 
       private
 
-      attr_reader :meeting, :user_group, :registration, :form
+      attr_reader :meeting, :registration, :form
 
       def accept_invitation
         meeting.invites.find_by(user: current_user)&.accept!
       end
 
-      def answer_questionnaire
+      def response_questionnaire
         return unless questionnaire?
 
-        Decidim::Forms::AnswerQuestionnaire.call(form, meeting.questionnaire) do
+        Decidim::Forms::ResponseQuestionnaire.call(form, meeting.questionnaire) do
           on(:ok) do
             return :valid
           end
@@ -62,7 +61,6 @@ module Decidim
         @registration = Decidim::Meetings::Registration.create!(
           meeting:,
           user: current_user,
-          user_group:,
           public_participation: form.public_participation
         )
       end

data/app/commands/decidim/meetings/join_waitlist.rb

@@ -0,0 +1,53 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Meetings
+    # This command is executed when the user joins a meeting waitlist.
+    class JoinWaitlist < Decidim::Command
+      delegate :current_user, to: :form
+
+      def initialize(meeting, form)
+        @meeting = meeting
+        @form = form
+      end
+
+      def call
+        return broadcast(:invalid) unless can_join_waitlist?
+        return broadcast(:invalid_form) unless form.valid?
+
+        meeting.with_lock do
+          create_waitlist_entry
+          send_waitlist_notification
+        end
+
+        broadcast(:ok)
+      end
+
+      private
+
+      attr_reader :meeting, :user_group, :form
+
+      def can_join_waitlist?
+        meeting.waitlist_enabled? && !meeting.registrations.exists?(user: current_user) && !meeting.has_available_slots?
+      end
+
+      def create_waitlist_entry
+        @registration = Decidim::Meetings::Registration.create!(
+          meeting:,
+          user: current_user,
+          public_participation: form.public_participation,
+          status: :waiting_list
+        )
+      end
+
+      def send_waitlist_notification
+        Decidim::EventsManager.publish(
+          event: "decidim.events.meetings.meeting_waitlist_added",
+          event_class: Decidim::Meetings::MeetingRegistrationNotificationEvent,
+          resource: meeting,
+          affected_users: [current_user]
+        )
+      end
+    end
+  end
+end

data/app/commands/decidim/meetings/leave_meeting.rb

@@ -22,8 +22,9 @@ module Decidim
 
         @meeting.with_lock do
           destroy_registration
-          destroy_questionnaire_answers
+          destroy_questionnaire_responses
           decrement_score
+          promote_from_waitlist!
         end
         broadcast(:ok)
       end
@@ -38,18 +39,26 @@ module Decidim
         registration.destroy!
       end
 
-      def questionnaire_answers
+      def questionnaire_responses
         questionnaire = Decidim::Forms::Questionnaire.find_by(questionnaire_for_id: @meeting)
-        questionnaire.answers.where(user: @user) if questionnaire.present?
+        questionnaire.responses.where(user: @user) if questionnaire.present?
       end
 
-      def destroy_questionnaire_answers
-        questionnaire_answers.try(:destroy_all)
+      def destroy_questionnaire_responses
+        questionnaire_responses.try(:destroy_all)
       end
 
       def decrement_score
         Decidim::Gamification.decrement_score(@user, :attended_meetings)
       end
+
+      def promote_from_waitlist!
+        return if @meeting.available_slots.zero?
+        return unless @meeting.remaining_slots.positive?
+        return unless @meeting.registrations.on_waiting_list.exists?
+
+        Decidim::Meetings::PromoteFromWaitlistJob.perform_later(@meeting.id)
+      end
     end
   end
 end

data/app/commands/decidim/meetings/update_meeting.rb

@@ -45,7 +45,7 @@ module Decidim
       end
 
       def update_meeting!
-        parsed_title = Decidim::ContentProcessor.parse_with_processor(:hashtag, form.title, current_organization: form.current_organization).rewrite
+        parsed_title = Decidim::ContentProcessor.parse(form.title, current_organization: form.current_organization).rewrite
         parsed_description = Decidim::ContentProcessor.parse(form.description, current_organization: form.current_organization).rewrite
 
         Decidim.traceability.update!(
@@ -62,7 +62,6 @@ module Decidim
             location: { I18n.locale => form.location },
             location_hints: { I18n.locale => form.location_hints },
             author: current_user,
-            decidim_user_group_id: form.user_group_id,
             registration_type: form.registration_type,
             registration_url: form.registration_url,
             available_slots: form.available_slots,

data/app/controllers/concerns/decidim/meetings/admin/filterable.rb

@@ -41,7 +41,7 @@ module Decidim
               taxonomies_part_of_contains: taxonomy_ids_hash(available_root_taxonomies),
               closed_at_present: %w(true false),
               is_upcoming_true: %w(true false),
-              with_any_origin: %w(participants official user_group)
+              with_any_origin: %w(participants official)
             }
           end
 

data/app/controllers/decidim/meetings/admin/agenda_controller.rb

@@ -27,7 +27,7 @@ module Decidim
 
             on(:invalid) do
               flash.now[:alert] = I18n.t("agenda.create.invalid", scope: "decidim.meetings.admin")
-              render action: "new"
+              render action: "new", status: :unprocessable_entity
             end
           end
         end
@@ -51,7 +51,7 @@ module Decidim
 
             on(:invalid) do
               flash.now[:alert] = I18n.t("agenda.update.invalid", scope: "decidim.meetings.admin")
-              render action: "edit"
+              render action: "edit", status: :unprocessable_entity
             end
           end
         end

data/app/controllers/decidim/meetings/admin/invites_controller.rb

@@ -30,7 +30,7 @@ module Decidim
 
             on(:invalid) do
               flash.now[:alert] = I18n.t("invites.create.error", scope: "decidim.meetings.admin")
-              render :index
+              render :index, status: :unprocessable_entity
             end
           end
         end

data/app/controllers/decidim/meetings/admin/meeting_closes_controller.rb

@@ -26,7 +26,7 @@ module Decidim
 
             on(:invalid) do
               flash.now[:alert] = I18n.t("meetings.close.invalid", scope: "decidim.meetings.admin")
-              render action: "edit"
+              render action: "edit", status: :unprocessable_entity
             end
           end
         end

data/app/controllers/decidim/meetings/admin/meeting_copies_controller.rb

@@ -27,7 +27,7 @@ module Decidim
 
             on(:invalid) do
               flash.now[:alert] = I18n.t("meeting_copies.create.error", scope: "decidim.admin")
-              render :new
+              render :new, status: :unprocessable_entity
             end
           end
         end

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

@@ -29,7 +29,7 @@ module Decidim
 
             on(:invalid) do
               flash.now[:alert] = I18n.t("meetings.create.invalid", scope: "decidim.meetings.admin")
-              render action: "new"
+              render action: "new", status: :unprocessable_entity
             end
           end
         end
@@ -53,7 +53,7 @@ module Decidim
 
             on(:invalid) do
               flash.now[:alert] = I18n.t("meetings.update.invalid", scope: "decidim.meetings.admin")
-              render action: "edit"
+              render action: "edit", status: :unprocessable_entity
             end
           end
         end
@@ -69,7 +69,7 @@ module Decidim
 
             on(:invalid) do
               flash.now[:alert] = I18n.t("meetings.publish.invalid", scope: "decidim.meetings.admin")
-              render action: "index"
+              render action: "index", status: :unprocessable_entity
             end
           end
         end
@@ -85,7 +85,7 @@ module Decidim
 
             on(:invalid) do
               flash.now[:alert] = I18n.t("meetings.unpublish.invalid", scope: "decidim.meetings.admin")
-              render action: "index"
+              render action: "index", status: :unprocessable_entity
             end
           end
         end

data/app/controllers/decidim/meetings/admin/meetings_poll_controller.rb

@@ -6,8 +6,8 @@ module Decidim
       class MeetingsPollController < Admin::ApplicationController
         include Decidim::TranslatableAttributes
 
-        helper_method :questionnaire_for, :questionnaire, :blank_question, :blank_answer_option,
-                      :question_types, :update_url, :answer_options_url, :edit_questionnaire_title,
+        helper_method :questionnaire_for, :questionnaire, :blank_question, :blank_response_option,
+                      :question_types, :update_url, :response_options_url, :edit_questionnaire_title,
                       :meeting, :poll
 
         helper Decidim::Forms::Admin::ApplicationHelper
@@ -47,17 +47,17 @@ module Decidim
             on(:invalid) do
               # i18n-tasks-use t("decidim.forms.admin.questionnaires.update.invalid")
               flash.now[:alert] = I18n.t("update.invalid", scope: "decidim.meetings.admin.meetings_poll")
-              render template: "decidim/meetings/admin/poll/edit"
+              render template: "decidim/meetings/admin/poll/edit", status: :unprocessable_entity
             end
           end
         end
 
-        def answer_options
+        def response_options
           respond_to do |format|
             format.json do
               question_id = params["id"]
               question = Decidim::Meetings::Question.find_by(id: question_id)
-              render json: question.answer_options.map { |answer_option| AnswerOptionPresenter.new(answer_option).as_json } if question.present?
+              render json: question.response_options.map { |response_option| ResponseOptionPresenter.new(response_option).as_json } if question.present?
             end
           end
         end
@@ -66,10 +66,10 @@ module Decidim
           poll
         end
 
-        # Returns the url to get the answer options json (for the display conditions form)
+        # Returns the url to get the response options json (for the display conditions form)
         # for the question with id = params[:id]
-        def answer_options_url(params)
-          url_for([questionnaire.questionnaire_for, { action: :answer_options, format: :json, **params }])
+        def response_options_url(params)
+          url_for([questionnaire.questionnaire_for, { action: :response_options, format: :json, **params }])
         end
 
         # Implement this method in your controller to set the title
@@ -88,8 +88,8 @@ module Decidim
           @blank_question ||= Decidim::Meetings::Admin::QuestionForm.new
         end
 
-        def blank_answer_option
-          @blank_answer_option ||= Decidim::Meetings::Admin::AnswerOptionForm.new
+        def blank_response_option
+          @blank_response_option ||= Decidim::Meetings::Admin::ResponseOptionForm.new
         end
 
         def question_types

data/app/controllers/decidim/meetings/admin/registrations_attendees_controller.rb

@@ -0,0 +1,79 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Meetings
+    module Admin
+      # This controller allows an admin to manage meeting registrations and
+      # attendances from a participatory space
+      class RegistrationsAttendeesController < Admin::ApplicationController
+        helper_method :registrations
+
+        before_action do
+          enforce_permission_to(:validate_registration_code, :meeting, meeting:)
+        end
+
+        def index
+          @validation_form = ValidateRegistrationCodeForm.new
+        end
+
+        def qr_mark_as_attendee
+          registration = registrations.find_by!(code: params[:id])
+
+          MarkAsAttendee.call(registration) do
+            on(:ok) do
+              flash[:notice] = I18n.t("registrations_attendees.mark_attendee.success", scope: "decidim.meetings.admin")
+            end
+
+            on(:invalid) do
+              flash[:alert] = I18n.t("registrations_attendees.mark_attendee.invalid", scope: "decidim.meetings.admin")
+            end
+
+            redirect_to action: "index"
+          end
+        end
+
+        def validate_registration_code
+          @validation_form = ValidateRegistrationCodeForm.from_params(params).with_context(current_organization: meeting.organization, meeting:)
+
+          ValidateRegistrationCode.call(@validation_form, meeting) do
+            on(:ok) do
+              flash[:notice] = I18n.t("registrations_attendees.validate_registration_code.success", scope: "decidim.meetings.admin")
+              redirect_to action: "index"
+            end
+
+            on(:invalid) do
+              flash.now[:alert] = I18n.t("registrations_attendees.validate_registration_code.invalid", scope: "decidim.meetings.admin")
+              render action: "index", status: :unprocessable_entity
+            end
+          end
+        end
+
+        def mark_as_attendee
+          registration = registrations.find(params[:id])
+
+          MarkAsAttendee.call(registration) do
+            on(:ok) do
+              flash[:notice] = I18n.t("registrations_attendees.mark_attendee.success", scope: "decidim.meetings.admin")
+              redirect_to action: "index"
+            end
+
+            on(:invalid) do
+              flash.now[:alert] = I18n.t("registrations_attendees.mark_attendee.invalid", scope: "decidim.meetings.admin")
+              render action: "index", status: :unprocessable_entity
+            end
+          end
+        end
+
+        private
+
+        def meeting
+          @meeting ||= Meeting.where(component: current_component).find(params[:meeting_id])
+        end
+
+        def registrations
+          meeting.registrations
+        end
+      end
+    end
+  end
+end

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

@@ -9,14 +9,12 @@ module Decidim
           enforce_permission_to(:update, :meeting, meeting:)
 
           @form = MeetingRegistrationsForm.from_model(meeting)
-          @validation_form = ValidateRegistrationCodeForm.new
         end
 
         def update
           enforce_permission_to(:update, :meeting, meeting:)
 
           @form = MeetingRegistrationsForm.from_params(params).with_context(current_organization: meeting.organization, meeting:)
-          @validation_form = ValidateRegistrationCodeForm.new
 
           UpdateRegistrations.call(@form, meeting) do
             on(:ok) do
@@ -26,7 +24,7 @@ module Decidim
 
             on(:invalid) do
               flash.now[:alert] = I18n.t("registrations.update.invalid", scope: "decidim.meetings.admin")
-              render action: "edit"
+              render action: "edit", status: :unprocessable_entity
             end
           end
         end
@@ -41,25 +39,6 @@ module Decidim
           end
         end
 
-        def validate_registration_code
-          enforce_permission_to(:update, :meeting, meeting:)
-
-          @form = MeetingRegistrationsForm.from_model(meeting)
-          @validation_form = ValidateRegistrationCodeForm.from_params(params).with_context(current_organization: meeting.organization, meeting:)
-
-          ValidateRegistrationCode.call(@validation_form, meeting) do
-            on(:ok) do
-              flash[:notice] = I18n.t("registrations.validate_registration_code.success", scope: "decidim.meetings.admin")
-              render action: "edit"
-            end
-
-            on(:invalid) do
-              flash.now[:alert] = I18n.t("registrations.validate_registration_code.invalid", scope: "decidim.meetings.admin")
-              render action: "edit"
-            end
-          end
-        end
-
         private
 
         def meeting

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

@@ -27,7 +27,7 @@ module Decidim
 
           on(:invalid) do
             flash.now[:alert] = I18n.t("meetings.close.invalid", scope: "decidim.meetings.admin")
-            render action: "edit"
+            render action: "edit", status: :unprocessable_entity
           end
         end
       end