decidim-meetings 0.23.0 → 0.27.0

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

@@ -0,0 +1,96 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Meetings
+    module Admin
+      # This command is executed when the user changes a Questionnaire from the admin
+      # panel.
+      class UpdateQuestionnaire < Decidim::Command
+        # Initializes a UpdateQuestionnaire Command.
+        #
+        # form - The form from which to get the data.
+        # questionnaire - The current instance of the questionnaire to be updated.
+        def initialize(form, questionnaire)
+          @form = form
+          @questionnaire = questionnaire
+        end
+
+        # Updates the questionnaire if valid.
+        #
+        # Broadcasts :ok if successful, :invalid otherwise.
+        def call
+          return broadcast(:invalid) if @form.invalid?
+
+          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
+              @questionnaire
+            end
+          end
+
+          broadcast(:ok)
+        end
+
+        private
+
+        def create_questionnaire_for
+          @questionnaire.questionnaire_for.save! if @questionnaire.questionnaire_for.new_record?
+        end
+
+        def create_questionaire
+          @questionnaire.save! if @questionnaire.new_record?
+        end
+
+        def update_questionnaire_questions
+          @form.questions.each do |form_question|
+            update_questionnaire_question(form_question)
+          end
+        end
+
+        def update_questionnaire_question(form_question)
+          question_attributes = {
+            body: form_question.body,
+            position: form_question.position,
+            question_type: form_question.question_type,
+            max_choices: form_question.max_choices
+          }
+
+          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
+              }
+
+              update_nested_model(form_answer_option, answer_option_attributes, question.answer_options)
+            end
+          end
+        end
+
+        def update_nested_model(form, attributes, parent_association)
+          record = parent_association.find_by(id: form.id) || parent_association.build(attributes)
+
+          yield record if block_given?
+
+          if record.persisted?
+            if form.deleted?
+              record.destroy!
+            else
+              record.update!(attributes)
+            end
+          else
+            record.save!
+          end
+        end
+
+        def delete_answers
+          @questionnaire.answers.destroy_all
+        end
+      end
+    end
+  end
+end

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

@@ -4,7 +4,7 @@ module Decidim
   module Meetings
     module Admin
       # This command is executed when the user updates the meeting registrations.
-      class UpdateRegistrations < Rectify::Command
+      class UpdateRegistrations < Decidim::Command
         # Initializes a UpdateRegistrations Command.
         #
         # form - The form from which to get the data.
@@ -18,9 +18,9 @@ module Decidim
         #
         # Broadcasts :ok if successful, :invalid otherwise.
         def call
-          meeting.with_lock do
-            return broadcast(:invalid) if form.invalid?
+          return broadcast(:invalid) if form.invalid?
 
+          meeting.with_lock do
             update_meeting_registrations
             send_notification if should_notify_followers?
           end
@@ -40,6 +40,8 @@ module Decidim
             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!

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

@@ -4,7 +4,7 @@ module Decidim
   module Meetings
     module Admin
       # This command is executed when the admin validates a registration code in the admin panel.
-      class ValidateRegistrationCode < Rectify::Command
+      class ValidateRegistrationCode < Decidim::Command
         # Initializes a ValidateRegistrationCode Command.
         #
         # form - The form from which to get the data.
@@ -35,6 +35,8 @@ module Decidim
         end
 
         def send_notification
