decidim-meetings 0.13.1 → 0.14.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 335c7c37ff53d307c70692c3818be204327a00fa07eddd813a5c8c6595c6afb2
-  data.tar.gz: 52848d0551a08d2b240c11bcbaaa519f9f46ec53f39eb63707c2e4445d8838fd
+  metadata.gz: 143339c8a41808d05f02ab73f1fdca0af63fc60ea551919cc9517a32f751bbaf
+  data.tar.gz: ff671495cc3183f10369a19ecf2f7a61579763ec38ba8c805be4ff4ce05f2cae
 SHA512:
-  metadata.gz: 32caac25b60f8a284a41b80eb47b29b5e691871a73c13afc08862390a48de2589de5ff9881641d21d7d1d57dc333161bb7ea71f015a7eed63ad9969a3188c6b4
-  data.tar.gz: a9b1a3e956e83d7d9e3c9a789e2dfd26239a835bb14371e3bb174c51051366b95f53a4d941bc8d684ac894af840118b914412992fafe723d8f0646fff441ac1f
+  metadata.gz: '028d85237ce58717b6f5323da6fb8c12aab1fa52e67564b34962f314b7cc3dc2a6fe0a91f5799ae9f847e27fedb0ff0de7e7caf3a1ccbfbfcceb0065e18e5652'
+  data.tar.gz: 509abcb9e65fa3e5eedb5808e3dca0a87f8a9d51607a157511fb258460dd1ea3b8d227b72db6a04ff7a2ed95d47fd78742d6de83a4f6471812ee8c9a87bd97cd

data/app/assets/config/admin/decidim_meetings_manifest.js

@@ -1,4 +1,5 @@
 //= link decidim/meetings/admin/meetings_form.js
 //= link decidim/meetings/admin/registrations_form.js
+//= link decidim/meetings/admin/registrations_invite_form.js
 //= link decidim/meetings/admin/meetings_form.js
 //= link decidim/meetings/admin/agendas.js

data/app/assets/javascripts/decidim/meetings/admin/registrations_invite_form.es6

@@ -0,0 +1,25 @@
+((exports) => {
+  const { createFieldDependentInputs } = exports.DecidimAdmin;
+
+  const $attendeeType = $('[name="meeting_registration_invite[existing_user]"');
+
+  createFieldDependentInputs({
+    controllerField: $attendeeType,
+    wrapperSelector: ".attendee-fields",
+    dependentFieldsSelector: ".attendee-fields--new-user",
+    dependentInputSelector: "input",
+    enablingCondition: () => {
+      return $("#meeting_registration_invite_existing_user_false").is(":checked")
+    }
+  });
+
+  createFieldDependentInputs({
+    controllerField: $attendeeType,
+    wrapperSelector: ".attendee-fields",
+    dependentFieldsSelector: ".attendee-fields--user-picker",
+    dependentInputSelector: "input",
+    enablingCondition: () => {
+      return $("#meeting_registration_invite_existing_user_true").is(":checked")
+    }
+  });
+})(window);

data/app/cells/decidim/meetings/join_meeting_button/show.erb

