decidim-meetings 0.22.0 → 0.23.3

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

@@ -0,0 +1,94 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Meetings
+    # This command is executed when the user changes a Meeting from the admin
+    # panel.
+    class UpdateMeeting < Rectify::Command
+      # 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)
+        @form = form
+        @current_user = current_user
+        @meeting = meeting
+      end
+
+      # Updates the meeting if valid.
+      #
+      # Broadcasts :ok if successful, :invalid otherwise.
+      def call
+        return broadcast(:invalid) if form.invalid?
+
+        transaction do
+          update_meeting!
+          send_notification if should_notify_followers?
+          schedule_upcoming_meeting_notification if start_time_changed?
+        end
+
+        broadcast(:ok, meeting)
+      end
+
+      private
+
+      attr_reader :form, :current_user, :meeting
+
+      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
+
+        Decidim.traceability.update!(
+          meeting,
+          form.current_user,
+          {
+            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
+          },
+          visibility: "public-only"
+        )
+      end
+
+      def send_notification
+        Decidim::EventsManager.publish(
+          event: "decidim.events.meetings.meeting_updated",
+          event_class: Decidim::Meetings::UpdateMeetingEvent,
+          resource: meeting,
+          followers: meeting.followers
+        )
+      end
+
+      def should_notify_followers?
+        important_attributes.any? { |attr| meeting.previous_changes[attr].present? }
+      end
+
+      def important_attributes
+        %w(start_time end_time address)
+      end
+
+      def start_time_changed?
+        meeting.previous_changes["start_time"].present?
+      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

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

@@ -17,7 +17,7 @@ module Decidim
         end
 
         def meeting
-          @meeting ||= meetings.find(params[:id])
+          @meeting ||= meetings.find(params[:id]) if params[:id]
         end
       end
     end

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

@@ -10,15 +10,15 @@ module Decidim
         def new
           enforce_permission_to :create, :meeting
 
-          @form = form(MeetingForm).instance
+          @form = meeting_form.instance
         end
 
         def create
           enforce_permission_to :create, :meeting
 
-          @form = form(MeetingForm).from_params(params, current_component: current_component)
+          @form = meeting_form.from_params(params, current_component: current_component)
 
-          CreateMeeting.call(@form) do
+          Decidim::Meetings::Admin::CreateMeeting.call(@form) do
             on(:ok) do
               flash[:notice] = I18n.t("meetings.create.success", scope: "decidim.meetings.admin")
               redirect_to meetings_path
@@ -34,15 +34,15 @@ module Decidim
         def edit
           enforce_permission_to :update, :meeting, meeting: meeting
 
-          @form = form(MeetingForm).from_model(meeting)
+          @form = meeting_form.from_model(meeting)
         end
 
         def update
           enforce_permission_to :update, :meeting, meeting: meeting
 
-          @form = form(MeetingForm).from_params(params, current_component: current_component)
+          @form = meeting_form.from_params(params, current_component: current_component)
 
-          UpdateMeeting.call(@form, meeting) do
+          Decidim::Meetings::Admin::UpdateMeeting.call(@form, meeting) do
             on(:ok) do
               flash[:notice] = I18n.t("meetings.update.success", scope: "decidim.meetings.admin")
               redirect_to meetings_path
@@ -58,7 +58,7 @@ module Decidim
         def destroy
           enforce_permission_to :destroy, :meeting, meeting: meeting
 
-          DestroyMeeting.call(meeting, current_user) do
+          Decidim::Meetings::Admin::DestroyMeeting.call(meeting, current_user) do
             on(:ok) do
               flash[:notice] = I18n.t("meetings.destroy.success", scope: "decidim.meetings.admin")
 
@@ -79,6 +79,10 @@ module Decidim
 
         private
 
+        def meeting_form
+          form(Decidim::Meetings::Admin::MeetingForm)
+        end
+
         def blank_service
           @blank_service ||= Admin::MeetingServiceForm.new
         end

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

@@ -19,6 +19,10 @@ module Decidim
           edit_meeting_registrations_path(meeting_id: meeting.id)
         end
 
+        def public_url
+          Decidim::EngineRouter.main_proxy(current_component).join_meeting_registration_path(meeting)
+        end
+
         private
 
         def meeting

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

@@ -5,39 +5,94 @@ module Decidim
     # Exposes the meeting resource so users can view them
     class MeetingsController < Decidim::Meetings::ApplicationController
       include FilterResource
+      include Flaggable
+      include FormFactory
       include Paginable
       helper Decidim::WidgetUrlsHelper
+      helper Decidim::ResourceVersionsHelper
 
       helper_method :meetings, :meeting, :registration, :search
 
