decidim-meetings 0.26.7 → 0.27.0.rc1

data/lib/decidim/api/meeting_type.rb

@@ -6,6 +6,7 @@ module Decidim
       description "A meeting"
 
       implements Decidim::Comments::CommentableInterface
+      implements Decidim::Core::AuthorableInterface
       implements Decidim::Core::CategorizableInterface
       implements Decidim::Core::ScopableInterface
       implements Decidim::Core::AttachableInterface
@@ -20,7 +21,6 @@ module Decidim
       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

data/lib/decidim/meetings/component.rb

@@ -127,7 +127,7 @@ Decidim.register_component(:meetings) do |component|
     end
 
     2.times do
-      start_time = Faker::Date.between(from: 20.weeks.ago, to: 20.weeks.from_now)
+      start_time = [rand(1..20).weeks.from_now, rand(1..20).weeks.ago].sample
       end_time = start_time + [rand(1..4).hours, rand(1..20).days].sample
       params = {
         component: component,
@@ -207,8 +207,8 @@ Decidim.register_component(:meetings) do |component|
         user = Decidim::User.find_or_initialize_by(email: email)
 
         user.update!(
-          password: "decidim123456",
-          password_confirmation: "decidim123456",
+          password: "decidim123456789",
+          password_confirmation: "decidim123456789",
           name: name,
           nickname: Faker::Twitter.unique.screen_name,
           organization: component.organization,
@@ -236,7 +236,7 @@ Decidim.register_component(:meetings) do |component|
         attachment_collection: attachment_collection,
         attached_to: meeting,
         content_type: "application/pdf",
-        file: ActiveStorage::Blob.create_after_upload!(
+        file: ActiveStorage::Blob.create_and_upload!(
           io: File.open(File.join(__dir__, "seeds", "Exampledocument.pdf")),
           filename: "Exampledocument.pdf",
           content_type: "application/pdf",
@@ -248,7 +248,7 @@ Decidim.register_component(:meetings) do |component|
         description: Decidim::Faker::Localized.sentence(word_count: 5),
         attached_to: meeting,
         content_type: "image/jpeg",
-        file: ActiveStorage::Blob.create_after_upload!(
+        file: ActiveStorage::Blob.create_and_upload!(
           io: File.open(File.join(__dir__, "seeds", "city.jpeg")),
           filename: "city.jpeg",
           content_type: "image/jpeg",
@@ -260,7 +260,7 @@ Decidim.register_component(:meetings) do |component|
         description: Decidim::Faker::Localized.sentence(word_count: 5),
         attached_to: meeting,
         content_type: "application/pdf",
-        file: ActiveStorage::Blob.create_after_upload!(
+        file: ActiveStorage::Blob.create_and_upload!(
           io: File.open(File.join(__dir__, "seeds", "Exampledocument.pdf")),
           filename: "Exampledocument.pdf",
           content_type: "application/pdf",
@@ -282,7 +282,7 @@ Decidim.register_component(:meetings) do |component|
         author = user_group.users.sample
       end
 
-      start_time = Faker::Date.between(from: 20.weeks.ago, to: 20.weeks.from_now)
+      start_time = [rand(1..20).weeks.from_now, rand(1..20).weeks.ago].sample
       params = {
         component: component,
         scope: Faker::Boolean.boolean(true_ratio: 0.5) ? global : scopes.sample,

data/lib/decidim/meetings/{data_portability_user_answers_serializer.rb → download_your_data_user_answers_serializer.rb}

@@ -2,9 +2,9 @@
 
 module Decidim
   module Meetings
-    class DataPortabilityUserAnswersSerializer < Decidim::Exporters::Serializer
+    class DownloadYourDataUserAnswersSerializer < Decidim::Exporters::Serializer
       include Decidim::TranslationsHelper
-      # Serializes an user answer for data portability
+      # Serializes an user answer for download your data
       def serialize
         {
           id: resource.id,

data/lib/decidim/meetings/engine.rb

@@ -57,7 +57,7 @@ module Decidim
         # meeting for the given participatory space.
         Decidim.view_hooks.register(:upcoming_meeting_for_card, priority: Decidim::ViewHooks::LOW_PRIORITY) do |view_context|
           published_components = Decidim::Component.where(participatory_space: view_context.current_participatory_space).published
-          upcoming_meeting = Decidim::Meetings::Meeting.where(component: published_components).published.upcoming.order(:start_time, :end_time).first
+          upcoming_meeting = Decidim::Meetings::Meeting.where(component: published_components).upcoming.order(:start_time, :end_time).first
 
           next unless upcoming_meeting
 
@@ -119,6 +119,20 @@ module Decidim
       initializer "decidim_meetings.webpacker.assets_path" do
         Decidim.register_assets_path File.expand_path("app/packs", root)
       end
+
+      initializer "decidim_meetings.notification_settings" do
+        Decidim.notification_settings(:close_meeting_reminder) { |ns| ns.settings_area = :administrators }
+      end
+
+      initializer "decidim_meetings.register_reminders" do
+        Decidim.reminders_registry.register(:close_meeting) do |reminder_registry|
+          reminder_registry.generator_class_name = "Decidim::Meetings::CloseMeetingReminderGenerator"
+
+          reminder_registry.settings do |settings|
+            settings.attribute :reminder_times, type: :array, default: [3.days, 7.days]
+          end
+        end
+      end
     end
   end
 end

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

@@ -86,6 +86,8 @@ FactoryBot.define do
       end
     end
 
+    trait(:participant_author) { not_official }
+
     trait :user_group_author do
       author do
         create(:user, organization: component.organization) if component
@@ -205,7 +207,7 @@ FactoryBot.define do
   factory :invite, class: "Decidim::Meetings::Invite" do
     meeting
     user
-    sent_at { Time.current - 1.day }
+    sent_at { 1.day.ago }
     accepted_at { nil }
     rejected_at { nil }
 

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

@@ -13,7 +13,7 @@ shared_examples_for "emits an upcoming notificaton" do
         .to receive(:generate_checksum).and_return "1234"
 
       expect(Decidim::Meetings::UpcomingMeetingNotificationJob)
-        .to receive_message_chain(:set, :perform_later) # rubocop:disable RSpec/MessageChain
+        .to receive_message_chain(:set, :perform_later)
         .with(set: meeting.start_time - Decidim::Meetings.upcoming_meeting_notification)
         .with(kind_of(Integer), "1234")
 

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

@@ -3,7 +3,7 @@
 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(:body) { { en: en_body, machine_translations: { ca: "C'est Sparta!" } } }
     let(:participatory_process) { create :participatory_process, organization: organization }
     let(:meeting_component) { create(:meeting_component, participatory_space: participatory_process) }
     let(:translatable) { true }
@@ -13,7 +13,7 @@ shared_examples_for "a translated meeting event" do
     let(:resource) do
       create :meeting,
              component: meeting_component,
-             title: { "en": "A nice event", "machine_translations": { "ca": "Une belle event" } },
+             title: { en: "A nice event", machine_translations: { ca: "Une belle event" } },
              description: body
     end
 

data/lib/decidim/meetings/version.rb

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

data/lib/decidim/meetings.rb

@@ -15,7 +15,7 @@ module Decidim
     autoload :Registrations, "decidim/meetings/registrations"
     autoload :MeetingSerializer, "decidim/meetings/meeting_serializer"
     autoload :UserAnswersSerializer, "decidim/meetings/user_answers_serializer"
-    autoload :DataPortabilityUserAnswersSerializer, "decidim/meetings/data_portability_user_answers_serializer"
+    autoload :DownloadYourDataUserAnswersSerializer, "decidim/meetings/download_your_data_user_answers_serializer"
 
     include ActiveSupport::Configurable
 
@@ -28,6 +28,10 @@ module Decidim
     config_accessor :upcoming_meeting_notification do
       2.days
     end
+
+    config_accessor :embeddable_services do
+      %w(www.youtube.com www.twitch.tv meet.jit.si)
+    end
   end
 
   module ContentParsers

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-meetings
 version: !ruby/object:Gem::Version
-  version: 0.26.7
+  version: 0.27.0.rc1
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-05-11 00:00:00.000000000 Z
+date: 2022-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: decidim-core
@@ -18,28 +18,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.7
+        version: 0.27.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.7
+        version: 0.27.0.rc1
 - !ruby/object:Gem::Dependency
   name: decidim-forms
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.7
+        version: 0.27.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.7
+        version: 0.27.0.rc1
 - !ruby/object:Gem::Dependency
   name: icalendar
   requirement: !ruby/object:Gem::Requirement
@@ -60,56 +60,56 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.7
+        version: 0.27.0.rc1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.7
+        version: 0.27.0.rc1
 - !ruby/object:Gem::Dependency
   name: decidim-assemblies
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.7
+        version: 0.27.0.rc1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.7
+        version: 0.27.0.rc1
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.7
+        version: 0.27.0.rc1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.7
+        version: 0.27.0.rc1
 - !ruby/object:Gem::Dependency
   name: decidim-participatory_processes
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.7
+        version: 0.27.0.rc1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.7
+        version: 0.27.0.rc1
 description: A meetings component for decidim's participatory spaces.
 email:
 - josepjaume@gmail.com
@@ -224,6 +224,7 @@ files:
 - app/forms/decidim/meetings/admin/close_meeting_form.rb
 - app/forms/decidim/meetings/admin/meeting_agenda_form.rb
 - app/forms/decidim/meetings/admin/meeting_agenda_items_form.rb
+- app/forms/decidim/meetings/admin/meeting_copy_form.rb
 - app/forms/decidim/meetings/admin/meeting_form.rb
 - app/forms/decidim/meetings/admin/meeting_registration_invite_form.rb
 - app/forms/decidim/meetings/admin/meeting_registrations_form.rb
@@ -244,8 +245,10 @@ files:
 - app/helpers/decidim/meetings/map_helper.rb
 - app/helpers/decidim/meetings/meeting_cells_helper.rb
 - app/helpers/decidim/meetings/meetings_helper.rb
+- app/jobs/decidim/meetings/send_close_meeting_reminder_job.rb
 - app/jobs/decidim/meetings/upcoming_meeting_notification_job.rb
 - app/mailers/decidim/meetings/admin/invite_join_meeting_mailer.rb
+- app/mailers/decidim/meetings/close_meeting_reminder_mailer.rb
 - app/mailers/decidim/meetings/registration_mailer.rb
 - app/models/decidim/meetings/agenda.rb
 - app/models/decidim/meetings/agenda_item.rb
@@ -279,6 +282,7 @@ files:
 - app/permissions/decidim/meetings/permissions.rb
 - app/presenters/decidim/meetings/admin_log/invite_presenter.rb
 - app/presenters/decidim/meetings/admin_log/meeting_presenter.rb
+- app/presenters/decidim/meetings/admin_log/questionnaire_presenter.rb
 - app/presenters/decidim/meetings/admin_log/value_types/meeting_title_description_presenter.rb
 - app/presenters/decidim/meetings/invite_presenter.rb
 - app/presenters/decidim/meetings/log/resource_presenter.rb
@@ -290,8 +294,8 @@ files:
 - app/queries/decidim/meetings/metrics/meeting_followers_metric_measure.rb
 - app/queries/decidim/meetings/metrics/meetings_metric_manage.rb
 - app/queries/decidim/meetings/questionnaire_user_answers.rb
-- app/serializers/decidim/meetings/data_portability_invite_serializer.rb
-- app/serializers/decidim/meetings/data_portability_registration_serializer.rb
+- app/serializers/decidim/meetings/download_your_data_invite_serializer.rb
+- app/serializers/decidim/meetings/download_your_data_registration_serializer.rb
 - app/serializers/decidim/meetings/registration_serializer.rb
 - app/services/decidim/meetings/calendar/base_calendar.rb
 - app/services/decidim/meetings/calendar/component_calendar.rb
@@ -299,8 +303,8 @@ files:
 - app/services/decidim/meetings/calendar/meeting_to_event.rb
 - app/services/decidim/meetings/calendar/organization_calendar.rb
 - app/services/decidim/meetings/calendar_renderer.rb
+- app/services/decidim/meetings/close_meeting_reminder_generator.rb
 - app/services/decidim/meetings/diff_renderer.rb
-- app/services/decidim/meetings/directory/meeting_search.rb
 - app/services/decidim/meetings/meeting_iframe_embedder.rb
 - app/services/decidim/meetings/meeting_search.rb
 - app/views/decidim/meetings/_calendar_modal.html.erb
@@ -318,6 +322,7 @@ files:
 - app/views/decidim/meetings/admin/meeting_closes/_form.html.erb
 - app/views/decidim/meetings/admin/meeting_closes/edit.html.erb
 - app/views/decidim/meetings/admin/meeting_closes/proposals_picker.html.erb
+- app/views/decidim/meetings/admin/meeting_copies/_form.html.erb
 - app/views/decidim/meetings/admin/meeting_copies/new.html.erb
 - app/views/decidim/meetings/admin/meetings/_form.html.erb
 - app/views/decidim/meetings/admin/meetings/_service.html.erb
@@ -332,6 +337,7 @@ files:
 - app/views/decidim/meetings/admin/poll/edit.html.erb
 - app/views/decidim/meetings/admin/registrations/_form.html.erb
 - app/views/decidim/meetings/admin/registrations/edit.html.erb
+- app/views/decidim/meetings/close_meeting_reminder_mailer/close_meeting_reminder.html.erb
 - app/views/decidim/meetings/directory/meetings/_filters.html.erb
 - app/views/decidim/meetings/directory/meetings/_meetings.html.erb
 - app/views/decidim/meetings/directory/meetings/index.html.erb
@@ -396,7 +402,6 @@ files:
 - config/locales/et-EE.yml
 - config/locales/et.yml
 - config/locales/eu.yml
-- config/locales/fa-IR.yml
 - config/locales/fi-pl.yml
 - config/locales/fi-plain.yml
 - config/locales/fi.yml
@@ -405,7 +410,6 @@ files:
 - config/locales/fr.yml
 - config/locales/ga-IE.yml
 - config/locales/gl.yml
-- config/locales/gn-PY.yml
 - config/locales/hr-HR.yml
 - config/locales/hr.yml
 - config/locales/hu.yml
@@ -414,13 +418,10 @@ files:
 - config/locales/is.yml
 - config/locales/it.yml
 - config/locales/ja.yml
-- config/locales/ka-GE.yml
-- config/locales/kaa.yml
 - config/locales/ko-KR.yml
 - config/locales/ko.yml
 - config/locales/lb-LU.yml
 - config/locales/lb.yml
-- config/locales/lo-LA.yml
 - config/locales/lt-LT.yml
 - config/locales/lt.yml
 - config/locales/lv.yml
@@ -428,7 +429,6 @@ files:
 - config/locales/mt.yml
 - config/locales/nl.yml
 - config/locales/no.yml
-- config/locales/oc-FR.yml
 - config/locales/om-ET.yml
 - config/locales/pl.yml
 - config/locales/pt-BR.yml
@@ -506,6 +506,7 @@ files:
 - db/migrate/20210903143040_add_iframe_access_level_to_decidim_meetings.rb
 - db/migrate/20210922140454_transform_show_embedded_iframe_column.rb
 - db/migrate/20210928095036_rename_upcoming_events_content_block_to_upcoming_meetings.rb
+- db/migrate/20211105115625_remove_not_null_on_customize_registration_email.rb
 - lib/decidim/api/agenda_item_type.rb
 - lib/decidim/api/agenda_type.rb
 - lib/decidim/api/linked_resources_interface.rb
@@ -520,9 +521,9 @@ files:
 - lib/decidim/meetings/admin_engine.rb
 - lib/decidim/meetings/api.rb
 - lib/decidim/meetings/component.rb
-- lib/decidim/meetings/data_portability_user_answers_serializer.rb
 - lib/decidim/meetings/directory.rb
 - lib/decidim/meetings/directory_engine.rb
+- lib/decidim/meetings/download_your_data_user_answers_serializer.rb
 - lib/decidim/meetings/engine.rb
 - lib/decidim/meetings/meeting_serializer.rb
 - lib/decidim/meetings/polls.rb
@@ -548,14 +549,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.7'
+      version: '3.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.2.22
 signing_key: 
 specification_version: 4
 summary: Decidim meetings module

data/app/services/decidim/meetings/directory/meeting_search.rb

@@ -1,53 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
-  module Meetings
-    module Directory
-      class MeetingSearch < Decidim::Meetings::MeetingSearch
-        text_search_fields :title, :description
-
-        def search_space
-          return query if options[:space].blank? || options[:space] == "all"
-
-          query.joins(:component).where(decidim_components: { participatory_space_type: options[:space].collect(&:classify) })
-        end
-
-        private
-
-        # Private: Creates an array of category ids.
-        # It contains categories' subcategories ids as well.
-        def all_category_ids
-          cat_ids = fetch_category_ids
-
-          component.flat_map do |comp|
-            comp
-              .categories
-              .where(id: cat_ids)
-              .or(comp.categories.where(parent_id: cat_ids))
-              .pluck(:id).tap { |ids| ids.prepend(nil) if category_ids.include?("without") }
-          end
-        end
-
-        # take a param list like ["2", "10", "Decidim__Assembly4", "Decidim__Assembly2"]
-        # return a param list like [47, 48, 43, 44, 45, 46, 41, 42, 27, 28, 32, 31, 29, 30, 26, 25]
-        def fetch_category_ids
-          cat_ids = category_ids.without("without")
-
-          additional_ids = cat_ids.select { |a| a =~ /Decidim__/ }
-
-          additional_ids = parse_category_ids(additional_ids)
-          cat_ids.collect(&:to_i).without(0).push(*additional_ids)
-        end
-
-        # this function expects an array of the following format : [ "Decidim__Assembly4", "Decidim__Assembly2"]
-        # It will transform each parameter into an array of class_name and id [["Decidim::Assembly", "4"], ["Decidim::Assembly", "2"]]
-        # After we rebuild the find query and retrun the category_ids for each participatory space
-        def parse_category_ids(additional_ids)
-          additional_ids = additional_ids.map { |a| a.gsub("__", "::").gsub(/(\d+)/, '.\1').split(".") }
-          additional_ids = additional_ids.map { |v| v.first.safe_constantize.send(:find, v.last.to_i).category_ids }
-          additional_ids.flatten
-        end
-      end
-    end
-  end
-end

data/config/locales/fa-IR.yml

@@ -1 +0,0 @@
-fa:

data/config/locales/gn-PY.yml

@@ -1 +0,0 @@
-gn:

data/config/locales/ka-GE.yml

@@ -1 +0,0 @@
-ka:

data/config/locales/kaa.yml

@@ -1 +0,0 @@
-kaa:

data/config/locales/lo-LA.yml

@@ -1 +0,0 @@
-lo:

data/config/locales/oc-FR.yml

@@ -1 +0,0 @@
-oc: