decidim-meetings 0.24.1 → 0.25.0.rc2

data/db/migrate/20210520084247_create_decidim_meetings_questionnaires.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+class CreateDecidimMeetingsQuestionnaires < ActiveRecord::Migration[6.0]
+  def change
+    create_table :decidim_meetings_questionnaires do |t|
+      t.references :questionnaire_for, polymorphic: true, index: { name: "index_decidim_meetings_questionnaires_questionnaire_for" }
+
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20210520084253_create_decidim_meetings_questions.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+class CreateDecidimMeetingsQuestions < ActiveRecord::Migration[6.0]
+  def change
+    create_table :decidim_meetings_questions do |t|
+      t.references :decidim_questionnaire, index: true
+      t.integer :position, index: true
+      t.string :question_type
+      t.jsonb :body
+      t.integer :max_choices
+
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20210520084321_create_decidim_meetings_answers.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+class CreateDecidimMeetingsAnswers < ActiveRecord::Migration[6.0]
+  def change
+    create_table :decidim_meetings_answers do |t|
+      t.references :decidim_user, index: true
+      t.references :decidim_questionnaire, index: true
+      t.references :decidim_question, index: { name: "index_decidim_meetings_answers_question_id" }
+
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20210520084330_create_decidim_meetings_answer_options.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+class CreateDecidimMeetingsAnswerOptions < ActiveRecord::Migration[6.0]
+  def change
+    create_table :decidim_meetings_answer_options do |t|
+      t.references :decidim_question, index: { name: "index_decidim_meetings_answer_options_question_id" }
+      t.jsonb :body
+    end
+  end
+end

data/db/migrate/20210520084337_create_decidim_meetings_answer_choices.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+class CreateDecidimMeetingsAnswerChoices < ActiveRecord::Migration[6.0]
+  def change
+    create_table :decidim_meetings_answer_choices do |t|
+      t.references :decidim_answer, index: { name: "index_decidim_meetings_answer_choices_answer_id" }
+      t.references :decidim_answer_option, index: { name: "index_decidim_meetings_answer_choices_answer_option_id" }
+      t.integer :position
+      t.jsonb :body
+      t.text :custom_body
+    end
+  end
+end

data/db/migrate/20210520134834_add_status_to_meetings_questions.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AddStatusToMeetingsQuestions < ActiveRecord::Migration[6.0]
+  def change
+    add_column :decidim_meetings_questions, :status, :integer, default: 0, index: true
+  end
+end

data/db/migrate/20210602040614_add_setting_embed_iframe_to_meetings.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AddSettingEmbedIframeToMeetings < ActiveRecord::Migration[6.0]
+  def change
+    add_column :decidim_meetings_meetings, :show_embedded_iframe, :boolean, default: false
+  end
+end

data/lib/decidim/api/linked_resources_interface.rb

@@ -8,7 +8,14 @@ module Decidim
       graphql_name "MeetinsLinkedResourcewInterface"
       description "An interface that can be used with Resourceable models."
 
-      field :proposals_from_meeting, [Decidim::Proposals::ProposalType, { null: true }], "Proposals created in this meeting", null: false
+      if Decidim::Meetings.enable_proposal_linking
+        field(
+          :proposals_from_meeting,
+          [Decidim::Proposals::ProposalType, { null: true }],
+          "Proposals created in this meeting",
+          null: false
+        )
+      end
 
       def proposals_from_meeting
         object.linked_resources(:proposals, :proposals_from_meeting)

data/lib/decidim/api/meeting_type.rb

@@ -29,14 +29,28 @@ module Decidim
 
       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 :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
+
+      def closing_report
+        object.closing_report if object.closing_visible?
+      end
+
+      def video_url
+        object.video_url if object.closing_visible?
+      end
+
+      def audio_url
+        object.audio_url if object.closing_visible?
+      end
+
+      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
+
       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
@@ -58,6 +72,7 @@ module Decidim
       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
+      field :show_embedded_iframe, GraphQL::Types::Boolean, "Whether show or not the iframe", null: false
     end
   end
 end

