decidim 0.5.1 → 0.6.0

data/decidim-meetings/db/migrate/20170810120836_add_registration_attributes_to_meetings.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+class AddRegistrationAttributesToMeetings < ActiveRecord::Migration[5.1]
+  def change
+    add_column :decidim_meetings_meetings, :registrations_enabled, :boolean, null: false, default: false
+    add_column :decidim_meetings_meetings, :available_slots, :integer, null: false, default: 0
+    add_column :decidim_meetings_meetings, :registration_terms, :jsonb
+  end
+end

data/decidim-meetings/db/migrate/20170810131100_create_registrations.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+class CreateRegistrations < ActiveRecord::Migration[5.1]
+  def change
+    create_table :decidim_meetings_registrations do |t|
+      t.references :decidim_user, null: false, index: true
+      t.references :decidim_meeting, null: false, index: true
+
+      t.timestamps
+    end
+
+    add_index :decidim_meetings_registrations, [:decidim_user_id, :decidim_meeting_id], unique: true, name: "decidim_meetings_registrations_user_meeting_unique"
+  end
+end

data/decidim-meetings/decidim-meetings.gemspec

@@ -22,9 +22,11 @@ Gem::Specification.new do |s|
   s.add_dependency "kaminari", "~> 1.0.1"
   s.add_dependency "httparty", "~> 0.15.0"
   s.add_dependency "jquery-tmpl-rails", "~> 1.1.0"
+  s.add_dependency "icalendar", "~> 2.4.1"
 
   s.add_development_dependency "decidim-dev", Decidim.version
   s.add_development_dependency "decidim-admin", Decidim.version
+  s.add_development_dependency "decidim-participatory_processes", Decidim.version
   s.add_development_dependency "decidim-proposals", Decidim.version
   s.add_development_dependency "decidim-results", Decidim.version
 end

data/decidim-meetings/lib/decidim/meetings/admin_engine.rb

@@ -13,6 +13,11 @@ module Decidim
       routes do
         resources :meetings do
           resources :meeting_closes, only: [:edit, :update]
+          resource :registrations, only: [:edit, :update] do
+            collection do
+              get :export
+            end
+          end
           resources :attachments
         end
         root to: "meetings#index"
@@ -21,6 +26,10 @@ module Decidim
       def load_seed
         nil
       end
+
+      initializer "decidim_meetings.assets" do |app|
+        app.config.assets.precompile += %w(admin/decidim_meetings_manifest.js)
+      end
     end
   end
 end

data/decidim-meetings/lib/decidim/meetings/engine.rb

@@ -3,6 +3,7 @@
 require "searchlight"
 require "kaminari"
 require "jquery-tmpl-rails"
+require "icalendar"
 
 module Decidim
   module Meetings
@@ -14,10 +15,17 @@ module Decidim
 
       routes do
         resources :meetings, only: [:index, :show] do
+          resource :registration, only: [:create, :destroy]
           resource :meeting_widget, only: :show, path: "embed"
         end
         root to: "meetings#index"
       end
+
+      initializer "decidim_meetings.inject_abilities_to_user" do |_app|
+        Decidim.configure do |config|
+          config.abilities += ["Decidim::Meetings::Abilities::CurrentUserAbility"]
+        end
+      end
     end
   end
 end

data/decidim-meetings/lib/decidim/meetings/feature.rb

@@ -23,27 +23,31 @@ Decidim.register_feature(:meetings) do |feature|
     meetings.count
   end
 
+  feature.actions = %w(join)
+
   feature.settings(:global) do |settings|
     settings.attribute :announcement, type: :text, translated: true, editor: true
+    settings.attribute :comments_enabled, type: :boolean, default: true
   end
 
   feature.settings(:step) do |settings|
     settings.attribute :announcement, type: :text, translated: true, editor: true
+    settings.attribute :comments_blocked, type: :boolean, default: false
   end
 
