decidim-meetings 0.19.1 → 0.23.0

data/config/locales/zh-TW.yml

@@ -0,0 +1 @@
+zh-TW:

data/db/migrate/20200320105922_index_foreign_keys_in_decidim_meetings_registrations.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class IndexForeignKeysInDecidimMeetingsRegistrations < ActiveRecord::Migration[5.2]
+  def change
+    add_index :decidim_meetings_registrations, :decidim_user_group_id
+  end
+end

data/db/migrate/20200526110940_add_author_to_meetings.rb

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+class AddAuthorToMeetings < ActiveRecord::Migration[5.2]
+  class Meeting < ApplicationRecord
+    self.table_name = :decidim_meetings_meetings
+    include Decidim::HasComponent
+  end
+
+  def change
+    add_column :decidim_meetings_meetings, :decidim_author_type, :string
+    add_column :decidim_meetings_meetings, :decidim_user_group_id, :integer
+
+    Meeting.reset_column_information
+    Meeting.find_each do |meeting|
+      if meeting.organizer_id.present?
+        meeting.decidim_author_id = meeting.organizer_id
+        meeting.decidim_author_type = "Decidim::UserBaseEntity"
+      else
+        meeting.decidim_author_id = meeting.organization.id
+        meeting.decidim_author_type = "Decidim::Organization"
+      end
+      meeting.save!
+    end
+
+    remove_column :decidim_meetings_meetings, :organizer_id
+    add_index :decidim_meetings_meetings,
+              [:decidim_author_id, :decidim_author_type],
+              name: "index_decidim_meetings_meetings_on_author"
+  end
+end

data/db/migrate/20200702123209_create_meeting_services_table.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+class CreateMeetingServicesTable < ActiveRecord::Migration[5.2]
+  def change
+    create_table :decidim_meetings_services do |t|
+      t.jsonb :title
+      t.jsonb :description
+      t.bigint :decidim_meeting_id, null: false, index: true
+
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20200702123210_move_meeting_services_to_own_model.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+class MoveMeetingServicesToOwnModel < ActiveRecord::Migration[5.2]
+  class Meeting < ApplicationRecord
+    self.table_name = :decidim_meetings_meetings
+  end
+
+  class Service < ApplicationRecord
+    self.table_name = :decidim_meetings_services
+  end
+
+  def change
+    Meeting.reset_column_information
+    Service.reset_column_information
+
+    Meeting.find_each do |meeting|
+      meeting["services"].each do |service|
+        Service.create!(
+          decidim_meeting_id: meeting.id,
+          title: service["title"],
+          description: service["description"]
+        )
+      end
+    end
+
+    remove_column :decidim_meetings_meetings, :services
+
+    Meeting.reset_column_information
+    Service.reset_column_information
+  end
+end

data/db/migrate/20200827153856_add_commentable_counter_cache_to_meetings.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+class AddCommentableCounterCacheToMeetings < ActiveRecord::Migration[5.2]
+  def change
+    add_column :decidim_meetings_meetings, :comments_count, :integer, null: false, default: 0
+    Decidim::Meetings::Meeting.reset_column_information
+    Decidim::Meetings::Meeting.find_each(&:update_comments_count)
+  end
+end

data/db/migrate/20201016065302_fix_meetings_registration_terms.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+class FixMeetingsRegistrationTerms < ActiveRecord::Migration[5.2]
+  def up
+    reset_column_information
+
+    PaperTrail.request(enabled: false) do
+      Decidim::Meetings::Meeting.find_each do |meeting|
+        next if meeting.component.nil?
+        # Only user-created meetings have this problem
+        next if meeting.official?
+
+        # Since user-created meetings have no way to override the `registration_terms` field
+        # and it's supposed to use the component defaults,
+        # we can safely override this.
+        meeting.registration_terms = meeting.component.settings.default_registration_terms
+        meeting.save!
+      end
+    end
+    reset_column_information
+  end
+
+  def down; end
+
+  def reset_column_information
+    Decidim::Meetings::Meeting.reset_column_information
+    Decidim::Component.reset_column_information
+  end
+end

data/lib/decidim/api/linked_resources_interface.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Meetings
+    # This interface represents all linked resources available in the module meetings
+    LinkedResourcesInterface = GraphQL::InterfaceType.define do
+      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)
+        }
+      end
+    end
+  end
+end

data/lib/decidim/api/services_interface.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Meetings
+    # This interface represents a categorizable object.
+    ServicesInterface = GraphQL::InterfaceType.define do
+      name "ServicesInterface"
+      description "An interface that can be used with services."
+
+      field :services, !types[ServiceType], "The object's services"
+    end
+  end
+end