data/lib/decidim/api/meetings_type.rb

@@ -11,7 +11,7 @@ module Decidim
       field :meetings, Decidim::Meetings::MeetingType.connection_type, null: true, connection: true
 
       def meetings
-        Meeting.visible.where(component: object).includes(:component)
+        Meeting.published.visible.where(component: object).includes(:component)
       end
 
       field :meeting, Decidim::Meetings::MeetingType, null: true do
@@ -19,7 +19,7 @@ module Decidim
       end
 
       def meeting(**args)
-        Meeting.visible.where(component: object).find_by(id: args[:id])
+        Meeting.published.visible.where(component: object).find_by(id: args[:id])
       end
     end
   end

data/lib/decidim/meetings/admin_engine.rb

@@ -15,6 +15,10 @@ module Decidim
         get "/answer_options", to: "registration_form#answer_options", as: :answer_options_meeting
 
         resources :meetings do
+          member do
+            put :publish
+            put :unpublish
+          end
           resources :meeting_closes, only: [:edit, :update] do
             get :proposals_picker, on: :collection
           end
@@ -30,7 +34,7 @@ module Decidim
           resources :attachment_collections
           resources :attachments
           resources :copies, controller: "meeting_copies", only: [:new, :create]
-          resources :minutes, except: [:show, :index]
+          resource :poll, only: [:edit, :update], controller: "meetings_poll"
         end
         root to: "meetings#index"
       end

data/lib/decidim/meetings/api.rb

@@ -6,7 +6,6 @@ module Decidim
     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"

data/lib/decidim/meetings/component.rb

@@ -5,7 +5,7 @@ require "decidim/components/namer"
 Decidim.register_component(:meetings) do |component|
   component.engine = Decidim::Meetings::Engine
   component.admin_engine = Decidim::Meetings::AdminEngine
-  component.icon = "decidim/meetings/icon.svg"
+  component.icon = "media/images/decidim_meetings.svg"
   component.permissions_class_name = "Decidim::Meetings::Permissions"
 
   component.query_type = "Decidim::Meetings::MeetingsType"
@@ -20,7 +20,7 @@ Decidim.register_component(:meetings) do |component|
     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.actions = %w(join comment)
     resource.searchable = true
   end
 
@@ -34,9 +34,15 @@ Decidim.register_component(:meetings) do |component|
     Decidim::Follow.where(decidim_followable_type: "Decidim::Meetings::Meeting", decidim_followable_id: meetings_ids).count
   end
 
+  component.register_stat :comments_count, tag: :comments do |components, start_at, end_at|
+    meetings = Decidim::Meetings::FilteredMeetings.for(components, start_at, end_at).not_hidden
+    meetings.sum(:comments_count)
+  end
+
   component.exports :meetings do |exports|
     exports.collection do |component_instance|
       Decidim::Meetings::Meeting
+        .published
         .not_hidden
         .visible
         .where(component: component_instance)
@@ -60,7 +66,17 @@ Decidim.register_component(:meetings) do |component|
     exports.serializer Decidim::Comments::CommentSerializer
   end
 
-  component.actions = %w(join)
+  component.exports :answers do |exports|
+    exports.collection do |_component, _user, resource_id|
+      Decidim::Meetings::QuestionnaireUserAnswers.for(resource_id)
+    end
+
+    exports.formats %w(CSV JSON Excel FormPDF)
+
+    exports.serializer Decidim::Meetings::UserAnswersSerializer
+  end
+
+  component.actions = %w(join comment)
 
   component.settings(:global) do |settings|
     settings.attribute :scopes_enabled, type: :boolean, default: false
@@ -73,6 +89,7 @@ Decidim.register_component(:meetings) do |component|
     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
+    settings.attribute :maps_enabled, type: :boolean, default: true
   end
 
   component.settings(:step) do |settings|
@@ -209,19 +226,37 @@ Decidim.register_component(:meetings) do |component|
         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
