decidim-meetings 0.23.3 → 0.24.0.rc1

data/db/migrate/20180809134748_add_upcoming_events_as_content_block.rb

@@ -11,7 +11,7 @@ class AddUpcomingEventsAsContentBlock < ActiveRecord::Migration[5.2]
 
   def change
     Organization.find_each do |organization|
-      next if ContentBlock.where(decidim_organization_id: organization.id).where(manifest_name: "upcoming_events").exists?
+      next if ContentBlock.where(decidim_organization_id: organization.id).exists?(manifest_name: "upcoming_events")
 
       last_weight = ContentBlock.where(decidim_organization_id: organization.id).order("weight DESC").limit(1).pluck(:weight).last.to_i
 

data/db/migrate/20201006140511_add_online_meeting_url.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AddOnlineMeetingUrl < ActiveRecord::Migration[5.2]
+  def change
+    add_column :decidim_meetings_meetings, :online_meeting_url, :string
+  end
+end

data/db/migrate/20201009124057_add_type_of_meeting.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AddTypeOfMeeting < ActiveRecord::Migration[5.2]
+  def change
+    add_column :decidim_meetings_meetings, :type_of_meeting, :string, default: "in_person"
+  end
+end

data/db/migrate/20201016112641_add_registration_type_and_url_to_meetings.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+class AddRegistrationTypeAndUrlToMeetings < ActiveRecord::Migration[5.2]
+  class Meetings < ApplicationRecord
+    self.table_name = :decidim_meetings_meetings
+    include Decidim::HasComponent
+  end
+
+  def change
+    add_column :decidim_meetings_meetings, :registration_type, :string, null: false, default: "registration_disabled"
+    add_column :decidim_meetings_meetings, :registration_url, :string
+
+    Meetings.reset_column_information
+    Meetings.find_each do |meeting|
+      meeting.registration_type = "on_this_platform" if meeting.decidim_author_type == "Decidim::Organization"
+      meeting.save!
+    end
+  end
+end

data/lib/decidim/api/agenda_item_type.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Meetings
+    class AgendaItemType < Decidim::Api::Types::BaseObject
+      graphql_name "MeetingAgendaItem"
+      description "A meeting agenda item"
+
+      field :id, GraphQL::Types::ID, "The ID for this agenda item", null: false
+      field :title, Decidim::Core::TranslatedFieldType, "The title for this agenda item", null: true
+      field :description, Decidim::Core::TranslatedFieldType, "The description for this agenda item", null: true
+      field :items, [Decidim::Meetings::AgendaItemType, { null: true }], "Sub-items (children) of this agenda item", method: :agenda_item_children, null: false
+      field :parent, Decidim::Meetings::AgendaItemType, "Parent agenda item, if available", null: true
+      field :agenda, Decidim::Meetings::AgendaType, "Belonging agenda", null: true
+      field :duration, GraphQL::Types::Int, "Duration in number of minutes for this item in this agenda", null: false
+      field :position, GraphQL::Types::Int, "Order position for this agenda item", null: false
+
+      field :created_at, Decidim::Core::DateTimeType, description: "The date and time this agenda item was created", null: true
+      field :updated_at, Decidim::Core::DateTimeType, description: "The date and time this agenda item was updated", null: true
+    end
+  end
+end

data/lib/decidim/api/agenda_type.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Meetings
+    class AgendaType < Decidim::Api::Types::BaseObject
+      graphql_name "MeetingAgenda"
+      description "A meeting agenda"
+
+      field :id, GraphQL::Types::ID, "The ID for the agenda", null: false
+      field :title, Decidim::Core::TranslatedFieldType, "The title for the agenda", null: true
+      field :items, [Decidim::Meetings::AgendaItemType, { null: true }], "Items and sub-items of the agenda", method: :agenda_items, null: false
+      # probably useful in the future, when handling user permissions
+      # field :visible, !types.Boolean, "Whether this minutes is public or not", property: :visible
+
+      field :created_at, Decidim::Core::DateTimeType, description: "The date and time this agenda was created", null: true
+      field :updated_at, Decidim::Core::DateTimeType, description: "The date and time this agenda was updated", null: true
+    end
+  end
+end

data/lib/decidim/api/linked_resources_interface.rb

@@ -3,14 +3,15 @@
 module Decidim
   module Meetings
     # This interface represents all linked resources available in the module meetings
-    LinkedResourcesInterface = GraphQL::InterfaceType.define do
-      name "MeetinsLinkedResourcewInterface"
+    module LinkedResourcesInterface
+      include Decidim::Api::Types::BaseInterface
+      graphql_name "MeetinsLinkedResourcewInterface"
       description "An interface that can be used with Resourceable models."
 
-      field :proposalsFromMeeting, !types[Decidim::Proposals::ProposalType], "Proposals created in this meeting" do
-        resolve ->(meeting, _args, _ctx) {
-          meeting.linked_resources(:proposals, :proposals_from_meeting)
-        }
+      field :proposals_from_meeting, [Decidim::Proposals::ProposalType, { null: true }], "Proposals created in this meeting", null: false
+
+      def proposals_from_meeting
+        object.linked_resources(:proposals, :proposals_from_meeting)
       end
     end
   end

data/lib/decidim/api/meeting_type.rb

@@ -0,0 +1,63 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Meetings
+    class MeetingType < Decidim::Api::Types::BaseObject
+      description "A meeting"
+
+      implements Decidim::Comments::CommentableInterface
+      implements Decidim::Core::CategorizableInterface
+      implements Decidim::Core::ScopableInterface
+      implements Decidim::Core::AttachableInterface
+      implements Decidim::Core::TimestampsInterface
+      implements Decidim::Meetings::ServicesInterface
+      implements Decidim::Meetings::LinkedResourcesInterface
+      implements Decidim::Forms::QuestionnaireEntityInterface
+
+      field :id, GraphQL::Types::ID, "ID of this meeting", null: false
+      field :reference, GraphQL::Types::String, "Reference for this meeting", null: false
+      field :title, Decidim::Core::TranslatedFieldType, "The title of this meeting.", null: false
+      field :description, Decidim::Core::TranslatedFieldType, "The description of this meeting.", null: true
+      field :start_time, Decidim::Core::DateTimeType, "The time this meeting starts", null: false
+      field :end_time, Decidim::Core::DateTimeType, "The time this meeting ends", null: false
+      field :author, Decidim::Core::AuthorInterface, "If specified, the author of this meeting", null: true
+      field :agenda, Decidim::Meetings::AgendaType, "Agenda for this meeting, if available", null: true
+
+      def agenda
+        object.agenda if object.agenda&.visible?
+      end
+
+      field :closed, GraphQL::Types::Boolean, "Whether this meeting is closed or not.", method: :closed?, null: false
+      field :closing_report, Decidim::Core::TranslatedFieldType, "The closing report of this meeting.", null: true
+      field :attending_organizations, GraphQL::Types::String, "list of attending organizations", null: true
+      field :attendee_count, GraphQL::Types::Int, "Amount of attendees to this meeting", method: :attendees_count, null: true
+      field :contribution_count, GraphQL::Types::Int, "Amount of contributions to this meeting", method: :contributions_count, null: true
+      field :minutes, Decidim::Meetings::MinutesType, "Minutes for this meeting, if available", null: true
+
+      def minutes
+        object.minutes if object.minutes&.visible?
+      end
+      field :private_meeting, GraphQL::Types::Boolean, "Whether the meeting is private or not (it can only be true if transparent)", null: false
+      field :transparent, GraphQL::Types::Boolean, "For private meetings, information is public if transparent", null: false
+      field :registrations_enabled, GraphQL::Types::Boolean, "Whether the registrations are enabled or not", null: false
+      field :registration_terms, Decidim::Core::TranslatedFieldType, "The registration terms", null: true
+      field :remaining_slots, GraphQL::Types::Int, "Amount of slots available for this meeting", null: true
+      field :registration_form_enabled, GraphQL::Types::Boolean, "Whether the registrations have a form or not", null: false
+      field :registration_form, Decidim::Forms::QuestionnaireType, description: "If registration requires to fill a form, this is the questionnaire", null: true
+
+      def registration_form
+        object.questionnaire if object.registration_form_enabled?
+      end
+      field :location, Decidim::Core::TranslatedFieldType, "The location of this meeting (free format)", null: true
+      field :location_hints, Decidim::Core::TranslatedFieldType, "The location of this meeting (free format)", null: true
+      field :address, GraphQL::Types::String, "The physical address of this meeting (used for geolocation)", null: true
+      field :coordinates, Decidim::Core::CoordinatesType, "Physical coordinates for this meeting", null: true
+
+      def coordinates
+        [object.latitude, object.longitude]
+      end
+      field :type_of_meeting, GraphQL::Types::String, "The type of the meeting (online or in-person)", null: false
+      field :online_meeting_url, GraphQL::Types::String, "The URL of the meeting (when the type is online)", null: false
+    end
+  end
+end