@@ -3,6 +3,7 @@
     <%= action_authorized_button_to(
       :join,
       meeting_registration_path(model),
+      resource: model,
       method: :delete,
       class: "#{button_classes} secondary light",
       data: { disable: true }
@@ -16,6 +17,7 @@
       :join,
       i18n_join_text,
       "",
+      resource: model,
       class: button_classes,
       disabled: !model.has_available_slots?,
       data: { open: current_user.present? ? "meeting-registration-confirm-#{model.id}" : "loginModal" }

data/app/cells/decidim/meetings/meeting_cell.rb

@@ -10,7 +10,7 @@ module Decidim
       include Cell::ViewModel::Partial
 
       def show
-        cell card_size, model
+        cell card_size, model, options
       end
 
       private

data/app/commands/decidim/meetings/admin/invite_user_to_join_meeting.rb

@@ -24,7 +24,7 @@ module Decidim
         #
         # Returns nothing.
         def call
-          return broadcast(:invalid) if form.invalid?
+          return broadcast(:invalid) if form.invalid? || already_invited?
 
           invite_user
 
@@ -35,22 +35,71 @@ module Decidim
 
         attr_reader :form, :invited_by, :meeting
 
+        def already_invited?
+          return false unless user.persisted?
+          return false unless meeting.invites.where(user: user).exists?
+
+          form.errors.add(:email, :already_invited)
+          true
+        end
+
+        def create_invitation!
+          log_info = {
+            resource: {
+              title: meeting.title
+            },
+            participatory_space: {
+              title: meeting.participatory_space.title
+            }
+          }
+
+          @invite = Decidim.traceability.create!(
+            Invite,
+            invited_by,
+            {
+              user: user,
+              meeting: meeting,
+              sent_at: Time.current
+            },
+            log_info
+          )
+        end
+
         def invite_user
           if user.persisted?
-            InviteJoinMeetingMailer.invite(user, meeting, invited_by).deliver_later
+            create_invitation!
+
+            # The user has already been invited to sign up to another
+            # meeting or resource and has not yet accepted the invitation
+            if user.invited_to_sign_up?
+              invite_user_to_sign_up
+            else
+              InviteJoinMeetingMailer.invite(user, meeting, invited_by).deliver_later
+            end
           else
             user.name = form.name
             user.nickname = User.nicknamize(user.name, organization: user.organization)
-            user.skip_reconfirmation!
-            user.invite!(invited_by, invitation_instructions: "join_meeting", meeting: meeting)
+            invite_user_to_sign_up
+            create_invitation!
           end
         end
 
         def user
-          @user ||= Decidim::User.find_or_initialize_by(
-            organization: form.current_organization,
-            email: form.email.downcase
-          )
+          @user ||= begin
+            if form.existing_user
+              form.user
+            else
+              Decidim::User.find_or_initialize_by(
+                organization: form.current_organization,
+                email: form.email.downcase
+              )
+            end
+          end
+        end
+
+        def invite_user_to_sign_up
+          user.skip_reconfirmation!
+          user.invite!(invited_by, invitation_instructions: "join_meeting", meeting: meeting)
         end
       end
     end

data/app/commands/decidim/meetings/admin/validate_registration_code.rb

@@ -0,0 +1,51 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Meetings
+    module Admin
+      # This command is executed when the admin validates a registration code in the admin panel.
+      class ValidateRegistrationCode < Rectify::Command
+        # Initializes a ValidateRegistrationCode Command.
+        #
+        # form - The form from which to get the data.
+        # meeting - The current instance of the meeting to be updated.
+        def initialize(form, meeting)
+          @form = form
+          @meeting = meeting
+        end
+
+        # Validates the registration code the meeting if valid.
+        #
+        # Broadcasts :ok if successful, :invalid otherwise.
+        def call
+          return broadcast(:invalid) if form.invalid?
+
+          validate_registration_code
+          send_notification
+
+          broadcast(:ok)
+        end
+
+        private
+
+        attr_reader :form, :meeting
+
+        def validate_registration_code
+          form.registration.update!(validated_at: Time.current)
+        end
+
+        def send_notification
+          Decidim::EventsManager.publish(
+            event: "decidim.events.meetings.registration_code_validated",
+            event_class: Decidim::Meetings::RegistrationCodeValidatedEvent,
+            resource: meeting,
+            recipient_ids: [form.registration.user.id],
+            extra: {
+              registration: form.registration
+            }
+          )
+        end
+      end
+    end
+  end
+end

data/app/commands/decidim/meetings/decline_invitation.rb

@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Meetings
+    # This command is executed when the user declines an invite to the meeting.
+    class DeclineInvitation < Rectify::Command
+      # Initializes a DeclineInvitation Command.
+      #
+      # meeting - The current instance of the meeting where user has been invited.
+      # user - The user that declines their invitation
+      def initialize(meeting, user)
+        @meeting = meeting
+        @user = user
+      end
+
+      # Creates a meeting registration if the meeting has registrations enabled
+      # and there are available slots.
+      #
+      # Broadcasts :ok if successful, :invalid otherwise.
+      def call
+        return broadcast(:invalid) unless can_decline_invitation?
+
+        decline_invitation
+
+        broadcast(:ok)
+      end
+
+      private
+
+      attr_reader :meeting, :user
+
+      def decline_invitation
+        invitation.decline!
+      end
+
+      def can_decline_invitation?
+        meeting.registrations_enabled? && invitation.present?
+      end
+
+      def invitation
+        @invitation ||= meeting.invites.find_by(user: user)
+      end
+    end
+  end
+end

data/app/commands/decidim/meetings/join_meeting.rb

@@ -21,6 +21,7 @@ module Decidim
         meeting.with_lock do
           return broadcast(:invalid) unless can_join_meeting?
           create_registration
+          accept_invitation
           send_email_confirmation
           send_notification
         end
@@ -29,10 +30,14 @@ module Decidim
 
       private
 
-      attr_reader :meeting, :user
+      attr_reader :meeting, :user, :registration
+
+      def accept_invitation
+        meeting.invites.find_by(user: user)&.accept!
+      end
 
       def create_registration
-        Decidim::Meetings::Registration.create!(meeting: meeting, user: user)
+        @registration = Decidim::Meetings::Registration.create!(meeting: meeting, user: user)
       end
 
       def can_join_meeting?
@@ -40,7 +45,7 @@ module Decidim
       end
 
       def send_email_confirmation
-        Decidim::Meetings::RegistrationMailer.confirmation(user, meeting).deliver_later
+        Decidim::Meetings::RegistrationMailer.confirmation(user, meeting, registration).deliver_later
       end
 
       def participatory_space_admins

data/app/controllers/decidim/meetings/admin/attachment_collections_controller.rb

@@ -19,10 +19,6 @@ module Decidim
         def meeting
           @meeting ||= meetings.find(params[:meeting_id])
         end
-
-        def authorization_object
-          meeting.component
-        end
       end
     end
   end

data/app/controllers/decidim/meetings/admin/attachments_controller.rb

@@ -20,10 +20,6 @@ module Decidim
         def meeting
           @meeting ||= meetings.find(params[:meeting_id])
         end
-
-        def authorization_object
-          meeting.component
-        end
       end
     end
   end

data/app/controllers/decidim/meetings/admin/invites_controller.rb

@@ -8,26 +8,31 @@ module Decidim
       # Controller that allows inviting users to join a meeting.
       #
       class InvitesController < Admin::ApplicationController
-        def new
-          enforce_permission_to :invite_user, :meeting, meeting: meeting
+        helper_method :invites
+
+        def index
+          enforce_permission_to :read_invites, :meeting, meeting: meeting
+
+          @query = params[:q]
+          @status = params[:status]
 
           @form = form(MeetingRegistrationInviteForm).instance
         end
 
         def create
-          enforce_permission_to :invite_user, :meeting, meeting: meeting
+          enforce_permission_to :invite_attendee, :meeting, meeting: meeting
 
           @form = form(MeetingRegistrationInviteForm).from_params(params)
 
           InviteUserToJoinMeeting.call(@form, meeting, current_user) do
             on(:ok) do
               flash[:notice] = I18n.t("invites.create.success", scope: "decidim.meetings.admin")
-              redirect_to edit_meeting_registrations_path(meeting)
+              redirect_to meeting_registrations_invites_path(meeting)
             end
 
             on(:invalid) do
               flash.now[:alert] = I18n.t("invites.create.error", scope: "decidim.meetings.admin")
-              render :new
+              render :index
             end
           end
         end
@@ -37,6 +42,10 @@ module Decidim
         def meeting
           @meeting ||= Meeting.where(component: current_component).find(params[:meeting_id])
         end
+
+        def invites
+          @invites ||= Decidim::Meetings::Admin::Invites.for(meeting.invites, @query, @status).page(params[:page]).per(15)
+        end
       end
     end
   end

data/app/controllers/decidim/meetings/admin/registrations_controller.rb

@@ -9,6 +9,7 @@ module Decidim
           enforce_permission_to :update, :meeting, meeting: meeting
 
           @form = MeetingRegistrationsForm.from_model(meeting)
+          @validation_form = ValidateRegistrationCodeForm.new
         end
 
         def update
@@ -39,6 +40,25 @@ module Decidim
           end
         end
 
+        def validate_registration_code
+          enforce_permission_to :update, :meeting, meeting: meeting
+
+          @form = MeetingRegistrationsForm.from_model(meeting)
+          @validation_form = ValidateRegistrationCodeForm.from_params(params).with_context(current_organization: meeting.organization, meeting: meeting)
+
+          ValidateRegistrationCode.call(@validation_form, meeting) do
+            on(:ok) do
+              flash[:notice] = I18n.t("registrations.validate_registration_code.success", scope: "decidim.meetings.admin")
+              render action: "edit"
+            end
+
+            on(:invalid) do
+              flash.now[:alert] = I18n.t("registrations.validate_registration_code.invalid", scope: "decidim.meetings.admin")
+              render action: "edit"
+            end
+          end
+        end
+
         private
 
         def meeting

data/app/controllers/decidim/meetings/registrations_controller.rb

@@ -36,6 +36,22 @@ module Decidim
         end
       end
 
+      def decline_invitation
+        enforce_permission_to :decline_invitation, :meeting, meeting: meeting
+
+        DeclineInvitation.call(meeting, current_user) do
+          on(:ok) do
+            flash[:notice] = I18n.t("registrations.decline_invitation.success", scope: "decidim.meetings")
+            redirect_after_path
+          end
+
+          on(:invalid) do
+            flash.now[:alert] = I18n.t("registrations.decline_invitation.invalid", scope: "decidim.meetings")
+            redirect_after_path
+          end
+        end
+      end
+
       private
 
       def meeting

data/app/events/decidim/meetings/registration_code_validated_event.rb

@@ -0,0 +1,15 @@
+# frozen-string_literal: true
+
+module Decidim
+  module Meetings
+    class RegistrationCodeValidatedEvent < Decidim::Events::SimpleEvent
+      i18n_attributes :registration_code
+
+      private
+
+      def registration_code
+        extra["registration"]["code"]
+      end
+    end
+  end
+end

data/app/forms/decidim/meetings/admin/close_meeting_form.rb

@@ -13,7 +13,7 @@ module Decidim
         attribute :attending_organizations, String
         attribute :proposal_ids, Array[Integer]
         attribute :proposals
-        attribute :closed_at, DateTime, default: ->(_form, _attribute) { Time.current }
+        attribute :closed_at, Decidim::Attributes::TimeWithZone, default: ->(_form, _attribute) { Time.current }
 
         validates :closing_report, translatable_presence: true
         validates :attendees_count, presence: true, numericality: { greater_than_or_equal_to: 0 }