+          return unless meeting.component.settings.registration_code_enabled
+
           Decidim::EventsManager.publish(
             event: "decidim.events.meetings.registration_code_validated",
             event_class: Decidim::Meetings::RegistrationCodeValidatedEvent,

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

@@ -0,0 +1,68 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Meetings
+    # This command is executed when the user closes a Meeting from the public
+    # views.
+    class CloseMeeting < Decidim::Command
+      # Initializes a CloseMeeting Command.
+      #
+      # form - The form from which to get the data.
+      # meeting - The current instance of the page to be closed.
+      def initialize(form, meeting)
+        @form = form
+        @meeting = meeting
+      end
+
+      # Closes the meeting if valid.
+      #
+      # Broadcasts :ok if successful, :invalid otherwise.
+      def call
+        return broadcast(:invalid) if form.invalid?
+
+        transaction do
+          close_meeting
+          link_proposals
+        end
+
+        broadcast(:ok)
+      end
+
+      private
+
+      attr_reader :form, :meeting
+
+      def close_meeting
+        parsed_closing_report = Decidim::ContentProcessor.parse(form.closing_report, current_organization: form.current_organization).rewrite
+
+        Decidim.traceability.perform_action!(
+          :close,
+          meeting,
+          form.current_user
+        ) do
+          meeting.update!(
+            attendees_count: form.attendees_count,
+            closed_at: form.closed_at,
+            closing_visible: true,
+            closing_report: { I18n.locale => parsed_closing_report }
+          )
+        end
+
+        Decidim::EventsManager.publish(
+          event: "decidim.events.meetings.meeting_closed",
+          event_class: Decidim::Meetings::CloseMeetingEvent,
+          resource: meeting,
+          followers: meeting.followers
+        )
+      end
+
+      def proposals
+        meeting.sibling_scope(:proposals).where(id: @form.proposal_ids)
+      end
+
+      def link_proposals
+        meeting.link_resources(proposals, "proposals_from_meeting")
+      end
+    end
+  end
+end

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

@@ -0,0 +1,52 @@
+# frozen_string_literal: true
+
+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)
+        @form = form
+        @current_user = current_user
+        @questionnaire = questionnaire
+      end
+
+      # Creates the answer if valid.
+      #
+      # Broadcasts :ok if successful, :invalid otherwise.
+      def call
+        return broadcast(:invalid) if form.invalid?
+
+        transaction do
+          answer_question
+        end
+
+        broadcast(:ok)
+      end
+
+      private
+
+      attr_reader :form, :answer
+
+      def invalid?
+        form.invalid?
+      end
+
+      def answer_question
+        answer = Answer.new(
+          user: @current_user,
+          questionnaire: @questionnaire,
+          question: form.question
+        )
+
+        form.selected_choices.each do |choice|
+          answer.choices.build(
+            body: choice.body,
+            decidim_answer_option_id: choice.answer_option_id
+          )
+        end
+
+        answer.save!
+      end
+    end
+  end
+end

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

@@ -4,7 +4,7 @@ module Decidim
   module Meetings
     # This command is executed when a participant or user group creates a Meeting from the public
     # views.
-    class CreateMeeting < Rectify::Command
+    class CreateMeeting < Decidim::Command
       def initialize(form)
         @form = form
       end
@@ -21,6 +21,7 @@ module Decidim
           send_notification
         end
 
+        create_follow_form_resource(form.current_user)
         broadcast(:ok, meeting)
       end
 
@@ -30,7 +31,8 @@ module Decidim
 
       def create_meeting!
         parsed_title = Decidim::ContentProcessor.parse_with_processor(:hashtag, form.title, current_organization: form.current_organization).rewrite
-        parsed_description = Decidim::ContentProcessor.parse_with_processor(:hashtag, form.description, 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,
@@ -45,8 +47,17 @@ module Decidim
           location_hints: { I18n.locale => form.location_hints },
           author: form.current_user,
           decidim_user_group_id: form.user_group_id,
-          registration_terms: form.current_component.settings.default_registration_terms,
-          component: form.current_component
+          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!(
@@ -55,13 +66,18 @@ module Decidim
           params,
           visibility: "public-only"
         )
+        Decidim.traceability.perform_action!(:publish, meeting, form.current_user, visibility: "all") do
+          meeting.publish!
+        end
       end
 
       def schedule_upcoming_meeting_notification
+        return if meeting.start_time < Time.zone.now
+
         checksum = Decidim::Meetings::UpcomingMeetingNotificationJob.generate_checksum(meeting)
 
         Decidim::Meetings::UpcomingMeetingNotificationJob
-          .set(wait_until: meeting.start_time - 2.days)
+          .set(wait_until: meeting.start_time - Decidim::Meetings.upcoming_meeting_notification)
           .perform_later(meeting.id, checksum)
       end
 
@@ -73,6 +89,11 @@ module Decidim
           followers: meeting.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)
+      end
     end
   end
 end

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

@@ -3,7 +3,7 @@
 module Decidim
   module Meetings
     # This command is executed when the user declines an invite to the meeting.
-    class DeclineInvitation < Rectify::Command
+    class DeclineInvitation < Decidim::Command
       # Initializes a DeclineInvitation Command.
       #
       # meeting - The current instance of the meeting where user has been invited.

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

@@ -3,7 +3,7 @@
 module Decidim
   module Meetings
     # This command is executed when the user joins a meeting.
-    class JoinMeeting < Rectify::Command
+    class JoinMeeting < Decidim::Command
       # Initializes a JoinMeeting Command.
       #
       # meeting - The current instance of the meeting to be joined.
