decidim-meetings 0.24.1 → 0.25.0.rc2

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

@@ -40,6 +40,8 @@ module Decidim
         end
 
         def proposals
+          return [] unless Decidim::Meetings.enable_proposal_linking
+
           @proposals ||= meeting.authored_proposals.load
         end
       end

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

@@ -0,0 +1,72 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Meetings
+    module Admin
+      # A command with all the business logic that publishes an
+      # existing meeting.
+      class PublishMeeting < Rectify::Command
+        # Public: Initializes the command.
+        #
+        # meeting - Decidim::Meetings::Meeting
+        # current_user - the user performing the action
+        def initialize(meeting, current_user)
+          @meeting = meeting
+          @current_user = current_user
+        end
+
+        # Executes the command. Broadcasts these events:
+        #
+        # - :ok when everything is valid.
+        # - :invalid if the form wasn't valid and we couldn't proceed.
+        #
+        # Returns nothing.
+        def call
+          return broadcast(:invalid) if meeting.published?
+
+          transaction do
+            publish_meeting
+            send_notification
+            schedule_upcoming_meeting_notification
+          end
+
+          broadcast(:ok, meeting)
+        end
+
+        private
+
+        attr_reader :meeting, :current_user
+
+        def publish_meeting
+          @meeting = Decidim.traceability.perform_action!(
+            :publish,
+            meeting,
+            current_user,
+            visibility: "all"
+          ) do
+            meeting.publish!
+            meeting
+          end
+        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,
+            force_send: true
+          )
+        end
+
+        def schedule_upcoming_meeting_notification
+          checksum = Decidim::Meetings::UpcomingMeetingNotificationJob.generate_checksum(meeting)
+
+          Decidim::Meetings::UpcomingMeetingNotificationJob
+            .set(wait_until: meeting.start_time - 2.days)
+            .perform_later(meeting.id, checksum)
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Meetings
+    module Admin
+      # A command with all the business logic that unpublishes an
+      # existing meeting.
+      class UnpublishMeeting < Rectify::Command
+        # Public: Initializes the command.
+        #
+        # meeting - Decidim::Meetings::Meeting
+        # current_user - the user performing the action
+        def initialize(meeting, current_user)
+          @meeting = meeting
+          @current_user = current_user
+        end
+
+        # Executes the command. Broadcasts these events:
+        #
+        # - :ok when everything is valid.
+        # - :invalid if the form wasn't valid and we couldn't proceed.
+        #
+        # Returns nothing.
+        def call
+          return broadcast(:invalid) unless meeting.published?
+
+          @meeting = Decidim.traceability.perform_action!(
+            :unpublish,
+            meeting,
+            current_user,
+            visibility: "all"
+          ) do
+            meeting.unpublish!
+            meeting
+          end
+          broadcast(:ok, meeting)
+        end
+
+        private
+
+        attr_reader :meeting, :current_user
+      end
+    end
+  end
+end

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

@@ -24,7 +24,7 @@ module Decidim
           transaction do
             update_meeting!
             send_notification if should_notify_followers?
-            schedule_upcoming_meeting_notification if start_time_changed?
+            schedule_upcoming_meeting_notification if meeting.published? && start_time_changed?
             update_services!
           end
 
@@ -59,7 +59,10 @@ module Decidim
             location: form.location,
             location_hints: form.location_hints,
             private_meeting: form.private_meeting,
-            transparent: form.transparent
+            transparent: form.transparent,
+            customize_registration_email: form.customize_registration_email,
+            registration_email_custom_content: form.registration_email_custom_content,
+            show_embedded_iframe: form.show_embedded_iframe
           )
         end
 
@@ -80,7 +83,7 @@ module Decidim
         end
 
         def should_notify_followers?
-          important_attributes.any? { |attr| meeting.previous_changes[attr].present? }
+          meeting.published? && important_attributes.any? { |attr| meeting.previous_changes[attr].present? }
         end
 
         def important_attributes

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

@@ -0,0 +1,57 @@
+# 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 UpdateQuestionStatus < Rectify::Command
+        class InvalidStatus < StandardError; end
+
+        # 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(question, current_user)
+          @question = question
+          @current_user = current_user
+        end
+
+        # Updates the questionnaire if valid.
+        #
+        # Broadcasts :ok if successful, :invalid otherwise.
+        def call
+          Decidim::Meetings::Question.transaction do
+            update_question
+          end
+
+          broadcast(:ok)
+        rescue InvalidStatus
+          broadcast(:invalid)
+        end
+
+        private
+
+        attr_reader :question, :current_user
+
+        def update_question
+          Decidim.traceability.update!(
+            question,
+            current_user,
+            status: new_status(question)
+          )
+        end
+
+        def new_status(question)
+          if question.unpublished?
+            Decidim::Meetings::Question.statuses[:published]
+          elsif question.published?
+            Decidim::Meetings::Question.statuses[:closed]
+          else
+            raise InvalidStatus
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,93 @@
+# 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 < Rectify::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::Meetings::Questionnaire.transaction do
+            create_questionnaire_for
+            create_questionaire
+            if @questionnaire.questions_editable?
+              update_questionnaire_questions
+              delete_answers
+            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/close_meeting.rb

@@ -41,7 +41,9 @@ module Decidim
           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

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 < Rectify::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

@@ -52,7 +52,9 @@ module Decidim
           registration_terms: { I18n.locale => form.registration_terms },
           registrations_enabled: form.registrations_enabled,
           type_of_meeting: form.clean_type_of_meeting,
-          component: form.current_component
+          component: form.current_component,
+          published_at: Time.current,
+          show_embedded_iframe: form.show_embedded_iframe
         }
 
         @meeting = Decidim.traceability.create!(

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

@@ -55,7 +55,8 @@ module Decidim
         @registration = Decidim::Meetings::Registration.create!(
           meeting: meeting,
           user: user,
-          user_group: user_group
+          user_group: user_group,
+          public_participation: registration_form.public_participation
         )
       end
 

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

@@ -62,7 +62,8 @@ module Decidim
             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
+            online_meeting_url: form.online_meeting_url,
+            show_embedded_iframe: form.show_embedded_iframe
           },
           visibility: "public-only"
         )

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
+            [
+              :type_eq,
+              :is_upcoming_true,
+              :scope_id_eq,
+              :category_id_eq,
+              :origin_eq,
+              :closed_at_present
+            ]
+          end
+
+          def filters_with_values
+            {
+              type_eq: 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),
+              origin_eq: %w(citizen 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