decidim-meetings 0.29.3 → 0.30.0.rc1

data/lib/decidim/meetings/admin_engine.rb

@@ -18,13 +18,20 @@ module Decidim
           member do
             put :publish
             put :unpublish
+            patch :soft_delete
+            patch :restore
           end
           resources :meeting_closes, only: [:edit, :update] do
             get :proposals_picker, on: :collection
           end
           resource :registrations, only: [:edit, :update] do
             resources :invites, only: [:index, :create]
-            resource :form, only: [:edit, :update], controller: "registration_form"
+            resource :form, only: [:edit, :update], controller: "registration_form" do
+              member do
+                get :edit_questions
+                patch :update_questions
+              end
+            end
             collection do
               get :export
               post :validate_registration_code
@@ -35,6 +42,7 @@ module Decidim
           resources :attachments, except: [:show]
           resources :copies, controller: "meeting_copies", only: [:new, :create]
           resource :poll, only: [:edit, :update], controller: "meetings_poll"
+          get :manage_trash, on: :collection
         end
         root to: "meetings#index"
       end

data/lib/decidim/meetings/component.rb

@@ -8,7 +8,11 @@ Decidim.register_component(:meetings) do |component|
   component.permissions_class_name = "Decidim::Meetings::Permissions"
 
   component.query_type = "Decidim::Meetings::MeetingsType"
-  component.data_portable_entities = ["Decidim::Meetings::Registration"]
+  component.data_portable_entities = [
+    "Decidim::Meetings::Registration",
+    "Decidim::Meetings::Invite",
+    "Decidim::Meetings::Meeting"
+  ]
 
   component.on(:before_destroy) do |instance|
     raise StandardError, "Cannot remove this component" if Decidim::Meetings::Meeting.where(component: instance).any?
@@ -38,13 +42,20 @@ Decidim.register_component(:meetings) do |component|
     meetings.sum(:comments_count)
   end
 
+  component.register_stat :attendees_count, primary: true, priority: Decidim::StatsRegistry::MEDIUM_PRIORITY do |components, start_at, end_at|
+    meetings = Decidim::Meetings::Meeting.closed.not_hidden.published.where(component: components, closing_visible: true)
+    meetings = meetings.where(closed_at: start_at..) if start_at.present?
+    meetings = meetings.where(closed_at: ..end_at) if end_at.present?
+    meetings.sum(:attendees_count)
+  end
+
   component.exports :meetings do |exports|
     exports.collection do |component_instance|
       Decidim::Meetings::Meeting
         .not_hidden
         .visible
         .where(component: component_instance)
-        .includes(:scope, :category, :attachments, component: { participatory_space: :organization })
+        .includes(:taxonomies, :attachments, component: { participatory_space: :organization })
     end
 
     exports.include_in_open_data = true
@@ -77,8 +88,7 @@ Decidim.register_component(:meetings) do |component|
   component.actions = %w(join comment)
 
   component.settings(:global) do |settings|
-    settings.attribute :scopes_enabled, type: :boolean, default: false
-    settings.attribute :scope_id, type: :scope
+    settings.attribute :taxonomy_filters, type: :taxonomy_filters
     settings.attribute :announcement, type: :text, translated: true, editor: true
     settings.attribute :default_registration_terms, type: :text, translated: true, editor: true
     settings.attribute :comments_enabled, type: :boolean, default: true

data/lib/decidim/meetings/download_your_data_user_answers_serializer.rb

@@ -8,16 +8,16 @@ module Decidim
       def serialize
         {
           id: resource.id,
-          user: {
-            name: resource.user.name,
-            email: resource.user.email
-          },
           questionnaire: {
-            id: resource.question.questionnaire.id
+            id: resource.question.questionnaire.id,
+            title: translated_attribute(resource.question.questionnaire.title),
+            description: translated_attribute(resource.question.questionnaire.description),
+            tos: translated_attribute(resource.question.questionnaire.tos)
           },
           question: {
             id: resource.question.id,
-            body: translated_attribute(resource.question.body)
+            body: translated_attribute(resource.question.body),
+            description: translated_attribute(resource.question.description)
           },
           answer: normalize_body(resource)
         }
@@ -26,7 +26,13 @@ module Decidim
       private
 
       def normalize_body(resource)
-        resource.choices.pluck(:body)
+        attachments_for(resource) || resource.body || resource.choices.pluck(:body)
+      end
+
+      def attachments_for(resource)
+        return if resource.attachments.blank?
+
+        resource.attachments.map(&:url)
       end
     end
   end

data/lib/decidim/meetings/engine.rb