@@ -21,11 +21,11 @@ module Decidim
       #
       # Broadcasts :ok if successful, :invalid otherwise.
       def call
-        meeting.with_lock do
-          return broadcast(:invalid) unless can_join_meeting?
-          return broadcast(:invalid_form) unless registration_form.valid?
+        return broadcast(:invalid) unless can_join_meeting?
+        return broadcast(:invalid_form) unless registration_form.valid?
+        return broadcast(:invalid) if answer_questionnaire == :invalid
 
-          answer_questionnaire
+        meeting.with_lock do
           create_registration
           accept_invitation
           send_email_confirmation
@@ -48,14 +48,23 @@ module Decidim
       def answer_questionnaire
         return unless questionnaire?
 
-        Decidim::Forms::AnswerQuestionnaire.call(registration_form, user, meeting.questionnaire)
+        Decidim::Forms::AnswerQuestionnaire.call(registration_form, user, meeting.questionnaire) do
+          on(:ok) do
+            return :valid
+          end
+
+          on(:invalid) do
+            return :invalid
+          end
+        end
       end
 
       def create_registration
         @registration = Decidim::Meetings::Registration.create!(
           meeting: meeting,
           user: user,
-          user_group: user_group
+          user_group: user_group,
+          public_participation: registration_form.public_participation
         )
       end
 
@@ -122,7 +131,7 @@ module Decidim
       end
 
       def questionnaire?
-        registration_form.model_name == "Questionnaire"
+        registration_form.model_name == "questionnaire"
       end
     end
   end

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

@@ -3,7 +3,7 @@
 module Decidim
   module Meetings
     # This command is executed when the user leaves a meeting.
-    class LeaveMeeting < Rectify::Command
+    class LeaveMeeting < Decidim::Command
       # Initializes a LeaveMeeting Command.
       #
       # meeting - The current instance of the meeting to be left.
@@ -18,9 +18,9 @@ module Decidim
       #
       # Broadcasts :ok if successful, :invalid otherwise.
       def call
-        @meeting.with_lock do
-          return broadcast(:invalid) unless registration
+        return broadcast(:invalid) unless registration
 
+        @meeting.with_lock do
           destroy_registration
           destroy_questionnaire_answers
           decrement_score
@@ -40,11 +40,11 @@ module Decidim
 
       def questionnaire_answers
         questionnaire = Decidim::Forms::Questionnaire.find_by(questionnaire_for_id: @meeting)
-        questionnaire.answers.where(user: @user)
+        questionnaire.answers.where(user: @user) if questionnaire.present?
       end
 
       def destroy_questionnaire_answers
-        questionnaire_answers.destroy_all
+        questionnaire_answers.try(:destroy_all)
       end
 
       def decrement_score

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

@@ -4,7 +4,7 @@ module Decidim
   module Meetings
     # This command is executed when the user changes a Meeting from the admin
     # panel.
-    class UpdateMeeting < Rectify::Command
+    class UpdateMeeting < Decidim::Command
       # Initializes a UpdateMeeting Command.
       #
       # form - The form from which to get the data.
@@ -37,7 +37,7 @@ module Decidim
 
       def update_meeting!
         parsed_title = Decidim::ContentProcessor.parse_with_processor(:hashtag, form.title, current_organization: form.current_organization).rewrite
-        parsed_description = Decidim::ContentProcessor.parse_with_processor(:hashtag, form.description, current_organization: form.current_organization).rewrite
+        parsed_description = Decidim::ContentProcessor.parse(form.description, current_organization: form.current_organization).rewrite
 
         Decidim.traceability.update!(
           meeting,
@@ -55,7 +55,16 @@ 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
+            decidim_user_group_id: form.user_group_id,
+            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,
+            online_meeting_url: form.online_meeting_url,
+            iframe_embed_type: form.iframe_embed_type,
+            iframe_access_level: form.iframe_access_level
           },
           visibility: "public-only"
         )
@@ -83,10 +92,12 @@ module Decidim
       end
 
       def schedule_upcoming_meeting_notification
+        return if meeting.start_time < Time.zone.now
+
         checksum = Decidim::Meetings::UpcomingMeetingNotificationJob.generate_checksum(meeting)
 
         Decidim::Meetings::UpcomingMeetingNotificationJob
