decidim-meetings 0.28.2 → 0.29.0.rc1

data/lib/decidim/meetings/component.rb

@@ -19,12 +19,12 @@ 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 comment)
+    resource.actions = %w(join comment reply_poll)
     resource.searchable = true
   end
 
   component.register_stat :meetings_count, primary: true, priority: Decidim::StatsRegistry::MEDIUM_PRIORITY do |components, start_at, end_at|
-    meetings = Decidim::Meetings::FilteredMeetings.for(components, start_at, end_at).except_withdrawn
+    meetings = Decidim::Meetings::FilteredMeetings.for(components, start_at, end_at).not_withdrawn
     meetings.count
   end
 

data/lib/decidim/meetings/engine.rb

@@ -32,7 +32,11 @@ module Decidim
           resource :live_event, only: :show
           namespace :polls do
             resources :questions, only: [:index, :update]
-            resources :answers, only: [:index, :create]
+            resources :answers, only: [:index, :create] do
+              collection do
+                get :admin
+              end
+            end
           end
         end
         scope "/meetings" do

data/lib/decidim/meetings/meeting_serializer.rb

@@ -46,7 +46,9 @@ module Decidim
           url:,
           related_proposals:,
           related_results:,
-          published: meeting.published_at.present?
+          published: meeting.published_at.present?,
+          withdrawn: meeting.withdrawn?,
+          withdrawn_at: meeting.withdrawn_at
         }
       end
 

data/lib/decidim/meetings/seeds.rb

@@ -59,6 +59,7 @@ module Decidim
       def meeting_params(component:, type:, author_type:)
         start_time = ::Faker::Date.between(from: 20.weeks.ago, to: 20.weeks.from_now)
         end_time = start_time + [rand(1..4).hours, rand(1..20).days].sample
