decidim-meetings 0.26.2 → 0.27.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 26691ea95f69bf432c5fa438182b8ce6a20c897f15821a66dc92670ae76ec0eb
-  data.tar.gz: 6d5fd46688388abc4c87fbd8869c8bcf4fcf725974f4d1cc27ccea86ecf452a0
+  metadata.gz: 27a158b5c9a9dec97373dfc3ec0d72e08921ea0d9e1403416cf686a008fe392e
+  data.tar.gz: 94090d3db90607fd599dc45bc61825ee1561cd20b2242143b2b0098d73740138
 SHA512:
-  metadata.gz: cb185e7bc69a84b2b5582a8ec5cb0f1619c7687a6c7f7b2c2a6db1a52aff31f1448bef465f14d5be0525f8a145278b21014ceeba0052a528815e0054c75ea837
-  data.tar.gz: 503ab4fda399ac1a43233b8d55afdff838b4b44f1e25d0d9416975c0f5e11c37379000e4a4d7e30a5c1118e984aed584154be8b9cfdad1bb2190eff21c54ef7b
+  metadata.gz: fca8eabda9f4e26bf77f4021a9f4ab74de63da59118b76d997089f8a87ec84e81f678f69b89be07e354724165ca2a19b1015d943b87e21de2328580a5672bb72
+  data.tar.gz: 15c6907d0cad955e13c2dc93a540bdb6eb5707b7617aa3d5c5671a369c6133c99f4719248e71cc6b35b1ed24c1417dace9c424111ed666ce605a2e237ed858a4

data/app/cells/decidim/meetings/content_blocks/highlighted_meetings_cell.rb

@@ -10,7 +10,7 @@ module Decidim
             .published
             .not_hidden
             .upcoming
-            .visible_meeting_for(current_user)
+            .visible_for(current_user)
             .where(component: published_components)
         end
 

data/app/cells/decidim/meetings/content_blocks/upcoming_meetings/show.erb

@@ -1,4 +1,4 @@
-<section class="wrapper-home upcoming-meetings home-section">
+<section id="upcoming_meetings" class="wrapper-home upcoming-meetings home-section">
   <div class="row">
     <h3 class="section-heading"><%= t("decidim.meetings.content_blocks.upcoming_meetings.upcoming_meetings") %></h3>
     <div class="row">

data/app/cells/decidim/meetings/content_blocks/upcoming_meetings_cell.rb

@@ -14,9 +14,9 @@ module Decidim
 
         def upcoming_meetings
           @upcoming_meetings ||= Decidim::Meetings::Meeting
-                                 .includes(component: :participatory_space)
+                                 .includes(:author, component: :participatory_space)
                                  .where(component: meeting_components)
-                                 .visible_meeting_for(current_user)
+                                 .visible_for(current_user)
                                  .published
                                  .where("end_time >= ?", Time.current)
                                  .except_withdrawn

data/app/cells/decidim/meetings/highlighted_meetings_for_component_cell.rb

@@ -22,7 +22,7 @@ module Decidim
                                                 .except_withdrawn
                                                 .published
                                                 .not_hidden
-                                                .visible_meeting_for(current_user)
+                                                .visible_for(current_user)
       end
 
       def past_meetings
@@ -44,6 +44,15 @@ module Decidim
       def upcoming_meetings_count
         @upcoming_meetings_count ||= meetings.upcoming.count
       end
+
+      def cache_hash
+        hash = []
+        hash << "decidim/meetings/highlighted_meetings_for_component"
+        hash << meetings.cache_key_with_version
+        hash.push(current_user.try(:id))
+        hash << I18n.locale.to_s
+        hash.join(Decidim.cache_key_separator)
+      end
     end
   end
 end

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

@@ -5,7 +5,7 @@ module Decidim
     module Admin
       # This command is executed when the user closes a Meeting from the admin
       # panel.
-      class CloseMeeting < Rectify::Command
+      class CloseMeeting < Decidim::Command
         # Initializes a CloseMeeting Command.
         #
         # form - The form from which to get the data.

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

@@ -5,7 +5,7 @@ module Decidim
     module Admin
       # A command with all the business logic when copying a meeting
       # in the system.
