decidim-meetings 0.21.0 → 0.23.2

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/close_meeting_form.rb

@@ -25,7 +25,13 @@ module Decidim
         # Returns nothing.
         def map_model(model)
           self.proposal_ids = model.linked_resources(:proposals, "proposals_from_meeting").pluck(:id)
-          self.proposals = model.sibling_scope(:proposals)
+        end
+
+        def proposals
+          @proposals ||= Decidim.find_resource_manifest(:proposals)
+                                .try(:resource_scope, current_component)
+                                &.where(id: proposal_ids)
+                                &.order(title: :asc)
         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

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

@@ -0,0 +1,78 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Meetings
+    # This class holds a Form to create/update meetings for Participants and UserGroups.
+    class MeetingForm < Decidim::Form
+      attribute :title, String
+      attribute :description, String
+      attribute :location, String
+      attribute :location_hints, String
+
+      attribute :address, String
+      attribute :latitude, Float
+      attribute :longitude, Float
+      attribute :start_time, Decidim::Attributes::TimeWithZone
+      attribute :end_time, Decidim::Attributes::TimeWithZone
+      attribute :decidim_scope_id, Integer
+      attribute :decidim_category_id, Integer
+      attribute :user_group_id, Integer
+
+      validates :title, presence: true
+      validates :description, presence: true
+      validates :location, presence: true
+      validates :address, presence: true
+      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 :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.decidim_category_id = model.categorization.decidim_category_id if model.categorization
+        presenter = MeetingPresenter.new(model)
+        self.title = presenter.title(all_locales: false)
+        self.description = presenter.description(all_locales: false)
+      end
+
+      alias component current_component
+
+      # Finds the Scope from the given decidim_scope_id, uses the compoenent scope if missing.
+      #
+      # Returns a Decidim::Scope
+      def scope
+        @scope ||= @decidim_scope_id ? current_component.scopes.find_by(id: @decidim_scope_id) : current_component.scope
+      end
+
+      # Scope identifier
+      #
+      # Returns the scope identifier related to the meeting
+      def decidim_scope_id
+        @decidim_scope_id || scope&.id
+      end
+
+      def category
+        return unless current_component
+
+        @category ||= categories.find_by(id: decidim_category_id)
+      end
+
+      def geocoding_enabled?
+        Decidim::Map.available?(:geocoding)
+      end
+
+      def has_address?
+        geocoding_enabled? && address.present?
+      end
+
+      def geocoded?
+        latitude.present? && longitude.present?
+      end
+    end
+  end
+end

data/app/helpers/decidim/meetings/admin/application_helper.rb

@@ -7,12 +7,7 @@ module Decidim
       #
       module ApplicationHelper
         include Decidim::MapHelper
-
-        def meeting_organizer_picker_text(form)
-          return "" if form.object.organizer.blank?
-
-          "#{form.object.organizer.name} (@#{form.object.organizer.nickname})"
-        end
+        include Decidim::Admin::ResourceScopeHelper
 
         def tabs_id_for_service(service)
           "meeting_service_#{service.to_param}"

data/app/helpers/decidim/meetings/application_helper.rb

@@ -10,6 +10,32 @@ module Decidim
       include Decidim::Meetings::MapHelper
       include Decidim::Meetings::MeetingsHelper
       include Decidim::Comments::CommentsHelper
+      include Decidim::SanitizeHelper
+      include Decidim::CheckBoxesTreeHelper
+
+      def filter_origin_values
+        origin_values = []
+        origin_values << TreePoint.new("official", t("decidim.meetings.meetings.filters.origin_values.official"))
+        origin_values << TreePoint.new("citizens", t("decidim.meetings.meetings.filters.origin_values.citizens")) # todo
+        # if component_settings enabled enabled
+        origin_values << TreePoint.new("user_group", t("decidim.meetings.meetings.filters.origin_values.user_groups")) # todo
+        # if current_organization.user_groups_enabled? and component_settings enabled enabled
+
+        TreeNode.new(
+          TreePoint.new("", t("decidim.meetings.meetings.filters.origin_values.all")),
+          origin_values
+        )
+      end
+
+      def filter_date_values
+        TreeNode.new(
+          TreePoint.new("", t("decidim.meetings.meetings.filters.date_values.all")),
+          [
+            TreePoint.new("upcoming", t("decidim.meetings.meetings.filters.date_values.upcoming")),
+            TreePoint.new("past", t("decidim.meetings.meetings.filters.date_values.past"))
+          ]
+        )
+      end
     end
   end
 end

data/app/helpers/decidim/meetings/map_helper.rb

@@ -4,6 +4,7 @@ module Decidim
   module Meetings
     # This helper include some methods for rendering meetings dynamic maps.
     module MapHelper
+      include Decidim::SanitizeHelper
       # Serialize a collection of geocoded meetings to be used by the dynamic map component
       #
       # meetings - A collection of meetings