+        registration_type = Decidim::Meetings::Meeting::REGISTRATION_TYPES.keys.sample
 
         params = {
           component:,
@@ -78,6 +79,7 @@ module Decidim
           registrations_enabled: [true, false].sample,
           available_slots: (10..50).step(10).to_a.sample,
           author: participatory_space.organization,
+          registration_type:,
           registration_terms: Decidim::Faker::Localized.wrapped("<p>", "</p>") do
             Decidim::Faker::Localized.paragraph(sentence_count: 3)
           end,
@@ -118,6 +120,15 @@ module Decidim
                    params # :in_person
                  end
 
+        params = case registration_type
+                 when :on_different_platform
+                   params.merge(registration_url: Faker::Internet.url)
+                 when :on_this_platform
+                   params.merge(registrations_enabled: true)
+                 else
+                   params # registration_disabled
+                 end
+
         case author_type
         when :user
           params.merge(
@@ -132,7 +143,7 @@ module Decidim
             user_group:
           )
         else
-          params # oficial
+          params # official
         end
       end
 
@@ -146,12 +157,23 @@ module Decidim
       def create_meeting!(component:, type: :in_person, author_type: :official)
         params = meeting_params(component:, type:, author_type:)
 
-        Decidim.traceability.create!(
+        resource = Decidim.traceability.create!(
           Decidim::Meetings::Meeting,
           admin_user,
           params,
           visibility: "all"
         )
+
+        Decidim::EventsManager.publish(
+          event: "decidim.events.meetings.meeting_created",
+          event_class: Decidim::Meetings::CreateMeetingEvent,
+          resource:,
+          followers: resource.participatory_space.followers
+        )
+
+        Decidim::Comments::Seed.comments_for(resource)
+
+        resource
       end
 
       def create_service!(meeting:)
@@ -178,19 +200,7 @@ module Decidim
       def create_meeting_registration!(meeting:)
         r = SecureRandom.hex(4)
         email = "meeting-registered-user-#{meeting.id}-#{r}@example.org"
-        name = "#{::Faker::Name.name} #{meeting.id} #{r}"
-        user = Decidim::User.find_or_initialize_by(email:)
-
-        user.update!(
-          password: "decidim123456789",
-          name:,
-          nickname: ::Faker::Twitter.unique.screen_name,
-          organization:,
-          tos_agreement: "1",
-          confirmed_at: Time.current,
-          personal_url: ::Faker::Internet.url,
-          about: ::Faker::Lorem.paragraph(sentence_count: 2)
-        )
+        user = find_or_initialize_user_by(email:)
 
         Decidim::Meetings::Registration.create!(
           meeting:,

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

@@ -57,7 +57,7 @@ FactoryBot.define do
     end
 
     trait :withdrawn do
-      state { "withdrawn" }
+      withdrawn_at { Time.current }
     end
 
     trait :in_person do

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-shared_examples_for "emits an upcoming notificaton" do
+shared_examples_for "emits an upcoming notification" do
   context "when it is a future meeting" do
     let(:future_start_date) { 3.days.from_now }
 

data/lib/decidim/meetings/version.rb

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

data/lib/tasks/decidim_meetings.rake

@@ -3,7 +3,7 @@
 namespace :decidim_meetings do
   # For privacy reasons we recommend that you delete this registration form when you no longer need it.
   # By default this is 3 months after the meeting has passed
-  desc "Remove registration forms belonging to meetings that have ended more than X months ago"
+  desc "Removes registration forms belonging to meetings that have ended more than X months ago"
   task :clean_registration_forms, [:months] => :environment do |_t, args|
     args.with_defaults(months: 3)
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-meetings
 version: !ruby/object:Gem::Version
-  version: 0.28.2
+  version: 0.29.0.rc1
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -18,28 +18,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.2
+        version: 0.29.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.2
+        version: 0.29.0.rc1
 - !ruby/object:Gem::Dependency
   name: decidim-forms
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.2
+        version: 0.29.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.2
+        version: 0.29.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.28.2
+        version: 0.29.0.rc1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.2
+        version: 0.29.0.rc1
 - !ruby/object:Gem::Dependency
   name: decidim-assemblies
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.2
+        version: 0.29.0.rc1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.2
+        version: 0.29.0.rc1
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.2
+        version: 0.29.0.rc1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.2
+        version: 0.29.0.rc1
 - !ruby/object:Gem::Dependency
   name: decidim-participatory_processes
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.2
+        version: 0.29.0.rc1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.2
+        version: 0.29.0.rc1
 description: A meetings component for decidim's participatory spaces.
 email:
 - josepjaume@gmail.com
@@ -182,6 +182,7 @@ files:
 - app/commands/decidim/meetings/update_meeting.rb
 - app/commands/decidim/meetings/withdraw_meeting.rb
 - app/controllers/concerns/decidim/meetings/admin/filterable.rb
+- app/controllers/concerns/decidim/meetings/admin/invites/filterable.rb
 - app/controllers/concerns/decidim/meetings/component_filterable.rb
 - app/controllers/concerns/decidim/meetings/polls_resources.rb
 - app/controllers/decidim/meetings/admin/agenda_controller.rb
@@ -310,7 +311,6 @@ files:
 - app/views/decidim/meetings/admin/agenda/_form.html.erb
 - app/views/decidim/meetings/admin/agenda/edit.html.erb
 - app/views/decidim/meetings/admin/agenda/new.html.erb
-- app/views/decidim/meetings/admin/agenda/show.html.erb
 - app/views/decidim/meetings/admin/invite_join_meeting_mailer/invite.html.erb
 - app/views/decidim/meetings/admin/invites/_form.html.erb
 - app/views/decidim/meetings/admin/invites/index.html.erb
@@ -348,6 +348,7 @@ files:
 - app/views/decidim/meetings/meetings/_meeting_agenda.html.erb
 - app/views/decidim/meetings/meetings/_meeting_aside.html.erb
 - app/views/decidim/meetings/meetings/_meeting_minutes.html.erb
+- app/views/decidim/meetings/meetings/_meeting_poll_actions.html.erb
 - app/views/decidim/meetings/meetings/edit.html.erb
 - app/views/decidim/meetings/meetings/index.html.erb
 - app/views/decidim/meetings/meetings/index.js.erb
@@ -355,7 +356,9 @@ files:
 - app/views/decidim/meetings/meetings/show.html.erb
 - app/views/decidim/meetings/polls/answers/_multiple_option.html.erb
 - app/views/decidim/meetings/polls/answers/_single_option.html.erb
+- app/views/decidim/meetings/polls/answers/admin.html.erb
 - app/views/decidim/meetings/polls/answers/create.js.erb
+- app/views/decidim/meetings/polls/answers/index.html.erb
 - app/views/decidim/meetings/polls/questions/_closed_question.html.erb
 - app/views/decidim/meetings/polls/questions/_index.html.erb
 - app/views/decidim/meetings/polls/questions/_index_admin.html.erb
@@ -511,6 +514,7 @@ files:
 - db/migrate/20210928095036_rename_upcoming_events_content_block_to_upcoming_meetings.rb
 - db/migrate/20211105115625_remove_not_null_on_customize_registration_email.rb
 - db/migrate/20230427105701_change_types_and_registration_types_on_meetings.rb
+- db/migrate/20240130135858_add_withdrawn_fields_on_meetings.rb
 - decidim-meetings.gemspec
 - lib/decidim/api/agenda_item_type.rb
 - lib/decidim/api/agenda_type.rb
@@ -560,14 +564,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - "~>"
     - !ruby/object:Gem::Version
-      version: 3.1.0
+      version: 3.2.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: Decidim meetings module