data/lib/decidim/api/meetings_type.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Meetings
+    class MeetingsType < Decidim::Api::Types::BaseObject
+      implements Decidim::Core::ComponentInterface
+
+      graphql_name "Meetings"
+      description "A meetings component of a participatory space."
+
+      field :meetings, Decidim::Meetings::MeetingType.connection_type, null: true, connection: true
+
+      def meetings
+        Meeting.visible.where(component: object).includes(:component)
+      end
+
+      field :meeting, Decidim::Meetings::MeetingType, null: true do
+        argument :id, GraphQL::Types::ID, required: true
+      end
+
+      def meeting(**args)
+        Meeting.visible.where(component: object).find_by(id: args[:id])
+      end
+    end
+  end
+end

data/lib/decidim/api/minutes_type.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Meetings
+    class MinutesType < Decidim::Api::Types::BaseObject
+      description "A meeting minutes"
+
+      field :id, GraphQL::Types::ID, "The ID for the minutes", null: false
+      field :description, Decidim::Core::TranslatedFieldType, "The description for the minutes", null: true
+      field :video_url, GraphQL::Types::String, "URL for the video of the session, if any", null: true
+      field :audio_url, GraphQL::Types::String, "URL for the audio of the session, if any", null: true
+
+      # probably useful in the future, when handling user permissions
+      # field :visible, !types.Boolean, "Whether this minutes is public or not", property: :visible
+      #
+      field :created_at, Decidim::Core::DateTimeType, description: "The date and time this minutes was created", null: true
+      field :updated_at, Decidim::Core::DateTimeType, description: "The date and time this minutes was updated", null: true
+    end
+  end
+end

data/{app/types/decidim/meetings → lib/decidim/api}/service_type.rb

@@ -2,12 +2,12 @@
 
 module Decidim
   module Meetings
-    ServiceType = GraphQL::ObjectType.define do
-      name "MeetingService"
+    class ServiceType < Decidim::Api::Types::BaseObject
+      graphql_name "MeetingService"
       description "A meeting service"
 
-      field :title, Decidim::Core::TranslatedFieldType, "The title for the service"
-      field :description, Decidim::Core::TranslatedFieldType, "The description for the service"
+      field :title, Decidim::Core::TranslatedFieldType, "The title for the service", null: true
+      field :description, Decidim::Core::TranslatedFieldType, "The description for the service", null: true
     end
   end
 end

data/lib/decidim/api/services_interface.rb

@@ -3,11 +3,11 @@
 module Decidim
   module Meetings
     # This interface represents a categorizable object.
-    ServicesInterface = GraphQL::InterfaceType.define do
-      name "ServicesInterface"
+    module ServicesInterface
+      include Decidim::Api::Types::BaseInterface
       description "An interface that can be used with services."
 
-      field :services, !types[ServiceType], "The object's services"
+      field :services, [Decidim::Meetings::ServiceType, { null: true }], "The object's services", null: false
     end
   end
 end

data/lib/decidim/meetings.rb

@@ -1,12 +1,12 @@
 # frozen_string_literal: true
 
 require "decidim/meetings/admin"
+require "decidim/meetings/api"
 require "decidim/meetings/engine"
 require "decidim/meetings/admin_engine"
 require "decidim/meetings/directory"
 require "decidim/meetings/directory_engine"
 require "decidim/meetings/component"
-require "decidim/meetings/api"
 
 module Decidim
   # Base module for this engine.

data/lib/decidim/meetings/api.rb

@@ -2,6 +2,12 @@
 
 module Decidim
   module Meetings
+    autoload :AgendaItemType, "decidim/api/agenda_item_type"
+    autoload :AgendaType, "decidim/api/agenda_type"
+    autoload :MeetingType, "decidim/api/meeting_type"
+    autoload :MeetingsType, "decidim/api/meetings_type"
+    autoload :MinutesType, "decidim/api/minutes_type"
+    autoload :ServiceType, "decidim/api/service_type"
     autoload :LinkedResourcesInterface, "decidim/api/linked_resources_interface"
     autoload :ServicesInterface, "decidim/api/services_interface"
   end