@@ -18,7 +19,7 @@ module Decidim
                                                                startTime: "#{meeting.start_time.strftime("%H:%M")} - #{meeting.end_time.strftime("%H:%M")}",
                                                                icon: icon("meetings", width: 40, height: 70, remove_icon_class: true),
                                                                location: translated_attribute(meeting.location),
-                                                               locationHints: translated_attribute(meeting.location_hints),
+                                                               locationHints: decidim_html_escape(translated_attribute(meeting.location_hints)),
                                                                link: resource_locator(meeting).path)
         end
       end

data/app/helpers/decidim/meetings/meetings_helper.rb

@@ -16,7 +16,7 @@ module Decidim
       # Returns the meeting's description truncated.
       def meeting_description(meeting, max_length = 120)
         link = resource_locator(meeting).path
-        description = present(meeting).description
+        description = CGI.unescapeHTML present(meeting).description
         tail = "... #{link_to(t("read_more", scope: "decidim.meetings"), link)}".html_safe
         CGI.unescapeHTML html_truncate(description, max_length: max_length, tail: tail)
       end
@@ -107,6 +107,18 @@ module Decidim
           t("validation_pending", scope: "decidim.meetings.meetings.show.registration_state")
         end
       end
+
+      def author_presenter_for(author)
+        if author.is_a?(Decidim::Organization)
+          Decidim::Meetings::OfficialAuthorPresenter.new
+        else
+          present(author)
+        end
+      end
+
+      def current_user_groups?
+        current_organization.user_groups_enabled? && Decidim::UserGroups::ManageableUserGroups.for(current_user).verified.any?
+      end
     end
   end
 end

data/app/models/decidim/meetings/agenda.rb

@@ -7,6 +7,9 @@ module Decidim
     class Agenda < Meetings::ApplicationRecord
       include Decidim::Traceable
       include Decidim::Loggable
+      include Decidim::TranslatableResource
+
+      translatable_fields :title
 
       belongs_to :meeting, foreign_key: "decidim_meeting_id", class_name: "Decidim::Meetings::Meeting"
       has_many :agenda_items, foreign_key: "decidim_agenda_id", class_name: "Decidim::Meetings::AgendaItem", dependent: :destroy, inverse_of: :agenda

data/app/models/decidim/meetings/agenda_item.rb

@@ -7,6 +7,9 @@ module Decidim
     class AgendaItem < Meetings::ApplicationRecord
       include Decidim::Traceable
       include Decidim::Loggable
+      include Decidim::TranslatableResource
+
+      translatable_fields :title, :description
 
       belongs_to :agenda, -> { order(:position) }, foreign_key: "decidim_agenda_id", class_name: "Decidim::Meetings::Agenda"
 

data/app/models/decidim/meetings/meeting.rb

@@ -10,40 +10,72 @@ module Decidim
       include Decidim::HasAttachmentCollections
       include Decidim::HasComponent
       include Decidim::HasReference
-      include Decidim::ScopableComponent
+      include Decidim::ScopableResource
       include Decidim::HasCategory
       include Decidim::Followable
       include Decidim::Comments::Commentable
       include Decidim::Searchable
       include Decidim::Traceable
       include Decidim::Loggable
-      include Decidim::Hashtaggable
       include Decidim::Forms::HasQuestionnaire
       include Decidim::Paddable
       include Decidim::ActsAsAuthor
+      include Decidim::Reportable
+      include Decidim::Authorable
+      include Decidim::TranslatableResource
+
+      translatable_fields :title, :description, :location, :location_hints, :closing_report, :registration_terms
 
-      belongs_to :organizer, foreign_key: "organizer_id", class_name: "Decidim::User", optional: true
       has_many :registrations, class_name: "Decidim::Meetings::Registration", foreign_key: "decidim_meeting_id", dependent: :destroy
       has_many :invites, class_name: "Decidim::Meetings::Invite", foreign_key: "decidim_meeting_id", dependent: :destroy
+      has_many :services, class_name: "Decidim::Meetings::Service", foreign_key: "decidim_meeting_id", dependent: :destroy
       has_one :minutes, class_name: "Decidim::Meetings::Minutes", foreign_key: "decidim_meeting_id", dependent: :destroy
       has_one :agenda, class_name: "Decidim::Meetings::Agenda", foreign_key: "decidim_meeting_id", dependent: :destroy
 
       component_manifest_name "meetings"
 
       validates :title, presence: true
-      validate :organizer_belongs_to_organization
 