-      class CopyMeeting < Rectify::Command
+      class CopyMeeting < Decidim::Command
         # Public: Initializes the command.
         #
         # form - A form object with the params.

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

@@ -5,7 +5,7 @@ module Decidim
     module Admin
       # This command is executed when the user creates a Meeting from the admin
       # panel.
-      class CreateAgenda < Rectify::Command
+      class CreateAgenda < Decidim::Command
         def initialize(form, meeting)
           @form = form
           @meeting = meeting

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

@@ -5,7 +5,7 @@ module Decidim
     module Admin
       # This command is executed when the user creates a Meeting from the admin
       # panel.
-      class CreateMeeting < Rectify::Command
+      class CreateMeeting < Decidim::Command
         def initialize(form)
           @form = form
         end
@@ -42,7 +42,6 @@ module Decidim
             online_meeting_url: form.online_meeting_url,
             registration_type: form.registration_type,
             registration_url: form.registration_url,
-            available_slots: form.available_slots,
             type_of_meeting: form.clean_type_of_meeting,
             address: form.address,
             latitude: form.latitude,
@@ -55,8 +54,6 @@ module Decidim
             registration_terms: form.current_component.settings.default_registration_terms,
             component: form.current_component,
             questionnaire: Decidim::Forms::Questionnaire.new,
-            customize_registration_email: form.customize_registration_email,
-            registration_email_custom_content: form.registration_email_custom_content,
             iframe_embed_type: form.iframe_embed_type,
             comments_enabled: form.comments_enabled,
             comments_start_time: form.comments_start_time,

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

@@ -5,7 +5,7 @@ module Decidim
     module Admin
       # This command is executed when the user destroys a Meeting from the admin
       # panel.
-      class DestroyMeeting < Rectify::Command
+      class DestroyMeeting < Decidim::Command
         # Initializes a CloseMeeting Command.
         #
         # meeting - The current instance of the page to be closed.

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

@@ -5,7 +5,7 @@ module Decidim
     module Admin
       # This command is executed when the user exports the registrations of
       # a Meeting from the admin panel.
-      class ExportMeetingRegistrations < Rectify::Command
+      class ExportMeetingRegistrations < Decidim::Command
         # meeting - The current instance of the page to be closed.
         # format - a string representing the export format
         # current_user - the user performing the action

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

@@ -5,7 +5,7 @@ module Decidim
     module Admin
       # A command with all the business logic to invite users to join a meeting.
       #
-      class InviteUserToJoinMeeting < Rectify::Command
+      class InviteUserToJoinMeeting < Decidim::Command
         # Public: Initializes the command.
         #
         # form         - A form object with the params.
@@ -86,16 +86,14 @@ module Decidim
         end
 
         def user
-          @user ||= begin
-            if form.existing_user
-              form.user
-            else
-              Decidim::User.find_or_initialize_by(
-                organization: form.current_organization,
-                email: form.email.downcase
-              )
-            end
-          end
+          @user ||= if form.existing_user
+                      form.user
+                    else
+                      Decidim::User.find_or_initialize_by(
+                        organization: form.current_organization,
+                        email: form.email.downcase
+                      )
+                    end
         end
 
         def invite_user_to_sign_up

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

@@ -5,7 +5,7 @@ module Decidim
     module Admin
       # A command with all the business logic that publishes an
       # existing meeting.
-      class PublishMeeting < Rectify::Command
+      class PublishMeeting < Decidim::Command
         # Public: Initializes the command.
         #
         # meeting - Decidim::Meetings::Meeting

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

@@ -5,7 +5,7 @@ module Decidim
     module Admin
       # A command with all the business logic that unpublishes an
       # existing meeting.
-      class UnpublishMeeting < Rectify::Command
+      class UnpublishMeeting < Decidim::Command
         # Public: Initializes the command.
         #
         # meeting - Decidim::Meetings::Meeting

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

@@ -5,7 +5,7 @@ module Decidim
     module Admin
       # This command is executed when the user creates a Meeting from the admin
       # panel.
-      class UpdateAgenda < Rectify::Command
+      class UpdateAgenda < Decidim::Command
         def initialize(form, agenda)
           @form = form
           @agenda = agenda

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

@@ -5,7 +5,7 @@ module Decidim
     module Admin
       # 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.