data/lib/decidim/meetings/component.rb

@@ -19,6 +19,7 @@ Decidim.register_component(:meetings) do |component|
     resource.model_class_name = "Decidim::Meetings::Meeting"
     resource.template = "decidim/meetings/meetings/linked_meetings"
     resource.card = "decidim/meetings/meeting"
+    resource.reported_content_cell = "decidim/meetings/reported_content"
     resource.actions = %w(join)
     resource.searchable = true
   end
@@ -47,6 +48,18 @@ Decidim.register_component(:meetings) do |component|
     exports.serializer Decidim::Meetings::MeetingSerializer
   end
 
+  component.exports :meeting_comments do |exports|
+    exports.collection do |component_instance|
+      Decidim::Comments::Export.comments_for_resource(
+        Decidim::Meetings::Meeting, component_instance
+      )
+    end
+
+    exports.include_in_open_data = true
+
+    exports.serializer Decidim::Comments::CommentSerializer
+  end
+
   component.actions = %w(join)
 
   component.settings(:global) do |settings|
@@ -56,6 +69,7 @@ Decidim.register_component(:meetings) do |component|
     settings.attribute :default_registration_terms, type: :text, translated: true, editor: true
     settings.attribute :comments_enabled, type: :boolean, default: true
     settings.attribute :comments_max_length, type: :integer, required: false
+    settings.attribute :registration_code_enabled, type: :boolean, default: true
     settings.attribute :resources_permissions_enabled, type: :boolean, default: true
     settings.attribute :enable_pads_creation, type: :boolean, default: false
     settings.attribute :creation_enabled_for_participants, type: :boolean, default: false
@@ -97,18 +111,19 @@ Decidim.register_component(:meetings) do |component|
     end
 
     2.times do
+      start_time = [rand(1..20).weeks.from_now, rand(1..20).weeks.ago].sample
       params = {
         component: component,
-        scope: Faker::Boolean.boolean(0.5) ? global : scopes.sample,
+        scope: Faker::Boolean.boolean(true_ratio: 0.5) ? global : scopes.sample,
         category: participatory_space.categories.sample,
-        title: Decidim::Faker::Localized.sentence(2),
+        title: Decidim::Faker::Localized.sentence(word_count: 2),
         description: Decidim::Faker::Localized.wrapped("<p>", "</p>") do
-          Decidim::Faker::Localized.paragraph(3)
+          Decidim::Faker::Localized.paragraph(sentence_count: 3)
         end,
         location: Decidim::Faker::Localized.sentence,
         location_hints: Decidim::Faker::Localized.sentence,
-        start_time: 3.weeks.from_now,
-        end_time: 3.weeks.from_now + 4.hours,
+        start_time: start_time,
+        end_time: start_time + rand(1..4).hours,
         address: "#{Faker::Address.street_address} #{Faker::Address.zip} #{Faker::Address.city}",
         latitude: Faker::Address.latitude,
         longitude: Faker::Address.longitude,
@@ -116,10 +131,24 @@ Decidim.register_component(:meetings) do |component|
         available_slots: (10..50).step(10).to_a.sample,
         author: participatory_space.organization,
         registration_terms: Decidim::Faker::Localized.wrapped("<p>", "</p>") do
-          Decidim::Faker::Localized.paragraph(3)
+          Decidim::Faker::Localized.paragraph(sentence_count: 3)
         end
       }
 