-          .set(wait_until: meeting.start_time - 2.days)
+          .set(wait_until: meeting.start_time - Decidim::Meetings.upcoming_meeting_notification)
           .perform_later(meeting.id, checksum)
       end
     end

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

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Meetings
+    # A command with all the business logic when a user withdraws a new proposal.
+    class WithdrawMeeting < Decidim::Command
+      # Public: Initializes the command.
+      #
+      # meeting     - The meeting to withdraw.
+      # current_user - The current user.
+      def initialize(meeting, current_user)
+        @meeting = meeting
+        @current_user = current_user
+      end
+
+      # Executes the command. Broadcasts these events:
+      #
+      # - :ok when everything is valid, together with the meeting.
+      # - :invalid if the meeting does not belong to current user.
+      #
+      # Returns nothing.
+      def call
+        return broadcast(:invalid) unless @meeting.authored_by?(@current_user)
+
+        transaction do
+          change_meeting_state_to_withdrawn
+        end
+
+        broadcast(:ok, @meeting)
+      end
+
+      private
+
+      def change_meeting_state_to_withdrawn
+        @meeting.update state: "withdrawn"
+      end
+    end
+  end
+end

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

@@ -0,0 +1,55 @@
+# frozen_string_literal: true
+
+require "active_support/concern"
+
+module Decidim
+  module Meetings
+    module Admin
+      module Filterable
+        extend ActiveSupport::Concern
+
+        included do
+          include Decidim::Admin::Filterable
+
+          helper Decidim::Meetings::Admin::FilterableHelper
+
+          private
+
+          def base_query
+            Meeting.not_hidden.where(component: current_component).order(start_time: :desc).page(params[:page]).per(15)
+          end
+
+          def filters
+            [
+              :with_any_type,
+              :is_upcoming_true,
+              :scope_id_eq,
+              :category_id_eq,
+              :with_any_origin,
+              :closed_at_present
+            ]
+          end
+
+          def filters_with_values
+            {
+              with_any_type: meeting_types,
+              scope_id_eq: scope_ids_hash(scopes.top_level),
+              category_id_eq: category_ids_hash(categories.first_class),
+              closed_at_present: %w(true false),
+              is_upcoming_true: %w(true false),
+              with_any_origin: %w(participants official user_group)
+            }
+          end
+
+          def search_field_predicate
+            :id_string_or_title_cont
+          end
+
+          def meeting_types
+            Meeting::TYPE_OF_MEETING
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+require "active_support/concern"
+
+module Decidim
+  module Meetings
+    # A controller concern to specify default filter parameters for the controller resources.
+    module Filterable
+      extend ActiveSupport::Concern
+
+      included do
+        private
+
+        def default_filter_type_params
+          %w(all) + Decidim::Meetings::Meeting::TYPE_OF_MEETING
+        end
+
+        def default_filter_origin_params
+          filter_origin_params = %w(participants)
+          filter_origin_params << "official"
+          filter_origin_params << "user_group" if current_organization.user_groups_enabled?
+          filter_origin_params
+        end
+      end
+    end
+  end
+end

data/app/controllers/concerns/decidim/meetings/polls_resources.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Meetings
+    # This module, when injected into a controller, loads all the resources
+    # to display and interact with meeting polls.
+    module PollsResources
+      extend ActiveSupport::Concern
+
+      included do
+        helper_method :meeting, :poll, :questionnaire
+      end
+
+      private
+
+      def meeting
+        @meeting ||= Meeting.not_hidden.where(component: current_component).find(params[:meeting_id])
+      end
+
+      def poll
+        @poll ||= meeting&.poll
+      end
+
+      def questionnaire
+        @questionnaire ||= Decidim::Meetings::Questionnaire.find_by(questionnaire_for: poll) if poll
+      end
+    end
+  end
+end

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

@@ -10,15 +10,19 @@ module Decidim
       # override its layout and provide all kinds of useful methods.
       class ApplicationController < Decidim::Admin::Components::BaseController
         helper Decidim::ApplicationHelper
-        helper_method :meetings, :meeting
+        helper_method :meetings, :meeting, :maps_enabled?
 
         def meetings
-          @meetings ||= Meeting.where(component: current_component).order("created_at DESC").page(params[:page]).per(15)
+          @meetings ||= Meeting.not_hidden.where(component: current_component).order(start_time: :desc).page(params[:page]).per(15)
         end
 
         def meeting
           @meeting ||= meetings.find(params[:id]) if params[:id]
         end
+
+        def maps_enabled?
+          @maps_enabled ||= current_component.settings.maps_enabled?
+        end
       end
     end
   end

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

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require_dependency "decidim/admin/application_controller"
-
 module Decidim
   module Meetings
     module Admin