Add option to manually select sending email to participant (#1572)

Author: njaeggi

app/controllers/sac_cas/event/participations_controller.rb

@@ -27,6 +27,7 @@ def cancel
     entry.cancel_statement = params.dig(:event_participation, :cancel_statement)
     entry.canceled_at = params.dig(:event_participation, :canceled_at) || Time.zone.today
     entry.canceled_at = Time.zone.today if participant_cancels?
+    send_application_canceled_email if params[:send_email].to_i.positive?
     change_state("canceled", "cancel")
   end
 
@@ -45,6 +46,10 @@ def enqueue_confirmation_job
     Event::ParticipationConfirmationJob.new(entry).enqueue!
   end
 
+  def send_application_canceled_email
+    Event::ParticipationCanceledMailer.confirmation(entry).deliver_later
+  end
+
   def permitted_attrs
     permitted = self.class.permitted_attrs.dup
     permitted << :actual_days if can?(:edit_actual_days, entry)

app/helpers/sac_cas/application_market_helper.rb

@@ -34,8 +34,6 @@ module SacCas::Event::Participation
     validates :adult_consent, :terms_and_conditions, acceptance: {if: :check_root_conditions}
     validates :actual_days, numericality: {greater_than_or_equal_to: 0, allow_blank: true}
     validate :assert_actual_days_size
-
-    after_update :send_application_canceled_email, if: :state_changed_to_canceled?
   end
 
   def subsidizable?
@@ -77,8 +75,4 @@ def state_changed_to_canceled?
   def clear_price_without_category
     self.price = nil if price_category.blank?
   end
-
-  def send_application_canceled_email
-    Event::ParticipationCanceledMailer.confirmation(self).deliver_later
-  end
 end

app/models/sac_cas/event/participation.rb

@@ -4,3 +4,11 @@
 - #  https://github.com/hitobito/hitobito_sac_cas.
 
 = f.labeled_input_field(:cancel_statement, label_class: 'col-md-3 col-xl-3 pb-1 required', required: true)
+
+- if entry.id != current_user.id
+	.row.mb-2
+		= label_tag("send_email", class: "col-md-3 col-xl-3 pb-1 col-form-label text-md-end") do
+			= t(".send_email")
+		.labeled.col-md-9.col-lg-8.col-xl-8.mw-63ch
+			.form-check.ps-0
+				= check_box_tag("send_email", 1, class: "form-check-input")

app/views/event/participations/_popover_cancel_sac_cas.html.haml

@@ -1172,6 +1172,8 @@ de:
         contact_text: |
           Du erreichst uns zu unseren Geschäftszeiten
           Mo bis Fr 09:00 - 12:00 & 14:00 - 17:00 Uhr.
+      popover_cancel_sac_cas:
+        send_email: E-Mail an Teilnehmer/in senden
       states:
         absent: Keine Teilnahme an diesem Kurs.
         annulled: Dieser Kurs wurde abgesagt.

config/locales/wagon.de.yml

@@ -138,7 +138,6 @@ class Wagon < Rails::Engine
       Person::NameResource.course_leader_roles = [Event::Course::Role::Leader]
 
       ## Helpers
-      ApplicationMarketHelper.prepend SacCas::ApplicationMarketHelper
       Changelogs::FooterLinkBuilder.prepend SacCas::Changelogs::FooterLinkBuilder
       EventKindsHelper.prepend SacCas::EventKindsHelper
       EventsHelper.prepend SacCas::EventsHelper

lib/hitobito_sac_cas/wagon.rb

@@ -481,6 +481,16 @@
       expect(invoice.state).to eq("draft")
       expect(invoice.year).to eq(event.dates.first.start_at.year)
     end
+
+    it "PUT#cancel sends application canceled email when send_email is true" do
+      expect { put :cancel, params: params.merge({event_participation: {canceled_at: 1.day.ago}, send_email: 1}) }
+        .to have_enqueued_mail(Event::ParticipationCanceledMailer, :confirmation).once
+    end
+
+    it "PUT#cancel does not send application canceled email when send_email is false" do
+      expect { put :cancel, params: params.merge({event_participation: {canceled_at: 1.day.ago}, send_email: 0}) }
+        .not_to have_enqueued_mail(Event::ParticipationCanceledMailer, :confirmation)
+    end
   end
 
   describe "PUT#update" do

spec/controllers/event/participations_controller_spec.rb

@@ -8,6 +8,8 @@
 require "spec_helper"
 
 describe Event::Participation, :js do
+  include ActiveJob::TestHelper
+
   let(:admin) { people(:admin) }
   let(:participant) { people(:mitglied) }
   let(:event) { Fabricate(:sac_open_course) }
@@ -20,6 +22,16 @@
       visit group_event_participation_path(group_id: event.group_ids.first, event_id: event.id, id: participation.id)
       expect(page).not_to have_button("Rechnung erstellen")
     end
+
+    it "does not display checkbox option to not send email" do
+      event.update_columns(applications_cancelable: true, state: "application_open")
+      event.dates.first.update_column(:start_at, 10.days.from_now)
+      visit group_event_participation_path(group_id: event.group_ids.first, event_id: event.id, id: participation.id)
+      within(".btn-toolbar") do
+        click_on "Abmelden"
+      end
+      expect(page).not_to have_text "E-Mail an Teilnehmer/in senden"
+    end
   end
 
   context "as admin" do
@@ -37,16 +49,35 @@
       expect(page).not_to have_css(".alert")
     end
 
-    it "can cancel participation and supply a reason in popover" do
-      visit group_event_participation_path(group_id: event.group_ids.first, event_id: event.id, id: participation.id)
-      within(".btn-toolbar") do
-        click_on "Abmelden"
+    context "cancel" do
+      before do
+        visit group_event_participation_path(group_id: event.group_ids.first, event_id: event.id, id: participation.id)
+        within(".btn-toolbar") do
+          click_on "Abmelden"
+        end
+        within(".popover") do
+          fill_in "Begründung", with: "Some Reason"
+        end
       end
-      within(".popover") do
-        fill_in "Begründung", with: "Some Reason"
-        click_on "Abmelden"
+
+      it "can cancel participation and supply a reason in popover" do
+        expect do
+          within(".popover") do
+            click_on "Abmelden"
+          end
+          expect(page).to have_content "Edmund Hillary wurde abgemeldet."
+        end.to have_enqueued_mail(Event::ParticipationCanceledMailer, :confirmation).once
+      end
+
+      it "can cancel participation without sending email" do
+        expect do
+          within(".popover") do
+            uncheck "E-Mail an Teilnehmer/in senden"
+            click_on "Abmelden"
+          end
+          expect(page).to have_content "Edmund Hillary wurde abgemeldet."
+        end.not_to have_enqueued_mail(Event::ParticipationCanceledMailer, :confirmation)
       end
-      expect(page).to have_content "Edmund Hillary wurde abgemeldet."
     end
   end
 end

spec/features/event/participation_spec.rb

@@ -114,14 +114,4 @@
       end
     end
   end
-
-  describe "canceled" do
-    let(:event) { Fabricate(:sac_open_course) }
-    let(:participation) { event.participations.create!(person: people(:mitglied)) }
-
-    it "sends a confirmation email" do
-      expect { participation.update(state: :canceled, canceled_at: Time.zone.today) }
-        .to have_enqueued_mail(Event::ParticipationCanceledMailer, :confirmation).once
-    end
-  end
 end