data/lib/decidim/meetings.rb

@@ -6,6 +6,7 @@ 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/admin_engine.rb

@@ -12,8 +12,12 @@ module Decidim
       paths["lib/tasks"] = nil
 
       routes do
+        get "/answer_options", to: "registration_form#answer_options", as: :answer_options_meeting
+
         resources :meetings do
-          resources :meeting_closes, only: [:edit, :update]
+          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"

data/lib/decidim/meetings/api.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Meetings
+    autoload :LinkedResourcesInterface, "decidim/api/linked_resources_interface"
+    autoload :ServicesInterface, "decidim/api/services_interface"
+  end
+end

data/lib/decidim/meetings/component.rb

@@ -24,15 +24,19 @@ Decidim.register_component(:meetings) do |component|
   end
 
   component.register_stat :meetings_count, primary: true, priority: Decidim::StatsRegistry::MEDIUM_PRIORITY do |components, start_at, end_at|
-    meetings = Decidim::Meetings::Meeting.where(component: components)
-    meetings = meetings.where("created_at >= ?", start_at) if start_at.present?
-    meetings = meetings.where("created_at <= ?", end_at) if end_at.present?
+    meetings = Decidim::Meetings::FilteredMeetings.for(components, start_at, end_at)
     meetings.count
   end
 
+  component.register_stat :followers_count, tag: :followers, priority: Decidim::StatsRegistry::LOW_PRIORITY do |components, start_at, end_at|
+    meetings_ids = Decidim::Meetings::FilteredMeetings.for(components, start_at, end_at).pluck(:id)
+    Decidim::Follow.where(decidim_followable_type: "Decidim::Meetings::Meeting", decidim_followable_id: meetings_ids).count
+  end
+
   component.exports :meetings do |exports|
     exports.collection do |component_instance|
       Decidim::Meetings::Meeting
+        .not_hidden
         .visible
         .where(component: component_instance)
         .includes(component: { participatory_space: :organization })
@@ -46,11 +50,15 @@ Decidim.register_component(:meetings) do |component|
   component.actions = %w(join)
 
   component.settings(:global) do |settings|
+    settings.attribute :scopes_enabled, type: :boolean, default: false
+    settings.attribute :scope_id, type: :scope
     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
+    settings.attribute :comments_max_length, type: :integer, required: false
     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
   end
 
   component.settings(:step) do |settings|
@@ -106,13 +114,10 @@ Decidim.register_component(:meetings) do |component|
         longitude: Faker::Address.longitude,
         registrations_enabled: [true, false].sample,
         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)
-        end,
-        services: [
-          { title: Decidim::Faker::Localized.sentence(2), description: Decidim::Faker::Localized.sentence(5) },
-          { title: Decidim::Faker::Localized.sentence(2), description: Decidim::Faker::Localized.sentence(5) }
-        ]
+        end
       }
 
       meeting = Decidim.traceability.create!(
@@ -122,6 +127,14 @@ Decidim.register_component(:meetings) do |component|
         visibility: "all"
       )
 