-  feature.seeds do |process|
+  feature.seeds do |participatory_space|
     feature = Decidim::Feature.create!(
-      name: Decidim::Features::Namer.new(process.organization.available_locales, :meetings).i18n_name,
+      name: Decidim::Features::Namer.new(participatory_space.organization.available_locales, :meetings).i18n_name,
       published_at: Time.current,
       manifest_name: :meetings,
-      participatory_process: process
+      participatory_space: participatory_space
     )
 
-    if process.scope
-      scopes = process.scope.descendants
-      global = process.scope
+    if participatory_space.scope
+      scopes = participatory_space.scope.descendants
+      global = participatory_space.scope
     else
-      scopes = process.organization.scopes
+      scopes = participatory_space.organization.scopes
       global = nil
     end
 
@@ -51,7 +55,7 @@ Decidim.register_feature(:meetings) do |feature|
       meeting = Decidim::Meetings::Meeting.create!(
         feature: feature,
         scope: Faker::Boolean.boolean(0.5) ? global : scopes.sample,
-        category: process.categories.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)
@@ -62,8 +66,34 @@ Decidim.register_feature(:meetings) do |feature|
         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
+        longitude: Faker::Address.longitude,
+        registrations_enabled: [true, false].sample,
+        available_slots: (10..50).step(10).to_a.sample,
+        registration_terms: Decidim::Faker::Localized.wrapped("<p>", "</p>") do
+          Decidim::Faker::Localized.paragraph(3)
+        end
       )
+
+      10.times do |n|
+        email = "meeting-registered-user-#{meeting.id}-#{n}@example.org"
+        name = "#{Faker::Name.name} #{meeting.id} #{n}"
+        user = Decidim::User.find_or_initialize_by(email: email)
+
+        user.update!(
+          password: "password1234",
+          password_confirmation: "password1234",
+          name: name,
+          organization: feature.organization,
+          tos_agreement: "1",
+          confirmed_at: Time.current
+        )
+
+        Decidim::Meetings::Registration.create!(
+          meeting: meeting,
+          user: user
+        )
+      end
+
       Decidim::Attachment.create!(
         title: Decidim::Faker::Localized.sentence(2),
         description: Decidim::Faker::Localized.sentence(5),

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

@@ -20,5 +20,16 @@ FactoryGirl.define do
       attending_organizations { Array.new(3) { Faker::GameOfThrones.house }.join(", ") }
       closed_at { Time.current }
     end
+
+    trait :with_registrations_enabled do
+      registrations_enabled { true }
+      available_slots { 10 }
+      registration_terms { Decidim::Faker::Localized.sentence(3) }
+    end
+  end
+
+  factory :registration, class: Decidim::Meetings::Registration do
+    meeting
+    user
   end
 end

data/decidim-meetings/spec/commands/close_meeting_spec.rb

@@ -4,6 +4,7 @@ require "spec_helper"
 
 describe Decidim::Meetings::Admin::CloseMeeting do
   let(:meeting) { create :meeting }
+  let(:user) { create :user, :admin }
   let(:form) do
     double(
       invalid?: invalid,
@@ -12,11 +13,12 @@ describe Decidim::Meetings::Admin::CloseMeeting do
       contributions_count: 15,
       attending_organizations: "Some organization",
       closed_at: Time.current,
-      proposal_ids: proposal_ids
+      proposal_ids: proposal_ids,
+      current_user: user
     )
   end
   let(:proposal_feature) do
-    create(:feature, manifest_name: :proposals, participatory_process: meeting.feature.participatory_process)
+    create(:feature, manifest_name: :proposals, participatory_space: meeting.feature.participatory_space)
   end
   let(:invalid) { false }
   let(:proposals) do
@@ -76,5 +78,22 @@ describe Decidim::Meetings::Admin::CloseMeeting do
       expect(meeting.linked_resources(:proposals, "proposals_from_meeting").length).to eq(3)
       expect(meeting.linked_resources(:proposals, "proposals_from_meeting")).to match_array(proposals)
     end
+
+    context "events" do
+      let!(:follow) { create :follow, followable: meeting, user: user }
+
+      it "notifies the change" do
+        expect(Decidim::EventsManager)
+          .to receive(:publish)
+          .with(
+            event: "decidim.events.meetings.meeting_closed",
+            event_class: Decidim::Meetings::CloseMeetingEvent,
+            resource: meeting,
+            recipient_ids: [user.id]
+          )
+
+        subject.call
+      end
+    end
   end
 end

data/decidim-meetings/spec/commands/create_meeting_spec.rb

@@ -5,13 +5,14 @@ require "spec_helper"
 describe Decidim::Meetings::Admin::CreateMeeting do
   let(:organization) { create :organization, available_locales: [:en] }
   let(:participatory_process) { create :participatory_process, organization: organization }
-  let(:current_feature) { create :feature, participatory_process: participatory_process, manifest_name: "meetings" }
+  let(:current_feature) { create :feature, participatory_space: participatory_process, manifest_name: "meetings" }
   let(:scope) { create :scope, organization: organization }
-  let(:category) { create :category, participatory_process: participatory_process }
+  let(:category) { create :category, participatory_space: participatory_process }
   let(:address) { "address" }
   let(:invalid) { false }
   let(:latitude) { 40.1234 }
   let(:longitude) { 2.1234 }
+  let(:start_time) { 1.day.from_now }
   let(:form) do
     double(
       invalid?: invalid,
@@ -19,7 +20,7 @@ describe Decidim::Meetings::Admin::CreateMeeting do
       description: { en: "description" },
       location: { en: "location" },
       location_hints: { en: "location_hints" },
-      start_time: 1.day.from_now,
+      start_time: start_time,
       end_time: 1.day.from_now + 1.hour,
       address: address,
       latitude: latitude,
@@ -68,5 +69,19 @@ describe Decidim::Meetings::Admin::CreateMeeting do
       expect(last_meeting.latitude).to eq(latitude)
       expect(last_meeting.longitude).to eq(longitude)
     end
+
+    it "schedules a upcoming meeting notification job 48h before start time" do
+      expect_any_instance_of(Decidim::Meetings::Meeting)
+        .to receive(:id).at_least(:once).and_return 1
+
+      expect(Decidim::Meetings::UpcomingMeetingNotificationJob)
+        .to receive(:generate_checksum).and_return "1234"
+
+      expect(Decidim::Meetings::UpcomingMeetingNotificationJob)
+        .to receive_message_chain(:set, :perform_later)
+        .with(set: start_time - 2.days).with(1, "1234")
+
+      subject.call
+    end
   end
 end

data/decidim-meetings/spec/commands/join_meeting_spec.rb

@@ -0,0 +1,152 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+describe Decidim::Meetings::JoinMeeting do
+  let(:registrations_enabled) { true }
+  let(:available_slots) { 10 }
+  let(:organization) { create :organization }
+  let(:participatory_process) { create :participatory_process, organization: organization }
+  let(:process_admin) { create :user, :process_admin, participatory_process: participatory_process }
+  let(:feature) { create :feature, manifest_name: :meetings, participatory_space: participatory_process }
+  let(:meeting) { create :meeting, feature: feature, registrations_enabled: registrations_enabled, available_slots: available_slots }
+  let(:user) { create :user, :confirmed, organization: organization }
+  subject { described_class.new(meeting, user) }
+
+  context "when everything is ok" do
+    it "broadcasts ok" do
+      expect { subject.call }.to broadcast(:ok)
+    end
+
+    it "creates a registration for the meeting and the user" do
+      expect { subject.call }.to change { Decidim::Meetings::Registration.count }.by(1)
+      last_registration = Decidim::Meetings::Registration.last
+      expect(last_registration.user).to eq(user)
+      expect(last_registration.meeting).to eq(meeting)
+    end
+
+    it "sends an email confirming the registration" do
+      perform_enqueued_jobs { subject.call }
+
+      email = last_email
+      expect(email.subject).to include("confirmed")
+      attachment = email.attachments.first
+
+      expect(attachment.read.length).to be_positive
+      expect(attachment.mime_type).to eq("text/calendar")
+      expect(attachment.filename).to match(/meeting-calendar-info.ics/)
+    end
+
+    context "when the meeting available slots are occupied over the 50%" do
+      before do
+        create_list :registration, (available_slots * 0.5).round - 1, meeting: meeting
+      end
+
+      it "notifies it to the process admins" do
+        expect(Decidim::EventsManager)
+          .to receive(:publish)
+          .with(
+            event: "decidim.events.meetings.meeting_registrations_over_percentage",
+            event_class: Decidim::Meetings::MeetingRegistrationsOverPercentageEvent,
+            resource: meeting,
+            recipient_ids: [process_admin.id],
+            extra: {
+              percentage: 0.5
+            }
+          )
+
+        subject.call
+      end
+
+      context "when the 50% is already met" do
+        before do
+          create :registration, meeting: meeting
+        end
+
+        it "doesn't notify it twice" do
+          expect(Decidim::EventsManager)
+            .not_to receive(:publish)
+
+          subject.call
+        end
+      end
+    end
+
+    context "when the meeting available slots are occupied over the 80%" do
+      before do
+        create_list :registration, (available_slots * 0.8).round - 1, meeting: meeting
+      end
+
+      it "notifies it to the process admins" do
+        expect(Decidim::EventsManager)
+          .to receive(:publish)
+          .with(
+            event: "decidim.events.meetings.meeting_registrations_over_percentage",
+            event_class: Decidim::Meetings::MeetingRegistrationsOverPercentageEvent,
+            resource: meeting,
+            recipient_ids: [process_admin.id],
+            extra: {
+              percentage: 0.8
+            }
+          )
+
+        subject.call
+      end
+
+      context "when the 80% is already met" do
+        before do
+          create_list :registration, (available_slots * 0.8).round, meeting: meeting
+        end
+
+        it "doesn't notify it twice" do
+          expect(Decidim::EventsManager)
+            .not_to receive(:publish)
+
+          subject.call
+        end
+      end
+    end
+
+    context "when the meeting available slots are occupied over the 100%" do
+      before do
+        create_list :registration, available_slots - 1, meeting: meeting
+      end
+
+      it "notifies it to the process admins" do
+        expect(Decidim::EventsManager)
+          .to receive(:publish)
+          .with(
+            event: "decidim.events.meetings.meeting_registrations_over_percentage",
+            event_class: Decidim::Meetings::MeetingRegistrationsOverPercentageEvent,
+            resource: meeting,
+            recipient_ids: [process_admin.id],
+            extra: {
+              percentage: 1
+            }
+          )
+
+        subject.call
+      end
+    end
+  end
+
+  context "when the meeting has not registrations enabled" do
+    let(:registrations_enabled) { false }
+
+    it "broadcasts invalid" do
+      expect { subject.call }.to broadcast(:invalid)
+    end
+  end
+
+  context "when the meeting has not enough available slots" do
+    let(:available_slots) { 1 }
+
+    before do
+      create(:registration, meeting: meeting)
+    end
+
+    it "broadcasts invalid" do
+      expect { subject.call }.to broadcast(:invalid)
+    end
+  end
+end

data/decidim-meetings/spec/commands/leave_meeting_spec.rb

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+describe Decidim::Meetings::LeaveMeeting do
+  let(:registrations_enabled) { true }
+  let(:available_slots) { 10 }
+  let(:meeting) { create :meeting, registrations_enabled: registrations_enabled, available_slots: available_slots }
+  let(:user) { create :user, :confirmed, organization: meeting.organization }
+  let(:user_leaving_meeting) { user }
+  subject { described_class.new(meeting, user_leaving_meeting) }
+
+  before do
+    create(:registration, meeting: meeting, user: user)
+  end
+
+  context "when everything is ok" do
+    it "broadcasts ok" do
+      expect { subject.call }.to broadcast(:ok)
+    end
+
+    it "destroys the registration for the meeting and the user" do
+      expect { subject.call }.to change { Decidim::Meetings::Registration.count }.by(-1)
+    end
+  end
+
+  context "when the user has not joined the meeting" do
+    let(:user_leaving_meeting) { create :user, :confirmed, organization: meeting.organization }
+
+    it "broadcasts invalid" do
+      expect { subject.call }.to broadcast(:invalid)
+    end
+  end
+end