@@ -81,12 +81,7 @@ module Decidim
 
       initializer "decidim_meetings.content_security_handlers" do |_app|
         Decidim.configure do |config|
-          if config.content_security_policies_extra["frame-src"].respond_to?(:<<)
-            config.content_security_policies_extra["frame-src"] << "player.twitch.tv"
-            config.content_security_policies_extra["frame-src"] << "meet.jit.si"
-          else
-            config.content_security_policies_extra["frame-src"] = %w(player.twitch.tv meet.jit.si)
-          end
+          config.content_security_policies_extra.deep_merge!({ "frame-src" => %w(player.twitch.tv meet.jit.si) })
         end
       end
 

data/lib/decidim/meetings/meeting_serializer.rb

@@ -8,63 +8,77 @@ module Decidim
       include Decidim::ApplicationHelper
       include Decidim::ResourceHelper
 
-      # Public: Initializes the serializer with a meeting.
-      def initialize(meeting)
-        @meeting = meeting
-      end
-
       # Public: Exports a hash with the serialized data for this meeting.
       def serialize
         {
-          id: meeting.id,
-          category: {
-            id: meeting.category.try(:id),
-            name: meeting.category.try(:name)
-          },
-          scope: {
-            id: meeting.scope.try(:id),
-            name: meeting.scope.try(:name)
-          },
+          id: resource.id,
           author: {
             **author_fields
           },
           participatory_space: {
-            id: meeting.participatory_space.id,
-            url: Decidim::ResourceLocatorPresenter.new(meeting.participatory_space).url
+            id: resource.participatory_space.id,
+            url: Decidim::ResourceLocatorPresenter.new(resource.participatory_space).url
           },
+          taxonomies:,
           component: { id: component.id },
-          title: meeting.title,
-          description: meeting.description,
-          start_time: meeting.start_time,
-          end_time: meeting.end_time,
-          attendees: meeting.attendees_count.to_i,
-          contributions: meeting.contributions_count.to_i,
-          organizations: meeting.attending_organizations,
-          address: meeting.address,
-          location: meeting.location,
-          reference: meeting.reference,
-          comments: meeting.comments_count,
-          attachments: meeting.attachments.size,
-          followers: meeting.follows.size,
+          title: resource.title,
+          description: resource.description,
+          start_time: resource.start_time,
+          end_time: resource.end_time,
+          attendees: resource.attendees_count.to_i,
+          contributions: resource.contributions_count.to_i,
+          organizations: resource.attending_organizations,
+          address: resource.address,
+          location: include_location? ? resource.location : nil,
+          reference: resource.reference,
+          attachments: resource.attachments.size,
           url:,
           related_proposals:,
           related_results:,
-          published: meeting.published_at.present?,
-          withdrawn: meeting.withdrawn?,
-          withdrawn_at: meeting.withdrawn_at
+          published: resource.published_at.present?,
+          withdrawn: resource.withdrawn?,
+          withdrawn_at: resource.withdrawn_at,
+          location_hints: resource.location_hints,
+          created_at: resource.created_at,
+          updated_at: resource.updated_at,
+          latitude: resource.latitude,
+          longitude: resource.longitude,
+          follows_count: resource.follows_count,
+          private_meeting: resource.private_meeting,
+          transparent: resource.transparent,
+          registration_form_enabled: resource.registration_form_enabled,
+          comments: {
+            **comment_fields
+          },
+          online_meeting_url: resource.online_meeting_url,
+          closing_visible: resource.closing_visible,
+          closing_report: resource.closing_report,
+          attending_organizations: resource.attending_organizations,
+          registration_url: resource.registration_url,
+          decidim_user_group_id: resource.decidim_user_group_id,
+          decidim_author_type: resource.decidim_author_type,
+          video_url: resource.video_url,
+          audio_url: resource.audio_url,
+          closed_at: resource.closed_at,
+          registration_terms: resource.registration_terms,
+          available_slots: resource.available_slots,
+          registrations_enabled: resource.registrations_enabled,
+          customize_registration_email: resource.customize_registration_email,
+          type_of_meeting: resource.type_of_meeting,
+          iframe_access_level: resource.iframe_access_level,
+          iframe_embed_type: resource.iframe_embed_type,
+          reserved_slots: resource.reserved_slots,
+          registration_type: resource.registration_type
         }
       end
 
       private
 
-      attr_reader :meeting
-      alias resource meeting
-
       def author_fields
         {
-          id: meeting.author.id,
-          name: author_name(meeting.author),
-          url: author_url(meeting.author)
+          id: resource.author.id,
+          name: author_name(resource.author),
+          url: author_url(resource.author)
         }
       end
 
@@ -80,38 +94,35 @@ module Decidim
         end
       end
 
-      def profile_url(author)
-        return "" if author.respond_to?(:deleted?) && author.deleted?
-
-        Decidim::Core::Engine.routes.url_helpers.profile_url(author.nickname, host:)
-      end
-
-      def root_url
-        Decidim::Core::Engine.routes.url_helpers.root_url(host:)
-      end
-
-      def host
-        resource.organization.host
-      end
-
-      def component
-        meeting.component
-      end
-
       def related_proposals
-        meeting.linked_resources(:proposals, "proposals_from_meeting").map do |proposal|
+        resource.linked_resources(:proposals, "proposals_from_meeting").map do |proposal|
           Decidim::ResourceLocatorPresenter.new(proposal).url
         end
       end
 
       def related_results
-        meeting.linked_resources(:results, "meetings_through_proposals").map do |result|
+        resource.linked_resources(:results, "meetings_through_proposals").map do |result|
           Decidim::ResourceLocatorPresenter.new(result).url
         end
       end
 
       def url
-        Decidim::ResourceLocatorPresenter.new(meeting).url
+        Decidim::ResourceLocatorPresenter.new(resource).url
+      end
+
+      def comment_fields
+        return {} unless resource.comments
+
+        {
+          start_time: resource.comments_start_time,
+          end_time: resource.comments_end_time,
+          enabled: resource.comments_enabled,
+          count: resource.comments_count
+        }
+      end
+
+      def include_location?
+        resource.iframe_access_level == "all"
       end
     end
   end

data/lib/decidim/meetings/schema_org_event_meeting_serializer.rb

@@ -0,0 +1,151 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Meetings
+    class SchemaOrgEventMeetingSerializer < Decidim::Exporters::Serializer
+      include Decidim::TranslationsHelper
+      include Decidim::SanitizeHelper
+      include ActionView::Helpers::UrlHelper
+
+      # Public: Initializes the serializer with a meeting.
+      def initialize(meeting)
+        @meeting = meeting
+      end
+
+      # Serializes a meeting for the Schema.org Event type
+      #
+      # @see https://schema.org/Event
+      # @see https://developers.google.com/search/docs/appearance/structured-data/event?hl=en
+      def serialize
+        attributes = {
+          "@context": "https://schema.org",
+          "@type": "Event",
+          name: decidim_escape_translated(meeting.title),
+          description: decidim_escape_translated(meeting.description),
+          startDate: meeting.start_time.iso8601,
+          endDate: meeting.end_time.iso8601,
+          organizer:,
+          eventAttendanceMode: event_attendance_mode,
+          eventStatus: "https://schema.org/EventScheduled",
+          location:
+        }
+
+        attributes = attributes.merge(image:) if meeting.photos.any?
+        attributes
+      end
+
+      private
+
+      attr_reader :meeting
+      alias resource meeting
+
+      def organizer
+        return organizer_user_group if meeting.decidim_user_group_id?
+
+        case meeting.author.class.name
+        when "Decidim::Organization"
+          organizer_organization
+        when "Decidim::User"
+          organizer_user
+        end
+      end
+
+      def organizer_user_group
+        {
+          "@type": "Organization",
+          name: meeting.author.name,
+          url: profile_url(meeting.user_group)
+        }
+      end
+
+      def organizer_organization
+        {
+          "@type": "Organization",
+          name: decidim_escape_translated(meeting.author.name),
+          url: EngineRouter.new("decidim", router_options).root_url
+        }
+      end
+
+      def organizer_user
+        {
+          "@type": "Person",
+          name: decidim_escape_translated(meeting.author.name),
+          url: profile_url(meeting.author)
+        }
+      end
+
+      def router_options = { host: meeting.organization.host }
+
+      def event_attendance_mode
+        case meeting.type_of_meeting
+        when "online"
+          "https://schema.org/OnlineEventAttendanceMode"
+        when "hybrid"
+          "https://schema.org/MixedEventAttendanceMode"
+        else
+          "https://schema.org/OfflineEventAttendanceMode"
+        end
+      end
+
+      def location
+        case meeting.type_of_meeting
+        when "online"
+          location_virtual
+        when "hybrid"
+          [location_postal_address, location_virtual]
+        else
+          location_postal_address
+        end
+      end
+
+      def location_postal_address
+        address = {
+          "@type": "PostalAddress",
+          streetAddress: decidim_escape_translated(meeting.address)
+        }
+
+        address = address.merge({ addressLocality: geocoder_city }) if geocoder_city.present?
+        address = address.merge({ addressRegion: geocoder_state }) if geocoder_state.present?
+        address = address.merge({ postalCode: geocoder_postal_code }) if geocoder_postal_code.present?
+        address = address.merge({ addressCountry: geocoder_country }) if geocoder_country.present?
+
+        {
+          "@type": "Place",
+          name: decidim_escape_translated(meeting.location),
+          address:
+        }
+      end
+
+      def location_virtual
+        {
+          "@type": "VirtualLocation",
+          url: meeting.online_meeting_url
+        }
+      end
+
+      def geocoder
+        return if meeting.latitude.blank? || meeting.longitude.blank?
+
+        @geocoder ||= Geocoder.search([meeting.latitude, meeting.longitude]).first
+      end
+
+      def geocoder_city
+        @geocoder_city ||= geocoder&.city
+      end
+
+      def geocoder_state
+        @geocoder_state ||= geocoder&.state
+      end
+
+      def geocoder_postal_code
+        @geocoder_postal_code ||= geocoder&.postal_code
+      end
+
+      def geocoder_country
+        @geocoder_country ||= geocoder&.country
+      end
+
+      def image = meeting.photos.map(&:thumbnail_url)
+    end
+  end
+end

data/lib/decidim/meetings/seeds.rb

@@ -63,14 +63,12 @@ module Decidim
 
         params = {
           component:,
-          scope: random_scope(participatory_space:),
-          category: participatory_space.categories.sample,
           title: Decidim::Faker::Localized.sentence(word_count: 2),
           description: Decidim::Faker::Localized.wrapped("<p>", "</p>") do
             Decidim::Faker::Localized.paragraph(sentence_count: 3)
           end,
-          location: Decidim::Faker::Localized.sentence,
-          location_hints: Decidim::Faker::Localized.sentence,
+          location: Decidim::Faker::Localized.sentence(word_count: rand(2..20)),
+          location_hints: Decidim::Faker::Localized.sentence(word_count: rand(2..20)),
           start_time:,
           end_time:,
           address: "#{::Faker::Address.street_address} #{::Faker::Address.zip} #{::Faker::Address.city}",

data/lib/decidim/meetings/test/factories.rb

@@ -47,6 +47,7 @@ FactoryBot.define do
     component { build(:meeting_component) }
     iframe_access_level { :all }
     iframe_embed_type { :none }
+    deleted_at { nil }
 
     author do
       component.try(:organization)
@@ -73,6 +74,8 @@ FactoryBot.define do
     trait :online do
       type_of_meeting { :online }
       online_meeting_url { "https://decidim.org" }
+      latitude { nil }
+      longitude { nil }
     end
 
     trait :hybrid do
@@ -183,6 +186,11 @@ FactoryBot.define do
     end
   end
 
+  factory :meeting_link, class: "Decidim::Meetings::MeetingLink" do
+    meeting
+    component
+  end
+
   factory :registration, class: "Decidim::Meetings::Registration" do
     transient do
       skip_injection { false }

data/lib/decidim/meetings/test/translated_event.rb

@@ -4,17 +4,17 @@ shared_examples_for "a translated meeting event" do
   describe "translated notifications" do
     let(:en_body) { "This is Sparta!" }
     let(:body) { { en: en_body, machine_translations: { ca: "C'est Sparta!" } } }
-    let(:participatory_process) { create :participatory_process, organization: }
+    let(:participatory_process) { create(:participatory_process, organization:) }
     let(:meeting_component) { create(:meeting_component, participatory_space: participatory_process) }
     let(:translatable) { true }
     let(:en_version) { resource.description["en"] }
     let(:machine_translated) { resource.description["machine_translations"]["ca"] }
 
     let(:resource) do
-      create :meeting,
+      create(:meeting,
              component: meeting_component,
              title: { en: "A nice event", machine_translations: { ca: "Une belle event" } },
-             description: body
+             description: body)
     end
 
     it_behaves_like "a translated event"

data/lib/decidim/meetings/version.rb

@@ -4,7 +4,7 @@ module Decidim
   # This holds the decidim-meetings version.
   module Meetings
     def self.version
-      "0.29.3"
+      "0.30.0.rc1"
     end
   end
 end

data/lib/decidim/meetings.rb

@@ -16,6 +16,7 @@ module Decidim
     autoload :MeetingSerializer, "decidim/meetings/meeting_serializer"
     autoload :UserAnswersSerializer, "decidim/meetings/user_answers_serializer"
     autoload :DownloadYourDataUserAnswersSerializer, "decidim/meetings/download_your_data_user_answers_serializer"
+    autoload :SchemaOrgEventMeetingSerializer, "decidim/meetings/schema_org_event_meeting_serializer"
 
     include ActiveSupport::Configurable