-      geocoded_by :address, http_headers: ->(proposal) { { "Referer" => proposal.component.organization.host } }
+      geocoded_by :address
 
       scope :past, -> { where(arel_table[:end_time].lteq(Time.current)) }
       scope :upcoming, -> { where(arel_table[:end_time].gteq(Time.current)) }
 
       scope :visible_meeting_for, lambda { |user|
-                                    joins("LEFT JOIN decidim_meetings_registrations ON
-                                    decidim_meetings_registrations.decidim_meeting_id = #{table_name}.id")
-                                      .where("(private_meeting = ? and decidim_meetings_registrations.decidim_user_id = ?)
-                                    or private_meeting = ? or (private_meeting = ? and transparent = ?)", true, user, false, true, true).distinct
-                                  }
+        (all.distinct if user&.admin?) ||
+          if user.present?
+            spaces = %w(assembly participatory_process)
+            spaces << "conference" if defined?(Decidim::Conference)
+            user_role_queries = spaces.map do |participatory_space_name|
+              "SELECT decidim_components.id FROM decidim_components
+              WHERE CONCAT(decidim_components.participatory_space_id, '-', decidim_components.participatory_space_type)
+              IN
+              (SELECT CONCAT(decidim_#{participatory_space_name}_user_roles.decidim_#{participatory_space_name}_id, '-Decidim::#{participatory_space_name.classify}')
+              FROM decidim_#{participatory_space_name}_user_roles WHERE decidim_#{participatory_space_name}_user_roles.decidim_user_id = ?)
+              "
+            end
+
+            where("decidim_meetings_meetings.private_meeting = ?
+            OR decidim_meetings_meetings.transparent = ?
+            OR decidim_meetings_meetings.id IN
+              (SELECT decidim_meetings_registrations.decidim_meeting_id FROM decidim_meetings_registrations WHERE decidim_meetings_registrations.decidim_user_id = ?)
+            OR decidim_meetings_meetings.decidim_component_id IN
+              (SELECT decidim_components.id FROM decidim_components
+                WHERE CONCAT(decidim_components.participatory_space_id, '-', decidim_components.participatory_space_type)
+                IN
+                  (SELECT CONCAT(decidim_participatory_space_private_users.privatable_to_id, '-', decidim_participatory_space_private_users.privatable_to_type)
+                  FROM decidim_participatory_space_private_users WHERE decidim_participatory_space_private_users.decidim_user_id = ?)
+              )
+            OR decidim_meetings_meetings.decidim_component_id IN
+              (
+                #{user_role_queries.compact.join(" UNION ")}
+              )
+            ", false, true, user.id, user.id, *user_role_queries.compact.map { user.id })
+              .distinct
+          else
+            visible
+          end
+      }
 
       scope :visible, -> { where("decidim_meetings_meetings.private_meeting != ? OR decidim_meetings_meetings.transparent = ?", true, true) }
 
@@ -57,6 +89,8 @@ module Decidim
                         index_on_create: ->(meeting) { meeting.visible? },
                         index_on_update: ->(meeting) { meeting.visible? })
 
+      after_initialize :set_default_salt
+
       # Return registrations of a particular meeting made by users representing a group
       def user_group_registrations
         registrations.where.not(decidim_user_group_id: nil)
@@ -76,6 +110,11 @@ module Decidim
         !closed? && registrations_enabled? && can_participate?(user)
       end
 
+      def can_register_invitation?(user)
+        !closed? && registrations_enabled? &&
+          can_participate_in_space?(user) && user_has_invitation_for_meeting?(user)
+      end
+
       def closed?
         closed_at.present?
       end
@@ -133,19 +172,8 @@ module Decidim
         can_participate_in_space?(user) && can_participate_in_meeting?(user)
       end
 
-      def organizer_belongs_to_organization
-        return if !organizer || !organization
-
-        errors.add(:organizer, :invalid) unless organizer.organization == organization
-      end
-
-      def official?
-        organizer.nil?
-      end
-
-      def current_user_can_visit_meeting?(current_user)
-        (private_meeting? && registrations.exists?(decidim_user_id: current_user.try(:id))) ||
-          !private_meeting? || (private_meeting? && transparent?)
+      def current_user_can_visit_meeting?(user)
+        Decidim::Meetings::Meeting.visible_meeting_for(user).find_by(id: id)
       end
 
       # Return the duration of the meeting in minutes
@@ -173,6 +201,22 @@ module Decidim
         (Time.current - end_time) < 72.hours
       end
 
+      def authored_proposals
+        Decidim::Proposals::Proposal
+          .joins(:coauthorships)
+          .where(
+            decidim_coauthorships: {
+              decidim_author_type: "Decidim::Meetings::Meeting",
+              decidim_author_id: id
+            }
+          )
+      end
+
+      # Public: Overrides the `reported_content_url` Reportable concern method.
+      def reported_content_url
+        ResourceLocatorPresenter.new(self).url
+      end
+
       private
 
       def can_participate_in_meeting?(user)
@@ -181,6 +225,18 @@ module Decidim
 
         registrations.exists?(decidim_user_id: user.id)
       end
+
+      def user_has_invitation_for_meeting?(user)
+        return true unless private_meeting?
+        return false unless user
+
+        invites.exists?(decidim_user_id: user.id)
+      end
+
+      # salt is used to generate secure hash in pads
+      def set_default_salt
+        self.salt ||= Tokenizer.random_salt
+      end
     end
   end
 end