+      2.times do
+        Decidim::Meetings::Service.create!(
+          meeting: meeting,
+          title: Decidim::Faker::Localized.sentence(2),
+          description: Decidim::Faker::Localized.sentence(5)
+        )
+      end
+
       Decidim::Forms::Questionnaire.create!(
         title: Decidim::Faker::Localized.paragraph,
         description: Decidim::Faker::Localized.wrapped("<p>", "</p>") do
@@ -165,21 +178,63 @@ Decidim.register_component(:meetings) do |component|
       Decidim::Attachment.create!(
         title: Decidim::Faker::Localized.sentence(2),
         description: Decidim::Faker::Localized.sentence(5),
-        file: File.new(File.join(__dir__, "seeds", "Exampledocument.pdf")),
         attachment_collection: attachment_collection,
-        attached_to: meeting
+        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),
-        file: File.new(File.join(__dir__, "seeds", "city.jpeg")),
-        attached_to: meeting
+        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),
-        file: File.new(File.join(__dir__, "seeds", "Exampledocument.pdf")),
-        attached_to: meeting
+        attached_to: meeting,
+        file: File.new(File.join(__dir__, "seeds", "Exampledocument.pdf")) # Keep after attached_to
+      )
+    end
+
+    authors = [
+      Decidim::UserGroup.where(decidim_organization_id: participatory_space.decidim_organization_id).verified.sample,
+      Decidim::User.where(decidim_organization_id: participatory_space.decidim_organization_id).all.sample
+    ]
+
+    authors.each do |author|
+      user_group = nil
+
+      if author.is_a?(Decidim::UserGroup)
+        user_group = author
+        author = user_group.users.sample
+      end
+
+      params = {
+        component: component,
+        scope: Faker::Boolean.boolean(0.5) ? global : scopes.sample,
+        category: participatory_space.categories.sample,
+        title: Decidim::Faker::Localized.sentence(2),
+        description: Decidim::Faker::Localized.wrapped("<p>", "</p>") do
+          Decidim::Faker::Localized.paragraph(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,
+        address: "#{Faker::Address.street_address} #{Faker::Address.zip} #{Faker::Address.city}",
+        latitude: Faker::Address.latitude,
+        longitude: Faker::Address.longitude,
+        registrations_enabled: [true, false].sample,
+        available_slots: (10..50).step(10).to_a.sample,
+        author: author,
+        user_group: user_group
+      }
+
+      Decidim.traceability.create!(
+        Decidim::Meetings::Meeting,
+        authors[0],
+        params,
+        visibility: "all"
       )
     end
   end

data/lib/decidim/meetings/engine.rb

@@ -17,7 +17,7 @@ module Decidim
       isolate_namespace Decidim::Meetings
 
       routes do
-        resources :meetings, only: [:index, :show] do
+        resources :meetings, only: [:index, :show, :new, :create, :edit, :update] do
           resource :registration, only: [:create, :destroy] do
             collection do
               get :create
@@ -26,7 +26,8 @@ module Decidim
               post :answer
             end
           end
-          resource :meeting_widget, only: :show, path: "embed"
+          resources :versions, only: [:show, :index]
+          resource :widget, only: :show, path: "embed"
         end
         root to: "meetings#index"
         resource :calendar, only: [:show], format: :text
@@ -54,10 +55,6 @@ module Decidim
           end
         end
 
-        Decidim.view_hooks.register(:current_participatory_space_meetings, priority: Decidim::ViewHooks::HIGH_PRIORITY) do |view_context|
-          view_context.cell("decidim/meetings/highlighted_meetings", view_context.current_participatory_space)
-        end
-
         # This view hook is used in card cells. It renders the next upcoming
         # meeting for the given participatory space.
         Decidim.view_hooks.register(:upcoming_meeting_for_card, priority: Decidim::ViewHooks::LOW_PRIORITY) do |view_context|

data/lib/decidim/meetings/meeting_serializer.rb

@@ -40,7 +40,7 @@ module Decidim
           address: meeting.address,
           location: meeting.location,
           reference: meeting.reference,
-          comments: meeting.comments.count,
+          comments: meeting.comments_count,
           attachments: meeting.attachments.count,
           followers: meeting.followers.count,
           url: url,

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

@@ -10,6 +10,14 @@ FactoryBot.define do
     name { Decidim::Components::Namer.new(participatory_space.organization.available_locales, :meetings).i18n_name }
     manifest_name { :meetings }
     participatory_space { create(:participatory_process, :with_steps, organization: organization) }
+
+    trait :with_creation_enabled do
+      settings do
+        {
+          creation_enabled_for_participants: true
+        }
+      end
+    end
   end
 
   factory :meeting, class: "Decidim::Meetings::Meeting" do
@@ -24,18 +32,41 @@ FactoryBot.define do
     end_time { start_time.advance(hours: 2) }
     private_meeting { false }
     transparent { true }
-    services do
-      [
-        { title: generate_localized_title, description: generate_localized_title },
-        { title: generate_localized_title, description: generate_localized_title }
-      ]
-    end
     questionnaire { build(:questionnaire) }
     registration_form_enabled { true }
     component { build(:component, manifest_name: "meetings") }
 
-    organizer do
-      create(:user, organization: component.organization) if component
+    author do
+      component.try(:organization)
+    end
+
+    trait :official do
+      author { component.organization if component }
+    end
+
+    trait :not_official do
+      author { create(:user, organization: component.organization) if component }
+    end
+
+    trait :with_services do
+      transient do
+        services do
+          nil
+        end
+      end
+
+      after(:build) do |meeting, evaluator|
+        meeting.services = evaluator.services || build_list(:service, 2, meeting: meeting)
+      end
+    end
+
+    trait :user_group_author do
+      author do
+        create(:user, organization: component.organization) if component
+      end
+      user_group do
+        create(:user_group, :verified, organization: component.organization, users: [author]) if component
+      end
     end
 
     trait :closed do
@@ -121,4 +152,10 @@ FactoryBot.define do
       rejected_at { Time.current }
     end
   end
+
+  factory :service, class: "Decidim::Meetings::Service" do
+    meeting
+    title { generate_localized_title }
+    description { Decidim::Faker::Localized.wrapped("<p>", "</p>") { generate_localized_title } }
+  end
 end