decidim-meetings 0.28.2 → 0.29.0.rc2

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

@@ -24,11 +24,8 @@ module Decidim
           Decidim.traceability.perform_action!("update", Decidim::Meetings::Questionnaire, @form.current_user, { meeting: @questionnaire.questionnaire_for.try(:meeting) }) do
             Decidim::Meetings::Questionnaire.transaction do
               create_questionnaire_for
-              create_questionaire
-              if @questionnaire.questions_editable?
-                update_questionnaire_questions
-                delete_answers
-              end
+              create_questionnaire
+              update_questionnaire_questions
               @questionnaire
             end
           end
@@ -42,16 +39,31 @@ module Decidim
           @questionnaire.questionnaire_for.save! if @questionnaire.questionnaire_for.new_record?
         end
 
-        def create_questionaire
+        def create_questionnaire
           @questionnaire.save! if @questionnaire.new_record?
         end
 
         def update_questionnaire_questions
           @form.questions.each do |form_question|
-            update_questionnaire_question(form_question)
+            if form_question.editable?
+              update_questionnaire_question(form_question)
+            else
+              update_questionnaire_question_position(form_question)
+            end
           end
         end
 
+        def update_questionnaire_question_position(form_question)
+          record = @questionnaire.questions.find_by(id: form_question.id)
+          return if record.blank?
+
+          position = form_question.position
+
+          return if position == record.position
+
+          record.update!(position:)
+        end
+
         def update_questionnaire_question(form_question)
           question_attributes = {
             body: form_question.body,
@@ -86,10 +98,6 @@ module Decidim
             record.save!
           end
         end
-
-        def delete_answers
-          @questionnaire.answers.destroy_all
-        end
       end
     end
   end

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

@@ -4,60 +4,34 @@ module Decidim
   module Meetings
     module Admin
       # This command is executed when the user updates the meeting registrations.
-      class UpdateRegistrations < Decidim::Command
-        # Initializes a UpdateRegistrations Command.
-        #
-        # form - The form from which to get the data.
-        # meeting - The current instance of the meeting to be updated.
-        def initialize(form, meeting)
-          @form = form
-          @meeting = meeting
-        end
-
-        # Updates the meeting if valid.
-        #
-        # Broadcasts :ok if successful, :invalid otherwise.
-        def call
-          return broadcast(:invalid) if form.invalid?
-
-          meeting.with_lock do
-            update_meeting_registrations
-            send_notification if should_notify_followers?
-          end
-
-          broadcast(:ok)
-        end
-
-        private
-
-        attr_reader :form, :meeting
+      class UpdateRegistrations < Decidim::Commands::UpdateResource
+        fetch_form_attributes :registrations_enabled, :registration_form_enabled
 
-        def update_meeting_registrations
-          meeting.registrations_enabled = form.registrations_enabled
-          meeting.registration_form_enabled = form.registration_form_enabled
+        def run_after_hooks
+          return unless resource.previous_changes["registrations_enabled"].present? && resource.registrations_enabled?
 
-          if form.registrations_enabled
-            meeting.available_slots = form.available_slots
-            meeting.reserved_slots = form.reserved_slots
-            meeting.registration_terms = form.registration_terms
-            meeting.customize_registration_email = form.customize_registration_email
-            meeting.registration_email_custom_content = form.registration_email_custom_content if form.customize_registration_email
-          end
-
-          meeting.save!
-        end
-
-        def send_notification
           Decidim::EventsManager.publish(
             event: "decidim.events.meetings.registrations_enabled",
             event_class: Decidim::Meetings::MeetingRegistrationsEnabledEvent,
-            resource: meeting,
-            followers: meeting.followers
+            resource:,
+            followers: resource.followers
           )
         end
 
-        def should_notify_followers?
-          meeting.previous_changes["registrations_enabled"].present? && meeting.registrations_enabled?
+        protected
+
+        def attributes
+          extra_params = {}
+          if form.registrations_enabled
+            extra_params = {
+              available_slots: form.available_slots,
+              reserved_slots: form.reserved_slots,
+              registration_terms: form.registration_terms,
+              customize_registration_email: form.customize_registration_email
+            }
+            extra_params.merge!(registration_email_custom_content: form.registration_email_custom_content) if form.customize_registration_email
+          end
+          super.merge(extra_params)
         end
       end
     end

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

@@ -4,9 +4,10 @@ module Decidim
   module Meetings
     # This command is executed when the user creates an Answer in a meeting poll.
     class CreateAnswer < Decidim::Command
-      def initialize(form, current_user, questionnaire)
+      delegate :current_user, to: :form
+
+      def initialize(form, questionnaire)
         @form = form
-        @current_user = current_user
         @questionnaire = questionnaire
       end
 
@@ -33,14 +34,14 @@ module Decidim
 
       def answer_question
         answer = Answer.new(
-          user: @current_user,
+          user: current_user,
           questionnaire: @questionnaire,
           question: form.question
         )
 
         form.selected_choices.each do |choice|
           answer.choices.build(
-            body: choice.body,
+            body: choice.body || translated_attribute(AnswerOption.find_by(id: choice.answer_option_id)&.body),
             decidim_answer_option_id: choice.answer_option_id
           )
         end

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

@@ -4,35 +4,32 @@ module Decidim
   module Meetings
     # This command is executed when a participant or user group creates a Meeting from the public
     # views.
-    class CreateMeeting < Decidim::Command
-      def initialize(form)
-        @form = form
-      end
+    class CreateMeeting < Decidim::Commands::CreateResource
+      fetch_form_attributes :scope, :category, :end_time, :start_time, :address, :latitude, :longitude,
+                            :online_meeting_url, :registration_type, :registration_url, :available_slots,
+                            :registrations_enabled, :component, :iframe_embed_type, :iframe_access_level
 
-      # Creates the meeting if valid.
-      #
-      # Broadcasts :ok if successful, :invalid otherwise.
-      def call
-        return broadcast(:invalid) if form.invalid?
+      protected
 
+      def create_resource
         with_events(with_transaction: true) do
-          create_meeting!
+          super
+
+          Decidim.traceability.perform_action!(:publish, resource, form.current_user, visibility: "all") do
+            resource.publish!
+          end
         end
+      end
 
+      def run_after_hooks
         create_follow_form_resource(form.current_user)
         schedule_upcoming_meeting_notification
         send_notification
-
-        broadcast(:ok, meeting)
       end
 
-      private
-
-      attr_reader :meeting, :form
-
       def event_arguments
         {
-          resource: meeting,
+          resource:,
           extra: {
             event_author: form.current_user,
             locale:
@@ -40,70 +37,49 @@ module Decidim
         }
       end
 
-      def create_meeting!
+      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_description = Decidim::ContentProcessor.parse(form.description, current_organization: form.current_organization).rewrite
 
-        params = {
-          scope: form.scope,
-          category: form.category,
-          title: { I18n.locale => parsed_title },
-          description: { I18n.locale => parsed_description },
-          end_time: form.end_time,
-          start_time: form.start_time,
-          address: form.address,
-          latitude: form.latitude,
-          longitude: form.longitude,
-          location: { I18n.locale => form.location },
-          location_hints: { I18n.locale => form.location_hints },
-          author: form.current_user,
-          decidim_user_group_id: form.user_group_id,
-          online_meeting_url: form.online_meeting_url,
-          registration_type: form.registration_type,
-          registration_url: form.registration_url,
-          available_slots: form.available_slots,
-          registration_terms: { I18n.locale => form.registration_terms },
-          registrations_enabled: form.registrations_enabled,
-          type_of_meeting: form.clean_type_of_meeting,
-          component: form.current_component,
-          published_at: Time.current,
-          iframe_embed_type: form.iframe_embed_type,
-          iframe_access_level: form.iframe_access_level
-        }
-
-        @meeting = Decidim.traceability.create!(
-          Meeting,
-          form.current_user,
-          params,
-          visibility: "public-only"
-        )
-        Decidim.traceability.perform_action!(:publish, meeting, form.current_user, visibility: "all") do
-          meeting.publish!
-        end
+        super.merge({
+                      title: { I18n.locale => parsed_title },
+                      description: { I18n.locale => parsed_description },
+                      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
+                    })
       end
 
+      def extra_params = { visibility: "public-only" }
+
       def schedule_upcoming_meeting_notification
-        return if meeting.start_time < Time.zone.now
+        return if resource.start_time < Time.zone.now
 
-        checksum = Decidim::Meetings::UpcomingMeetingNotificationJob.generate_checksum(meeting)
+        checksum = Decidim::Meetings::UpcomingMeetingNotificationJob.generate_checksum(resource)
 
         Decidim::Meetings::UpcomingMeetingNotificationJob
-          .set(wait_until: meeting.start_time - Decidim::Meetings.upcoming_meeting_notification)
-          .perform_later(meeting.id, checksum)
+          .set(wait_until: resource.start_time - Decidim::Meetings.upcoming_meeting_notification)
+          .perform_later(resource.id, checksum)
       end
 
       def send_notification
         Decidim::EventsManager.publish(
           event: "decidim.events.meetings.meeting_created",
           event_class: Decidim::Meetings::CreateMeetingEvent,
-          resource: meeting,
-          followers: meeting.participatory_space.followers
+          resource:,
+          followers: resource.participatory_space.followers
         )
       end
 
       def create_follow_form_resource(user)
-        follow_form = Decidim::FollowForm.from_params(followable_gid: meeting.to_signed_global_id.to_s).with_context(current_user: user)
-        Decidim::CreateFollow.call(follow_form, user)
+        follow_form = Decidim::FollowForm.from_params(followable_gid: resource.to_signed_global_id.to_s).with_context(current_user: user)
+        Decidim::CreateFollow.call(follow_form)
       end
     end
   end

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

@@ -4,16 +4,15 @@ module Decidim
   module Meetings
     # This command is executed when the user joins a meeting.
     class JoinMeeting < Decidim::Command
+      delegate :current_user, to: :form
       # Initializes a JoinMeeting Command.
       #
       # meeting - The current instance of the meeting to be joined.
-      # user - The user joining the meeting.
-      # registration_form - A form object with params; can be a questionnaire.
-      def initialize(meeting, user, registration_form)
+      # form - A form object with params; can be a questionnaire.
+      def initialize(meeting, form)
         @meeting = meeting
-        @user = user
-        @user_group = Decidim::UserGroup.find_by(id: registration_form.user_group_id)
-        @registration_form = registration_form
+        @user_group = Decidim::UserGroup.find_by(id: form.user_group_id)
+        @form = form
       end
 
       # Creates a meeting registration if the meeting has registrations enabled
@@ -22,7 +21,7 @@ module Decidim
       # Broadcasts :ok if successful, :invalid otherwise.
       def call
         return broadcast(:invalid) unless can_join_meeting?
-        return broadcast(:invalid_form) unless registration_form.valid?
+        return broadcast(:invalid_form) unless form.valid?
         return broadcast(:invalid) if answer_questionnaire == :invalid
 
         meeting.with_lock do
@@ -39,16 +38,16 @@ module Decidim
 
       private
 
-      attr_reader :meeting, :user, :user_group, :registration, :registration_form
+      attr_reader :meeting, :user_group, :registration, :form
 
       def accept_invitation
-        meeting.invites.find_by(user:)&.accept!
+        meeting.invites.find_by(user: current_user)&.accept!
       end
 
       def answer_questionnaire
         return unless questionnaire?
 
-        Decidim::Forms::AnswerQuestionnaire.call(registration_form, user, meeting.questionnaire) do
+        Decidim::Forms::AnswerQuestionnaire.call(form, meeting.questionnaire) do
           on(:ok) do
             return :valid
           end
@@ -62,19 +61,19 @@ module Decidim
       def create_registration
         @registration = Decidim::Meetings::Registration.create!(
           meeting:,
-          user:,
+          user: current_user,
           user_group:,
-          public_participation: registration_form.public_participation
+          public_participation: form.public_participation
         )
       end
 
       def can_join_meeting?
         meeting.registrations_enabled? && meeting.has_available_slots? &&
-          !meeting.has_registration_for?(user)
+          !meeting.has_registration_for?(current_user)
       end
 
       def send_email_confirmation
-        Decidim::Meetings::RegistrationMailer.confirmation(user, meeting, registration).deliver_later
+        Decidim::Meetings::RegistrationMailer.confirmation(current_user, meeting, registration).deliver_later
       end
 
       def send_notification_confirmation
@@ -82,7 +81,7 @@ module Decidim
           event: "decidim.events.meetings.meeting_registration_confirmed",
           event_class: Decidim::Meetings::MeetingRegistrationNotificationEvent,
           resource: @meeting,
-          affected_users: [@user],
+          affected_users: [current_user],
           extra: {
             registration_code: @registration.code
           }
@@ -113,17 +112,17 @@ module Decidim
       end
 
       def increment_score
-        Decidim::Gamification.increment_score(user, :attended_meetings)
+        Decidim::Gamification.increment_score(current_user, :attended_meetings)
       end
 
       def follow_meeting
-        Decidim::CreateFollow.call(follow_form, user)
+        Decidim::CreateFollow.call(follow_form)
       end
 
       def follow_form
         Decidim::FollowForm
           .from_params(followable_gid: meeting.to_signed_global_id.to_s)
-          .with_context(current_user: user)
+          .with_context(current_user:)
       end
 
       def occupied_slots_over?(percentage)
@@ -131,7 +130,7 @@ module Decidim
       end
 
       def questionnaire?
-        registration_form.model_name == "questionnaire"
+        form.model_name == "questionnaire"
       end
     end
   end

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

@@ -5,14 +5,13 @@ module Decidim
     # This command is executed when the user changes a Meeting from the admin
     # panel.
     class UpdateMeeting < Decidim::Command
+      delegate :current_user, to: :form
       # Initializes a UpdateMeeting Command.
       #
       # form - The form from which to get the data.
-      # current_user - The current user.
       # meeting - The current instance of the page to be updated.
-      def initialize(form, current_user, meeting)
+      def initialize(form, meeting)
         @form = form
-        @current_user = current_user
         @meeting = meeting
       end
 
@@ -33,13 +32,13 @@ module Decidim
 
       private
 
-      attr_reader :form, :current_user, :meeting
+      attr_reader :form, :meeting
 
       def event_arguments
         {
           resource: meeting,
           extra: {
-            event_author: form.current_user,
+            event_author: current_user,
             locale:
           }
         }
@@ -51,7 +50,7 @@ module Decidim
 
         Decidim.traceability.update!(
           meeting,
-          form.current_user,
+          current_user,
           {
             scope: form.scope,
             category: form.category,
@@ -64,7 +63,7 @@ module Decidim
             longitude: form.longitude,
             location: { I18n.locale => form.location },
             location_hints: { I18n.locale => form.location_hints },
-            author: form.current_user,
+            author: current_user,
             decidim_user_group_id: form.user_group_id,
             registration_type: form.registration_type,
             registration_url: form.registration_url,

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

@@ -32,7 +32,7 @@ module Decidim
       private
 
       def change_meeting_state_to_withdrawn
-        @meeting.update state: "withdrawn"
+        @meeting.withdraw!
       end
     end
   end

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

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+require "active_support/concern"
+
+module Decidim
+  module Meetings
+    module Admin
+      module Invites
+        module Filterable
+          extend ActiveSupport::Concern
+
+          included do
+            include Decidim::Admin::Filterable
+
+            private
+
+            def filters
+              [:accepted_at_not_null, :rejected_at_not_null, :sent_at_not_null]
+            end
+
+            def base_query
+              collection
+            end
+
+            def search_field_predicate
+              :user_name_or_user_email_cont
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -19,7 +19,7 @@ module Decidim
 
           @form = form(MeetingAgendaForm).from_params(params, meeting:)
 
-          CreateAgenda.call(@form, meeting) do
+          CreateAgenda.call(@form) do
             on(:ok) do
               flash[:notice] = I18n.t("agenda.create.success", scope: "decidim.meetings.admin")
               redirect_to meetings_path

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

@@ -6,14 +6,14 @@ module Decidim
       # Controller that allows inviting users to join a meeting.
       #
       class InvitesController < Admin::ApplicationController
-        helper_method :invites
+        helper_method :collection
+
+        include Decidim::Meetings::Admin::Invites::Filterable
 
         def index
           enforce_permission_to(:read_invites, :meeting, meeting:)
 
-          @query = params[:q]
-          @status = params[:status]
-
+          @invites = filtered_collection
           @form = form(MeetingRegistrationInviteForm).instance
         end
 
@@ -41,8 +41,8 @@ module Decidim
           @meeting ||= Meeting.where(component: current_component).find(params[:meeting_id])
         end
 
-        def invites
-          @invites ||= Decidim::Admin::Invites.for(meeting.invites, @query, @status).page(params[:page]).per(15)
+        def collection
+          meeting.invites
         end
       end
     end

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

@@ -66,10 +66,10 @@ module Decidim
               redirect_to meetings_path
             end
 
-            on(:invalid) do |proposals_count|
+            on(:invalid) do
               flash.now[:alert] = I18n.t(
                 "meetings.destroy.invalid.proposals_count",
-                count: proposals_count,
+                count: proposals.size,
                 scope: "decidim.meetings.admin"
               )
 

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

@@ -23,8 +23,20 @@ module Decidim
         def update
           enforce_permission_to(:update, :poll, meeting:, poll:)
 
+          current_questions_forms = form(Admin::QuestionnaireForm).from_model(questionnaire).questions
           @form = form(Admin::QuestionnaireForm).from_params(params)
 
+          # Although the question values (except the position) will be ignored if they are not editable,
+          # its information is completed so that if any update failure occurs, the form is rendered again
+          # with the full data for the disabled questions.
+          @form.questions = @form.questions.map do |question_form|
+            next question_form if question_form.editable?
+
+            full_question_form = current_questions_forms.find { |form| form.id.to_s == question_form.id.to_s }
+            full_question_form.position = question_form.position
+            full_question_form
+          end
+
           Admin::UpdateQuestionnaire.call(@form, questionnaire) do
             on(:ok) do
               # i18n-tasks-use t("decidim.forms.admin.questionnaires.update.success")

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

@@ -12,7 +12,7 @@ module Decidim
 
       private
 
-      def add_addtional_csp_directives
+      def add_additional_csp_directives
         return unless respond_to?(:meeting) || meeting.present?
 
         embedded = MeetingIframeEmbedder.new(meeting.online_meeting_url).embed_transformed_url(request.host)

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

@@ -9,7 +9,7 @@ module Decidim
       include Decidim::Meetings::PollsResources
 
       helper_method :live_meeting_embed_code
-      before_action :add_addtional_csp_directives, only: :show
+      before_action :add_additional_csp_directives, only: :show
 
       def show
         raise ActionController::RoutingError, "Not Found" unless meeting

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

@@ -15,9 +15,9 @@ module Decidim
       helper Decidim::ShortLinkHelper
       include Decidim::AttachmentsHelper
 
-      helper_method :meetings, :meeting, :registration, :search, :nav_paths, :tab_panel_items
+      helper_method :meetings, :meeting, :registration, :search, :tab_panel_items
 
-      before_action :add_addtional_csp_directives, only: [:show]
+      before_action :add_additional_csp_directives, only: [:show]
 
       def new
         enforce_permission_to :create, :meeting
@@ -76,7 +76,7 @@ module Decidim
 
         @form = meeting_form.from_params(params)
 
-        UpdateMeeting.call(@form, current_user, meeting) do
+        UpdateMeeting.call(@form, meeting) do
           on(:ok) do |meeting|
             flash[:notice] = I18n.t("meetings.update.success", scope: "decidim.meetings")
             redirect_to Decidim::ResourceLocatorPresenter.new(meeting).path
@@ -110,36 +110,6 @@ module Decidim
         @meeting ||= Meeting.not_hidden.where(component: current_component).find_by(id: params[:id])
       end
 
-      def next_meeting
-        return if search_collection.size < 2
-
-        search_collection.order(:start_time, :id).where(
-          Decidim::Meetings::Meeting.arel_table[:start_time].gt(meeting.start_time).or(
-            Decidim::Meetings::Meeting.arel_table[:start_time].eq(meeting.start_time).and(
-              Decidim::Meetings::Meeting.arel_table[:id].gt(meeting.id)
-            )
-          )
-        ).first
-      end
-
-      def prev_meeting
-        return if search_collection.size < 2
-
-        search_collection.order(:start_time, :id).where(
-          Decidim::Meetings::Meeting.arel_table[:start_time].lt(meeting.start_time).or(
-            Decidim::Meetings::Meeting.arel_table[:start_time].eq(meeting.start_time).and(
-              Decidim::Meetings::Meeting.arel_table[:id].lt(meeting.id)
-            )
-          )
-        ).last
-      end
-
-      def nav_paths
-        return {} if meeting.blank?
-
-        { prev_path: prev_meeting, next_path: next_meeting }.compact_blank.transform_values { |meeting| meeting_path(meeting) }
-      end
-
       def meetings
         is_past_meetings = params.dig("filter", "with_any_date")&.include?("past")
         @meetings ||= paginate(search.result.order(start_time: is_past_meetings ? :desc : :asc))