+      def new
+        enforce_permission_to :create, :meeting
+
+        @form = meeting_form.instance
+      end
+
+      def create
+        enforce_permission_to :create, :meeting
+
+        @form = meeting_form.from_params(params, current_component: current_component)
+
+        CreateMeeting.call(@form) do
+          on(:ok) do |meeting|
+            flash[:notice] = I18n.t("meetings.create.success", scope: "decidim.meetings")
+            redirect_to meeting_path(meeting)
+          end
+
+          on(:invalid) do
+            flash.now[:alert] = I18n.t("meetings.create.invalid", scope: "decidim.meetings")
+            render action: "new"
+          end
+        end
+      end
+
       def index
-        return unless search.results.blank? && params.dig("filter", "date") != "past"
+        return unless search.results.blank? && params.dig("filter", "date") != %w(past)
 
-        @past_meetings = search_klass.new(search_params.merge(date: "past"))
+        @past_meetings = search_klass.new(search_params.merge(date: %w(past)))
 
         if @past_meetings.results.present?
           params[:filter] ||= {}
-          params[:filter][:date] = "past"
+          params[:filter][:date] = %w(past)
           @forced_past_meetings = true
           @search = @past_meetings
         end
       end
 
       def show
+        raise ActionController::RoutingError, "Not Found" unless meeting
+
+        @report_form = form(Decidim::ReportForm).from_params(reason: "spam")
+
         return if meeting.current_user_can_visit_meeting?(current_user)
 
         flash[:alert] = I18n.t("meeting.not_allowed", scope: "decidim.meetings")
-        redirect_to action: "index"
+        redirect_to(ResourceLocatorPresenter.new(meeting).index)
+      end
+
+      def edit
+        enforce_permission_to :update, :meeting, meeting: meeting
+
+        @form = meeting_form.from_model(meeting)
+      end
+
+      def update
+        enforce_permission_to :update, :meeting, meeting: meeting
+
+        @form = meeting_form.from_params(params)
+
+        UpdateMeeting.call(@form, current_user, meeting) do
+          on(:ok) do |meeting|
+            flash[:notice] = I18n.t("meetings.update.success", scope: "decidim.meetings")
+            redirect_to Decidim::ResourceLocatorPresenter.new(meeting).path
+          end
+
+          on(:invalid) do
+            flash.now[:alert] = I18n.t("meetings.update.invalid", scope: "decidim.meetings")
+            render :edit
+          end
+        end
       end
 
       private
 
       def meeting
-        @meeting ||= Meeting.where(component: current_component).find(params[:id])
+        @meeting ||= Meeting.not_hidden.where(component: current_component).find(params[:id])
       end
 
       def meetings
-        @meetings ||= paginate(search.results)
+        @meetings ||= paginate(search.results.not_hidden)
       end
 
       def registration
@@ -48,24 +103,32 @@ module Decidim
         MeetingSearch
       end
 
+      def meeting_form
+        form(Decidim::Meetings::MeetingForm)
+      end
+
       def default_filter_params
         {
-          date: "upcoming",
           search_text: "",
-          scope_id: "",
-          category_id: ""
+          date: %w(upcoming),
+          scope_id: default_filter_scope_params,
+          category_id: default_filter_category_params,
+          origin: default_filter_origin_params
         }
       end
 
+      def default_filter_origin_params
+        filter_origin_params = %w(citizens)
+        filter_origin_params << "official"
+        filter_origin_params << "user_group" if current_organization.user_groups_enabled?
+        filter_origin_params
+      end
+
       def default_search_params
         {
           scope: Meeting.visible_meeting_for(current_user)
         }
       end
-
-      def context_params
-        { component: current_component, organization: current_organization }
-      end
     end
   end
 end

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

@@ -30,7 +30,7 @@ module Decidim
       end
 
       def create
-        enforce_permission_to :join, :meeting, meeting: meeting
+        enforce_permission_to :register, :meeting, meeting: meeting
 
         @form = JoinMeetingForm.from_params(params)
 

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

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Meetings
+    # Exposes the meeting resource so users can view them
+    class VersionsController < Decidim::Meetings::ApplicationController
+      include Decidim::ResourceVersionsConcern
+
+      def versioned_resource
+        @versioned_resource ||= Meeting.not_hidden.where(component: current_component).find(params[:meeting_id])
+      end
+    end
+  end
+end

data/app/controllers/decidim/meetings/{meeting_widgets_controller.rb → widgets_controller.rb}

@@ -2,7 +2,7 @@
 
 module Decidim
   module Meetings
-    class MeetingWidgetsController < Decidim::WidgetsController
+    class WidgetsController < Decidim::WidgetsController
       helper MeetingsHelper
       helper Decidim::SanitizeHelper
 
@@ -13,7 +13,7 @@ module Decidim
       end
 
       def iframe_url
-        @iframe_url ||= meeting_meeting_widget_url(model)
+        @iframe_url ||= meeting_widget_url(model)
       end
     end
   end

data/app/forms/decidim/meetings/admin/meeting_copy_form.rb

@@ -21,7 +21,6 @@ module Decidim
         attribute :end_time, Decidim::Attributes::TimeWithZone
         attribute :private_meeting, Boolean
         attribute :transparent, Boolean
