From e1968ac3854dacffa27a8843aba6eb2ff6764839 Mon Sep 17 00:00:00 2001
From: Chris <76159444+hunchr@users.noreply.github.com>
Date: Thu, 26 Sep 2024 08:35:07 +0200
Subject: [PATCH 1/3] Add mailer
# Conflicts:
# db/seeds/custom_contents.rb
---
.../event/participation_canceled_mailer.rb | 23 +++++++++++++++++++
app/models/sac_cas/event/participation.rb | 12 ++++++++--
db/seeds/custom_contents.rb | 13 +++++++++++
3 files changed, 46 insertions(+), 2 deletions(-)
create mode 100644 app/mailers/event/participation_canceled_mailer.rb
diff --git a/app/mailers/event/participation_canceled_mailer.rb b/app/mailers/event/participation_canceled_mailer.rb
new file mode 100644
index 000000000..2eb5cf7a1
--- /dev/null
+++ b/app/mailers/event/participation_canceled_mailer.rb
@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+# Copyright (c) 2024, Schweizer Alpen-Club. This file is part of
+# hitobito_sac_cas and licensed under the Affero General Public License version 3
+# or later. See the COPYING file at the top-level directory or at
+# https://github.com/hitobito/hitobito_sac_cas.
+
+class Event::ParticipationCanceledMailer < ApplicationMailer
+ include EventMailer
+ include MultilingualMailer
+
+ CONFIRMATION = "event_participation_canceled"
+
+ def confirmation(participation)
+ @participation = participation
+ @course = participation.event
+ @person = participation.person
+ headers[:bcc] = @course.groups.first.course_admin_email
+ locales = @course.language.split("_")
+
+ compose_multilingual(@person, CONFIRMATION, locales)
+ end
+end
diff --git a/app/models/sac_cas/event/participation.rb b/app/models/sac_cas/event/participation.rb
index e1ae6512f..15df5be8d 100644
--- a/app/models/sac_cas/event/participation.rb
+++ b/app/models/sac_cas/event/participation.rb
@@ -16,10 +16,10 @@ module SacCas::Event::Participation
attr_accessor :adult_consent, :terms_and_conditions, :newsletter, :check_root_conditions
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 subsidy_amount
@@ -59,4 +59,12 @@ def update_previous_state
self.previous_state = state_was
end
end
+
+ def state_changed_to_canceled?
+ saved_change_to_attribute(:state)&.second == "canceled"
+ end
+
+ def send_application_canceled_email
+ Event::ParticipationCanceledMailer.confirmation(self).deliver_later
+ end
end
diff --git a/db/seeds/custom_contents.rb b/db/seeds/custom_contents.rb
index 52a715e9b..4f87637d5 100644
--- a/db/seeds/custom_contents.rb
+++ b/db/seeds/custom_contents.rb
@@ -21,6 +21,9 @@
{key: Event::ApplicationConfirmationMailer::ASSIGNED,
placeholders_required: "event-name",
placeholders_optional: "recipient-name, event-details, event-number, event-link, application-url, application-closing-at, person-url, missing-information"},
+ {key: Event::ParticipationCanceledMailer::CONFIRMATION,
+ placeholders_required: "event-name",
+ placeholders_optional: "recipient-name, event-details, event-number, event-link, application-url, person-url"},
{key: Event::LeaderReminderMailer::REMINDER_NEXT_WEEK,
placeholders_required: "event-name",
placeholders_optional: "recipient-name, event-details, event-number, event-link"},
@@ -123,6 +126,16 @@
"Person: {person-url}
" \
"Event-Link: {event-link}
" \
"Kursdetails:
{event-details}
{missing-information}"},
+ {custom_content_id: CustomContent.get(Event::ParticipationCanceledMailer::CONFIRMATION).id,
+ locale: "de",
+ label: "Kurs: E-Mail Abmeldung",
+ subject: "Kursabmeldung bestätigt",
+ body: "Hallo {recipient-name},
" \
+ "Deine Abmeldung für den Kurs {event-name} (Nummer: {event-number}) wurde bestätigt. " \
+ "Anmeldung: {application-url}
" \
+ "Person: {person-url}
" \
+ "Event-Link: {event-link}
" \
+ "Kursdetails:
{event-details}
{missing-information}"},
{custom_content_id: CustomContent.get(Event::LeaderReminderMailer::REMINDER_NEXT_WEEK).id,
locale: "de",
label: "Kurs: E-Mail Kursvorbereitungen abschliessen",
From a531128e49efd97d5068dcf18bb795e166ef1a65 Mon Sep 17 00:00:00 2001
From: Chris <76159444+hunchr@users.noreply.github.com>
Date: Thu, 26 Sep 2024 08:35:23 +0200
Subject: [PATCH 2/3] Add specs
---
.../participation_canceled_mailer_spec.rb | 25 +++++++++++++++++++
spec/models/event/participation_spec.rb | 12 +++++++++
2 files changed, 37 insertions(+)
create mode 100644 spec/mailers/event/participation_canceled_mailer_spec.rb
diff --git a/spec/mailers/event/participation_canceled_mailer_spec.rb b/spec/mailers/event/participation_canceled_mailer_spec.rb
new file mode 100644
index 000000000..43d721ccb
--- /dev/null
+++ b/spec/mailers/event/participation_canceled_mailer_spec.rb
@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+# Copyright (c) 2024, Schweizer Alpen-Club. This file is part of
+# hitobito_sac_cas and licensed under the Affero General Public License version 3
+# or later. See the COPYING file at the top-level directory or at
+# https://github.com/hitobito/hitobito_sac_cas.
+
+require "spec_helper"
+
+describe Event::ParticipationCanceledMailer do
+ let(:event) { Fabricate(:sac_open_course) }
+ let(:participation) { event.participations.create!(person: people(:mitglied)) }
+ let(:mail) { described_class.confirmation(participation) }
+
+ before { event.groups.first.update!(course_admin_email: "admin@example.com") }
+
+ it "sends to email addresses of participant" do
+ expect(mail.to).to match_array(["e.hillary@hitobito.example.com"])
+ expect(mail.bcc).to match_array(["admin@example.com"])
+ expect(mail.body.to_s).to include(
+ "Hallo Edmund,",
+ "Deine Abmeldung für den Kurs Eventus (Nummer: #{event.number}) wurde bestätigt."
+ )
+ end
+end
diff --git a/spec/models/event/participation_spec.rb b/spec/models/event/participation_spec.rb
index c2e43e4e9..a499bf6b0 100644
--- a/spec/models/event/participation_spec.rb
+++ b/spec/models/event/participation_spec.rb
@@ -8,6 +8,8 @@
require "spec_helper"
describe Event::Participation do
+ include ActiveJob::TestHelper
+
describe "::callbacks" do
subject(:participation) { Fabricate(:event_participation, event: events(:top_course)) }
@@ -120,4 +122,14 @@ def build_role(key, role)
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
From aa9458ff3221256e2bba469e645f2c1f55f8f7e1 Mon Sep 17 00:00:00 2001
From: Andi Idogawa
Date: Thu, 26 Sep 2024 11:33:15 +0200
Subject: [PATCH 3/3] change event seeder so its faster to test events
---
db/seeds/development/events.rb | 5 ++++-
db/seeds/development/support/sac_event_seeder.rb | 8 ++++++++
2 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/db/seeds/development/events.rb b/db/seeds/development/events.rb
index 4df1b5324..6658b0941 100644
--- a/db/seeds/development/events.rb
+++ b/db/seeds/development/events.rb
@@ -11,6 +11,9 @@
seeder = SacEventSeeder.new
-10.times do
+8.times do
seeder.seed_sac_course(Group.root.id)
end
+2.times do
+ seeder.seed_sac_course_which_is_application_closed(Group.root.id)
+end
diff --git a/db/seeds/development/support/sac_event_seeder.rb b/db/seeds/development/support/sac_event_seeder.rb
index 444c5fa93..cbe3b9970 100644
--- a/db/seeds/development/support/sac_event_seeder.rb
+++ b/db/seeds/development/support/sac_event_seeder.rb
@@ -17,6 +17,14 @@ def seed_sac_course(group_id)
event.season = Event::Kind::SEASONS.sample
event.start_point_of_time = :day
event.contact_id = fetch_contact_person.id
+
+ event.save!
+ event
+ end
+
+ def seed_sac_course_which_is_application_closed(group_id)
+ event = seed_sac_course(group_id)
+ event.update_column(:state, "assignment_closed")
event.save!
end