+        content_type: "application/pdf",
+        file: ActiveStorage::Blob.create_after_upload!(
+          io: File.open(File.join(__dir__, "seeds", "Exampledocument.pdf")),
+          filename: "Exampledocument.pdf",
+          content_type: "application/pdf",
+          metadata: nil
+        ) # Keep after attached_to
       )
       Decidim::Attachment.create!(
         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
+        content_type: "image/jpeg",
+        file: ActiveStorage::Blob.create_after_upload!(
+          io: File.open(File.join(__dir__, "seeds", "city.jpeg")),
+          filename: "city.jpeg",
+          content_type: "image/jpeg",
+          metadata: nil
+        ) # Keep after attached_to
       )
       Decidim::Attachment.create!(
         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
+        content_type: "application/pdf",
+        file: ActiveStorage::Blob.create_after_upload!(
+          io: File.open(File.join(__dir__, "seeds", "Exampledocument.pdf")),
+          filename: "Exampledocument.pdf",
+          content_type: "application/pdf",
+          metadata: nil
+        ) # Keep after attached_to
       )
     end
 

data/lib/decidim/meetings/data_portability_user_answers_serializer.rb

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Meetings
+    class DataPortabilityUserAnswersSerializer < Decidim::Exporters::Serializer
+      include Decidim::TranslationsHelper
+      # Serializes an user answer for data portability
+      def serialize
+        {
+          id: resource.id,
+          user: {
+            name: resource.user.name,
+            email: resource.user.email
+          },
+          questionnaire: {
+            id: resource.question.questionnaire.id
+          },
+          question: {
+            id: resource.question.id,
+            body: translated_attribute(resource.question.body)
+          },
+          answer: normalize_body(resource)
+        }
+      end
+
+      private
+
+      def normalize_body(resource)
+        resource.choices.pluck(:body)
+      end
+    end
+  end
+end

data/lib/decidim/meetings/engine.rb

@@ -1,12 +1,8 @@
 # frozen_string_literal: true
 
-require "searchlight"
-require "kaminari"
-require "jquery-tmpl-rails"
 require "icalendar"
-require "cells/rails"
-require "cells-erb"
-require "cell/partial"
+
+require "decidim/core"
 
 module Decidim
   module Meetings
@@ -31,9 +27,16 @@ module Decidim
           end
           resources :versions, only: [:show, :index]
           resource :widget, only: :show, path: "embed"
+          resource :live_event, only: :show
+          namespace :polls do
+            resources :questions, only: [:index, :update]
+            resources :answers, only: [:index, :create]
+          end
         end
         root to: "meetings#index"
-        resource :calendar, only: [:show], format: :text
+        resource :calendar, only: [:show], format: :text do
+          resources :meetings, only: [:show], controller: :calendars, action: :meeting_calendar
+        end
       end
 
       initializer "decidim_meetings.view_hooks" do
@@ -103,10 +106,6 @@ module Decidim
           metric_operation.manager_class = "Decidim::Meetings::Metrics::MeetingFollowersMetricMeasure"
         end
       end
-
-      initializer "decidim_meetings.assets" do |app|
-        app.config.assets.precompile += %w(decidim_meetings_manifest.js)
-      end
     end
   end
 end

data/lib/decidim/meetings/meeting_serializer.rb

@@ -52,6 +52,7 @@ module Decidim
       private
 
       attr_reader :meeting
+      alias resource meeting
 
       def component
         meeting.component

data/lib/decidim/meetings/polls.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Meetings
+    # This module contains all the domain logic associated to Decidim's Meetings
+    # associated poll.
+    module Polls
+    end
+  end
+end

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

@@ -3,7 +3,6 @@
 require "decidim/core/test/factories"
 require "decidim/forms/test/factories"
 require "decidim/participatory_processes/test/factories"
-require "decidim/assemblies/test/factories"
 
 FactoryBot.define do
   factory :meeting_component, parent: :component do
@@ -38,11 +37,20 @@ FactoryBot.define do
     registration_type { :on_this_platform }
     type_of_meeting { :in_person }
     component { build(:component, manifest_name: "meetings") }