@@ -51,7 +51,6 @@ module Decidim
             online_meeting_url: form.online_meeting_url,
             registration_type: form.registration_type,
             registration_url: form.registration_url,
-            available_slots: form.available_slots,
             type_of_meeting: form.clean_type_of_meeting,
             address: form.address,
             latitude: form.latitude,
@@ -60,8 +59,6 @@ module Decidim
             location_hints: form.location_hints,
             private_meeting: form.private_meeting,
             transparent: form.transparent,
-            customize_registration_email: form.customize_registration_email,
-            registration_email_custom_content: form.registration_email_custom_content,
             iframe_embed_type: form.iframe_embed_type,
             comments_enabled: form.comments_enabled,
             comments_start_time: form.comments_start_time,

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

@@ -5,7 +5,7 @@ module Decidim
     module Admin
       # This command is executed when the user changes a Questionnaire from the admin
       # panel.
-      class UpdateQuestionStatus < Rectify::Command
+      class UpdateQuestionStatus < Decidim::Command
         class InvalidStatus < StandardError; end
 
         # Initializes a UpdateQuestionnaire Command.

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

@@ -5,7 +5,7 @@ module Decidim
     module Admin
       # This command is executed when the user changes a Questionnaire from the admin
       # panel.
-      class UpdateQuestionnaire < Rectify::Command
+      class UpdateQuestionnaire < Decidim::Command
         # Initializes a UpdateQuestionnaire Command.
         #
         # form - The form from which to get the data.
@@ -21,12 +21,15 @@ module Decidim
         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
+          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
 

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.

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

@@ -4,7 +4,7 @@ module Decidim
   module Meetings
     # This command is executed when the user closes a Meeting from the public
     # views.
-    class CloseMeeting < Rectify::Command
+    class CloseMeeting < Decidim::Command
       # Initializes a CloseMeeting Command.
       #
       # form - The form from which to get the data.

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

@@ -3,7 +3,7 @@
 module Decidim
   module Meetings
     # This command is executed when the user creates an Answer in a meeting poll.
-    class CreateAnswer < Rectify::Command
+    class CreateAnswer < Decidim::Command
       def initialize(form, current_user, questionnaire)
         @form = form
         @current_user = current_user

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

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,7 +48,15 @@ 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
@@ -123,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

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.

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

@@ -3,7 +3,7 @@
 module Decidim
   module Meetings
     # A command with all the business logic when a user withdraws a new proposal.
-    class WithdrawMeeting < Rectify::Command
+    class WithdrawMeeting < Decidim::Command
       # Public: Initializes the command.
       #
       # meeting     - The meeting to withdraw.

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

@@ -21,23 +21,23 @@ module Decidim
 
           def filters
             [
-              :type_eq,
+              :with_any_type,
               :is_upcoming_true,
               :scope_id_eq,
               :category_id_eq,
-              :origin_eq,
+              :with_any_origin,
               :closed_at_present
             ]
           end
 
           def filters_with_values
             {
-              type_eq: meeting_types,
+              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),
-              origin_eq: %w(citizen official user_group)
+              with_any_origin: %w(participants official user_group)
             }
           end
 

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

@@ -15,14 +15,8 @@ module Decidim
           %w(all) + Decidim::Meetings::Meeting::TYPE_OF_MEETING
         end
 
-        def default_search_params
-          {
-            scope: Meeting.not_hidden.visible_meeting_for(current_user)
-          }
-        end
-
         def default_filter_origin_params
-          filter_origin_params = %w(citizens)
+          filter_origin_params = %w(participants)
           filter_origin_params << "official"
           filter_origin_params << "user_group" if current_organization.user_groups_enabled?
           filter_origin_params

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

@@ -11,7 +11,7 @@ module Decidim
       skip_around_action :use_organization_time_zone
 
       def show
-        render plain: CalendarRenderer.for(current_component), content_type: "type/calendar"
+        render plain: CalendarRenderer.for(current_component, params[:filter]), content_type: "type/calendar"
       end
 
       def meeting_calendar

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

@@ -15,33 +15,40 @@ module Decidim
         helper Decidim::FiltersHelper
         helper Decidim::Meetings::MapHelper
         helper Decidim::ResourceHelper
+        helper Decidim::ShortLinkHelper
 
         helper_method :meetings, :search
 
         def calendar