-        attribute :organizer_id, Integer
         attribute :services, Array[MeetingServiceForm]
 
         mimic :meeting
@@ -32,14 +31,13 @@ module Decidim
         validates :description, translatable_presence: true
         validates :location, translatable_presence: true
         validates :address, presence: true
-        validates :address, geocoding: true, if: -> { Decidim.geocoder.present? }
+        validates :address, geocoding: true, if: -> { Decidim::Map.available?(:geocoding) }
         validates :start_time, presence: true, date: { before: :end_time }
         validates :end_time, presence: true, date: { after: :start_time }
-        validates :organizer, presence: true, if: ->(form) { form.organizer_id.present? }
 
         def map_model(model)
           self.services = model.services.map do |service|
-            MeetingServiceForm.new(service)
+            MeetingServiceForm.new(service.attributes)
           end
         end
 
@@ -53,10 +51,6 @@ module Decidim
 
         alias component current_component
 
-        def organizer
-          @organizer ||= current_organization.users.find_by(id: organizer_id)
-        end
-
         def questionnaire
           Decidim::Forms::Questionnaire.new
         end

data/app/forms/decidim/meetings/admin/meeting_form.rb

@@ -3,15 +3,10 @@
 module Decidim
   module Meetings
     module Admin
-      # This class holds a Form to create/update meetings from Decidim's admin panel.
+      # This class holds a Form to create/update translatable meetings from Decidim's admin panel.
       class MeetingForm < Decidim::Form
         include TranslatableAttributes
 
-        translatable_attribute :title, String
-        translatable_attribute :description, String
-        translatable_attribute :location, String
-        translatable_attribute :location_hints, String
-
         attribute :address, String
         attribute :latitude, Float
         attribute :longitude, Float
@@ -22,34 +17,38 @@ module Decidim
         attribute :decidim_category_id, Integer
         attribute :private_meeting, Boolean
         attribute :transparent, Boolean
-        attribute :organizer_id, Integer
+
+        translatable_attribute :title, String
+        translatable_attribute :description, String
+        translatable_attribute :location, String
+        translatable_attribute :location_hints, String
 
         validates :title, translatable_presence: true
         validates :description, translatable_presence: true
         validates :location, translatable_presence: true
+
         validates :address, presence: true
-        validates :address, geocoding: true, if: -> { Decidim.geocoder.present? }
+        validates :address, geocoding: true, if: ->(form) { form.has_address? && !form.geocoded? }
         validates :start_time, presence: true, date: { before: :end_time }
         validates :end_time, presence: true, date: { after: :start_time }
 
         validates :current_component, presence: true
         validates :category, presence: true, if: ->(form) { form.decidim_category_id.present? }
         validates :scope, presence: true, if: ->(form) { form.decidim_scope_id.present? }
-        validates :organizer, presence: true, if: ->(form) { form.organizer_id.present? }
-
-        validate :scope_belongs_to_participatory_space_scope
+        validates :decidim_scope_id, scope_belongs_to_component: true, if: ->(form) { form.decidim_scope_id.present? }
 
         delegate :categories, to: :current_component
 
         def map_model(model)
           self.services = model.services.map do |service|
-            MeetingServiceForm.new(service)
+            MeetingServiceForm.from_model(service)
           end
 
           self.decidim_category_id = model.categorization.decidim_category_id if model.categorization
           presenter = MeetingPresenter.new(model)
-          self.title = presenter.title(all_locales: true)
-          self.description = presenter.description(all_locales: true)
+
+          self.title = presenter.title(all_locales: title.is_a?(Hash))
+          self.description = presenter.description(all_locales: description.is_a?(Hash))
         end
 
         def services_to_persist
@@ -60,17 +59,13 @@ module Decidim
           services.size
         end
 
-        def organizer
-          @organizer ||= current_organization.users.find_by(id: organizer_id)
-        end
-
         alias component current_component
 
-        # Finds the Scope from the given decidim_scope_id, uses participatory space scope if missing.
+        # Finds the Scope from the given decidim_scope_id, uses component scope if missing.
         #
         # Returns a Decidim::Scope
         def scope
-          @scope ||= @decidim_scope_id ? current_participatory_space.scopes.find_by(id: @decidim_scope_id) : current_participatory_space.scope
+          @scope ||= @decidim_scope_id ? current_component.scopes.find_by(id: @decidim_scope_id) : current_component.scope
         end
 
         # Scope identifier
@@ -86,10 +81,16 @@ module Decidim
           @category ||= categories.find_by(id: decidim_category_id)
         end
 
-        private
+        def geocoding_enabled?
+          Decidim::Map.available?(:geocoding)
+        end
+
+        def has_address?
+          geocoding_enabled? && address.present?
+        end
 
-        def scope_belongs_to_participatory_space_scope
-          errors.add(:decidim_scope_id, :invalid) if current_participatory_space.out_of_scope?(scope)
+        def geocoded?
+          latitude.present? && longitude.present?
         end
       end
     end