decidim-meetings 0.22.0 → 0.23.3

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

@@ -11,6 +11,31 @@ module Decidim
       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/meetings_helper.rb

@@ -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,9 @@ module Decidim
                         index_on_create: ->(meeting) { meeting.visible? },
                         index_on_update: ->(meeting) { meeting.visible? })
 
+      # we create a salt for the meeting only on new meetings to prevent changing old IDs for existing (Ether)PADs
+      before_create :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 +111,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 +173,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
@@ -184,6 +213,11 @@ module Decidim
           )
       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)
@@ -192,6 +226,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

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

@@ -6,6 +6,9 @@ module Decidim
     class Minutes < Meetings::ApplicationRecord
       include Decidim::Traceable
       include Decidim::Loggable
+      include Decidim::TranslatableResource
+
+      translatable_fields :description
 
       belongs_to :meeting, foreign_key: "decidim_meeting_id", class_name: "Decidim::Meetings::Meeting"
 

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

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Meetings
+    class Service < Meetings::ApplicationRecord
+      include Decidim::Traceable
+      include Decidim::TranslatableResource
+
+      translatable_fields :title, :description
+      belongs_to :meeting, foreign_key: "decidim_meeting_id", class_name: "Decidim::Meetings::Meeting"
+    end
+  end
+end

data/app/permissions/decidim/meetings/admin/permissions.rb

@@ -37,6 +37,8 @@ module Decidim
         def allowed_meeting_action?
           return unless permission_action.subject == :meeting
 
+          return disallow! if meeting && !meeting.official?
+
           case permission_action.action
           when :close, :copy, :destroy, :export_registrations, :update, :read_invites
             toggle_allow(meeting.present?)

data/app/permissions/decidim/meetings/permissions.rb

@@ -19,6 +19,12 @@ module Decidim
           toggle_allow(can_leave_meeting?)
         when :decline_invitation
           toggle_allow(can_decline_invitation?)
+        when :create
+          toggle_allow(can_create_meetings?)
+        when :update
+          toggle_allow(can_update_meeting?)
+        when :register
+          toggle_allow(can_register_invitation_meeting?)
         end
 
         permission_action
@@ -43,6 +49,20 @@ module Decidim
         meeting.registrations_enabled? &&
           meeting.invites.where(user: user).exists?
       end
+
+      def can_create_meetings?
+        component_settings&.creation_enabled_for_participants?
+      end
+
+      def can_update_meeting?
+        component_settings&.creation_enabled_for_participants? &&
+          meeting.authored_by?(user)
+      end
+
+      def can_register_invitation_meeting?
+        meeting.can_register_invitation?(user) &&
+          authorized?(:register, resource: meeting)
+      end
     end
   end
 end

data/app/presenters/decidim/meetings/admin_log/invite_presenter.rb

@@ -24,9 +24,13 @@ module Decidim
           end
         end
 
+        # Tries to use the attendee name from the invitation (resource).
+        # If invitation does not exist anymore use the one in extras.
         def i18n_params
+          attendee_name = action_log.resource ? action_log.resource.user.name : action_log.extra["attendee_name"]
           super.merge(
-            attendee_name: action_log.resource.user.name
+            # before Decidim v0.23.0 attendee_name was not being copied into the extras so it may be nil
+            attendee_name: attendee_name || "????"
           )
         end
       end

data/app/presenters/decidim/meetings/admin_log/meeting_presenter.rb

@@ -33,8 +33,7 @@ module Decidim
             start_date: :date,
             title: "Decidim::Meetings::AdminLog::ValueTypes::MeetingTitleDescriptionPresenter",
             private_meeting: :boolean,
-            transparent: :boolean,
-            organizer_id: "Decidim::Meetings::AdminLog::ValueTypes::OrganizerPresenter"
+            transparent: :boolean
           }
         end
 
@@ -51,8 +50,8 @@ module Decidim
           "activemodel.attributes.meeting"
         end
 
-        def has_diff?
-          action == "close" || super
+        def diff_actions
+          super + %w(close)
         end
       end
     end

data/app/presenters/decidim/meetings/meeting_presenter.rb

@@ -79,10 +79,14 @@ module Decidim
 
       private
 
-      def handle_locales(content, all_locales)
+      def handle_locales(content, all_locales, &block)
         if all_locales
-          content.each_with_object({}) do |(locale, string), parsed_content|
-            parsed_content[locale] = yield(string)
+          content.each_with_object({}) do |(key, value), parsed_content|
+            parsed_content[key] = if key == "machine_translations"
+                                    handle_locales(value, all_locales, &block)
+                                  else
+                                    block.call(value)
+                                  end
           end
         else
           yield(translated_attribute(content))