-          render plain: CalendarRenderer.for(current_organization), content_type: "type/calendar"
+          render plain: CalendarRenderer.for(current_organization, params[:filter]), content_type: "type/calendar"
         end
 
         private
 
         def meetings
-          @meetings ||= paginate(search.results)
+          is_past_meetings = params.dig("filter", "with_any_date")&.include?("past")
+          @meetings ||= paginate(search.result.order(start_time: is_past_meetings ? :desc : :asc))
         end
 
-        def search_klass
-          ::Decidim::Meetings::Directory::MeetingSearch
+        def search_collection
+          Meeting.where(component: meeting_components).published.not_hidden.visible_for(current_user).with_availability(
+            filter_params[:availability]
+          ).includes(
+            :component,
+            attachments: :file_attachment
+          )
         end
 
         def default_filter_params
           {
-            date: "upcoming",
-            search_text: "",
+            with_any_date: "upcoming",
+            title_or_description_cont: "",
             activity: "all",
-            scope_id: default_filter_scope_params,
-            space: default_filter_space_params,
-            type: default_filter_type_params,
-            origin: default_filter_origin_params,
-            category_id: default_filter_category_params
+            with_any_scope: default_filter_scope_params,
+            with_any_space: default_filter_space_params,
+            with_any_type: default_filter_type_params,
+            with_any_origin: default_filter_origin_params,
+            with_any_global_category: default_filter_category_params
           }
         end
 
@@ -68,10 +75,6 @@ module Decidim
           %w(all global) + current_organization.scopes.pluck(:id).map(&:to_s)
         end
 
-        def context_params
-          { component: meeting_components, organization: current_organization, current_user: current_user }
-        end
-
         def meeting_components
           @meeting_components ||= Decidim::Component
                                   .where(manifest_name: "meetings")

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

@@ -13,6 +13,7 @@ module Decidim
 
       helper Decidim::WidgetUrlsHelper
       helper Decidim::ResourceVersionsHelper
+      helper Decidim::ShortLinkHelper
 
       helper_method :meetings, :meeting, :registration, :search
 
@@ -41,13 +42,13 @@ module Decidim
       end
 
       def index
-        return unless search.results.blank? && params.dig("filter", "date") != %w(past)
+        return unless search.result.blank? && params.dig("filter", "date") != %w(past)
 
-        @past_meetings = search_klass.new(search_params.merge(date: %w(past)))
+        @past_meetings ||= search_with(filter_params.merge(with_any_date: %w(past)))
 
-        if @past_meetings.results.present?
+        if @past_meetings.result.present?
           params[:filter] ||= {}
-          params[:filter][:date] = %w(past)
+          params[:filter][:with_any_date] = %w(past)
           @forced_past_meetings = true
           @search = @past_meetings
         end
@@ -108,15 +109,21 @@ module Decidim
       end
 
       def meetings
-        @meetings ||= paginate(search.results.order(start_time: :desc))
+        is_past_meetings = params.dig("filter", "with_any_date")&.include?("past")
+        @meetings ||= paginate(search.result.order(start_time: is_past_meetings ? :desc : :asc))
       end
 
       def registration
         @registration ||= meeting.registrations.find_by(user: current_user)
       end
 
-      def search_klass
-        MeetingSearch
+      def search_collection
+        Meeting.where(component: current_component).published.not_hidden.visible_for(current_user).with_availability(
+          filter_params[:with_availability]
+        ).includes(
+          :component,
+          attachments: :file_attachment
+        )
       end
 
       def meeting_form
@@ -125,14 +132,15 @@ module Decidim
 
       def default_filter_params
         {
-          search_text: "",
-          date: %w(upcoming),
+          search_text_cont: "",
+          with_any_date: "upcoming",
           activity: "all",
-          scope_id: default_filter_scope_params,
-          category_id: default_filter_category_params,
-          state: nil,
-          origin: default_filter_origin_params,
-          type: default_filter_type_params
+          with_availability: "",
+          with_any_scope: default_filter_scope_params,
+          with_any_category: default_filter_category_params,
+          with_any_state: nil,
+          with_any_origin: default_filter_origin_params,
+          with_any_type: default_filter_type_params
         }
       end
     end