+      _hybrid_meeting = Decidim.traceability.create!(
+        Decidim::Meetings::Meeting,
+        admin_user,
+        params.merge(type_of_meeting: :hybrid, online_meeting_url: "http://example.org"),
+        visibility: "all"
+      )
+
+      _online_meeting = Decidim.traceability.create!(
+        Decidim::Meetings::Meeting,
+        admin_user,
+        params.merge(type_of_meeting: :online, online_meeting_url: "http://example.org"),
+        visibility: "all"
+      )
+
       meeting = Decidim.traceability.create!(
         Decidim::Meetings::Meeting,
         admin_user,
@@ -130,18 +159,18 @@ Decidim.register_component(:meetings) do |component|
       2.times do
         Decidim::Meetings::Service.create!(
           meeting: meeting,
-          title: Decidim::Faker::Localized.sentence(2),
-          description: Decidim::Faker::Localized.sentence(5)
+          title: Decidim::Faker::Localized.sentence(word_count: 2),
+          description: Decidim::Faker::Localized.sentence(word_count: 5)
         )
       end
 
       Decidim::Forms::Questionnaire.create!(
         title: Decidim::Faker::Localized.paragraph,
         description: Decidim::Faker::Localized.wrapped("<p>", "</p>") do
-          Decidim::Faker::Localized.paragraph(3)
+          Decidim::Faker::Localized.paragraph(sentence_count: 3)
         end,
         tos: Decidim::Faker::Localized.wrapped("<p>", "</p>") do
-          Decidim::Faker::Localized.paragraph(2)
+          Decidim::Faker::Localized.paragraph(sentence_count: 2)
         end,
         questionnaire_for: meeting
       )
@@ -160,7 +189,7 @@ Decidim.register_component(:meetings) do |component|
           tos_agreement: "1",
           confirmed_at: Time.current,
           personal_url: Faker::Internet.url,
-          about: Faker::Lorem.paragraph(2)
+          about: Faker::Lorem.paragraph(sentence_count: 2)
         )
 
         Decidim::Meetings::Registration.create!(
@@ -171,26 +200,26 @@ Decidim.register_component(:meetings) do |component|
 
       attachment_collection = Decidim::AttachmentCollection.create!(
         name: Decidim::Faker::Localized.word,
-        description: Decidim::Faker::Localized.sentence(5),
+        description: Decidim::Faker::Localized.sentence(word_count: 5),
         collection_for: meeting
       )
 
       Decidim::Attachment.create!(
-        title: Decidim::Faker::Localized.sentence(2),
-        description: Decidim::Faker::Localized.sentence(5),
+        title: Decidim::Faker::Localized.sentence(word_count: 2),
+        description: Decidim::Faker::Localized.sentence(word_count: 5),
         attachment_collection: attachment_collection,
         attached_to: meeting,
         file: File.new(File.join(__dir__, "seeds", "Exampledocument.pdf")) # Keep after attached_to
       )
       Decidim::Attachment.create!(
-        title: Decidim::Faker::Localized.sentence(2),
-        description: Decidim::Faker::Localized.sentence(5),
+        title: Decidim::Faker::Localized.sentence(word_count: 2),
+        description: Decidim::Faker::Localized.sentence(word_count: 5),
         attached_to: meeting,
         file: File.new(File.join(__dir__, "seeds", "city.jpeg")) # Keep after attached_to
       )
       Decidim::Attachment.create!(
-        title: Decidim::Faker::Localized.sentence(2),
-        description: Decidim::Faker::Localized.sentence(5),
+        title: Decidim::Faker::Localized.sentence(word_count: 2),
+        description: Decidim::Faker::Localized.sentence(word_count: 5),
         attached_to: meeting,
         file: File.new(File.join(__dir__, "seeds", "Exampledocument.pdf")) # Keep after attached_to
       )
@@ -209,18 +238,19 @@ Decidim.register_component(:meetings) do |component|
         author = user_group.users.sample
       end
 
+      start_time = [rand(1..20).weeks.from_now, rand(1..20).weeks.ago].sample
       params = {
         component: component,
-        scope: Faker::Boolean.boolean(0.5) ? global : scopes.sample,
+        scope: Faker::Boolean.boolean(true_ratio: 0.5) ? global : scopes.sample,
         category: participatory_space.categories.sample,
-        title: Decidim::Faker::Localized.sentence(2),
+        title: Decidim::Faker::Localized.sentence(word_count: 2),
         description: Decidim::Faker::Localized.wrapped("<p>", "</p>") do
-          Decidim::Faker::Localized.paragraph(3)
+          Decidim::Faker::Localized.paragraph(sentence_count: 3)
         end,
         location: Decidim::Faker::Localized.sentence,
         location_hints: Decidim::Faker::Localized.sentence,
-        start_time: 3.weeks.from_now,
-        end_time: 3.weeks.from_now + 4.hours,
+        start_time: start_time,
+        end_time: start_time + rand(1..4).hours,
         address: "#{Faker::Address.street_address} #{Faker::Address.zip} #{Faker::Address.city}",
         latitude: Faker::Address.latitude,
         longitude: Faker::Address.longitude,