Skip to content

Commit 3049e13

Browse files
authored
Merge pull request #5017 from nhsuk/revert-4965-disable-clinic-communications-for-lpt
Revert "Disable clinic-related communications for LPT"
2 parents 852b245 + 7ef5da0 commit 3049e13

File tree

4 files changed

+4
-37
lines changed

4 files changed

+4
-37
lines changed

app/models/session_notification.rb

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -120,15 +120,11 @@ def self.create_and_send!(
120120

121121
template_name = compute_template_name(type, session.organisation)
122122

123-
if GOVUK_NOTIFY_EMAIL_TEMPLATES.fetch(template_name).present?
124-
EmailDeliveryJob.perform_later(template_name, **params)
125-
end
123+
EmailDeliveryJob.perform_later(template_name, **params)
126124

127125
next if type == :school_reminder && !parent.phone_receive_updates
128126

129-
if GOVUK_NOTIFY_SMS_TEMPLATES.fetch(template_name).present?
130-
SMSDeliveryJob.perform_later(template_name, **params)
131-
end
127+
SMSDeliveryJob.perform_later(template_name, **params)
132128
end
133129
end
134130

config/initializers/govuk_notify.rb

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,9 @@
3030
session_clinic_initial_invitation_ryg: "fc99ac81-9eeb-4df8-9aa0-04f0eb48e37f",
3131
session_clinic_subsequent_invitation_ryg:
3232
"eee59c1b-3af4-4ccd-8653-940887066390",
33-
session_clinic_initial_invitation_rt5: nil,
34-
session_clinic_subsequent_invitation_rt5: nil,
3533
session_school_reminder: "8b8a9566-bb03-4b3c-8abc-5bd5a4b8797d",
3634
triage_vaccination_at_clinic: "3c7461bd-e3cf-4ff9-9053-b4e87490aa45",
3735
triage_vaccination_at_clinic_ryg: "9faef718-bd76-4c30-93ea-fbe8584388a6",
38-
triage_vaccination_at_clinic_rt5: nil,
3936
triage_vaccination_will_happen: "279c517c-4c52-4a69-96cb-31355bfa4e21",
4037
triage_vaccination_wont_happen: "d1faf47e-ccc3-4481-975b-1ec34211a21f",
4138
vaccination_administered_flu: "7238ee27-5840-40e5-b9b9-3130ba4cd4fa",
@@ -61,8 +58,6 @@
6158
session_clinic_initial_invitation_ryg: "8ef5712f-bb7f-4911-8f3b-19df6f8a7179",
6259
session_clinic_subsequent_invitation_ryg:
6360
"018f146d-e7b7-4b63-ae26-bb07ca6fe2f9",
64-
session_clinic_initial_invitation_rt5: nil,
65-
session_clinic_subsequent_invitation_rt5: nil,
6661
session_school_reminder: "cc4a7f89-d260-461c-80f0-7e6e9af75e7a",
6762
vaccination_administered: "395a3ea1-df07-4dd6-8af1-64cc597ef383",
6863
vaccination_already_had: "fab1e355-bde1-47d5-835c-103bfd232b93",

spec/factories/notify_log_entries.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,13 +39,13 @@
3939
trait :email do
4040
type { "email" }
4141
recipient { Faker::Internet.email }
42-
template_id { GOVUK_NOTIFY_EMAIL_TEMPLATES.values.compact.sample }
42+
template_id { GOVUK_NOTIFY_EMAIL_TEMPLATES.values.sample }
4343
end
4444

4545
trait :sms do
4646
type { "sms" }
4747
recipient { Faker::PhoneNumber.phone_number }
48-
template_id { GOVUK_NOTIFY_SMS_TEMPLATES.values.compact.sample }
48+
template_id { GOVUK_NOTIFY_SMS_TEMPLATES.values.sample }
4949
end
5050

5151
delivery_id { SecureRandom.uuid }

spec/models/session_notification_spec.rb

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -236,18 +236,6 @@
236236
end
237237
end
238238

239-
context "when the team is Leicestershire Partnership Trust (LPT)" do
240-
let(:team) { create(:team, ods_code: "RT5", programmes:) }
241-
242-
it "doesn't enqueue an email" do
243-
expect { create_and_send! }.not_to have_delivered_email
244-
end
245-
246-
it "doesn't enqueue an SMS" do
247-
expect { create_and_send! }.not_to have_delivered_sms
248-
end
249-
end
250-
251239
context "when parent doesn't want to receive updates by text" do
252240
let(:parent) { parents.first }
253241

@@ -333,18 +321,6 @@
333321
)
334322
end
335323
end
336-
337-
context "when the team is Leicestershire Partnership Trust (LPT)" do
338-
let(:team) { create(:team, ods_code: "RT5", programmes:) }
339-
340-
it "doesn't enqueue an email" do
341-
expect { create_and_send! }.not_to have_delivered_email
342-
end
343-
344-
it "doesn't enqueue an SMS" do
345-
expect { create_and_send! }.not_to have_delivered_sms
346-
end
347-
end
348324
end
349325
end
350326
end

0 commit comments

Comments
 (0)