+    show_embedded_iframe { false }
 
     author do
       component.try(:organization)
     end
 
+    trait :published do
+      published_at { Time.current }
+    end
+
+    trait :in_person do
+      type_of_meeting { :in_person }
+    end
+
     trait :online do
       type_of_meeting { :online }
       online_meeting_url { "https://decidim.org" }
@@ -88,6 +96,14 @@ FactoryBot.define do
       contributions_count { rand(50) }
       attending_organizations { Array.new(3) { Faker::TvShows::GameOfThrones.house }.join(", ") }
       closed_at { Time.current }
+      closing_visible { true }
+    end
+
+    trait :closed_with_minutes do
+      closed
+      video_url { Faker::Internet.url }
+      audio_url { Faker::Internet.url }
+      closing_visible { true }
     end
 
     trait :with_registrations_enabled do
@@ -105,6 +121,23 @@ FactoryBot.define do
     trait :upcoming do
       start_time { Faker::Time.between(from: 1.day.from_now, to: 10.days.from_now) }
     end
+
+    trait :live do
+      start_time { 1.day.ago }
+      end_time { 1.day.from_now }
+    end
+
+    trait :embeddable do
+      online_meeting_url { "https://www.youtube.com/watch?v=pj_2G3x6-Zk" }
+    end
+
+    factory :published_meeting do
+      published_at { Time.current }
+    end
+
+    trait :show_embedded_iframe do
+      show_embedded_iframe { true }
+    end
   end
 
   factory :registration, class: "Decidim::Meetings::Registration" do
@@ -142,14 +175,6 @@ FactoryBot.define do
     end
   end
 
-  factory :minutes, class: "Decidim::Meetings::Minutes" do
-    description { Decidim::Faker::Localized.wrapped("<p>", "</p>") { generate_localized_title } }
-    video_url { Faker::Internet.url }
-    audio_url { Faker::Internet.url }
-    visible { true }
-    meeting
-  end
-
   factory :invite, class: "Decidim::Meetings::Invite" do
     meeting
     user
@@ -171,4 +196,55 @@ FactoryBot.define do
     title { generate_localized_title }
     description { Decidim::Faker::Localized.wrapped("<p>", "</p>") { generate_localized_title } }
   end
+
+  factory :poll, class: "Decidim::Meetings::Poll" do
+    meeting
+  end
+
+  factory :meetings_poll_questionnaire, class: "Decidim::Meetings::Questionnaire" do
+    questionnaire_for { build(:poll) }
+  end
+
+  factory :meetings_poll_question, class: "Decidim::Meetings::Question" do
+    transient do
+      options { [] }
+    end
+
+    body { generate_localized_title }
+    position { 0 }
+    status { 0 }
+    question_type { Decidim::Meetings::Question::QUESTION_TYPES.first }
+    questionnaire factory: :meetings_poll_questionnaire
+    answer_options do
+      Array.new(3).collect { build(:meetings_poll_answer_option, question: nil) }
+    end
+
+    trait :unpublished do
+      status { 0 }
+    end
+
+    trait :published do
+      status { 1 }
+    end
+
+    trait :closed do
+      status { 2 }
+    end
+  end
+
+  factory :meetings_poll_answer, class: "Decidim::Meetings::Answer" do
+    questionnaire factory: :meetings_poll_questionnaire
+    question { create(:meetings_poll_question, questionnaire: questionnaire) }
+    user { create(:user, organization: questionnaire.questionnaire_for.organization) }
+  end
+
+  factory :meetings_poll_answer_option, class: "Decidim::Meetings::AnswerOption" do
+    question { create(:meetings_poll_question) }
+    body { generate_localized_title }
+  end
+
+  factory :meetings_poll_answer_choice, class: "Decidim::Meetings::AnswerChoice" do
+    answer factory: :meetings_poll_answer
+    answer_option { create(:meetings_poll_answer_option, question: answer.question) }
+  end
 end