Merge pull request #3912 from nhsuk/personalisation-eligible-programmes

Limit programmes to those that are safe to vaccinate

Author: thomasleese

app/lib/govuk_notify_personalisation.rb

@@ -30,10 +30,6 @@ def initialize(
         consent&.organisation || vaccination_record&.organisation
     @team = session&.team || consent_form&.team || vaccination_record&.team
     @vaccination_record = vaccination_record
-
-    if @programmes.empty? && @session.present? && @patient.present?
-      @programmes = @session.eligible_programmes_for(patient: @patient)
-    end
   end
 
   def to_h

app/models/session_notification.rb

@@ -82,8 +82,23 @@ def self.create_and_send!(
       sent_by: current_user
     )
 
+    programmes =
+      if type == :school_reminder
+        patient_session.programmes.select do |programme|
+          patient.consent_given_and_safe_to_vaccinate?(programme:)
+        end
+      else
+        patient_session.programmes
+      end
+
     parents.each do |parent|
-      params = { parent:, patient:, session:, sent_by: current_user }
+      params = {
+        parent:,
+        patient:,
+        programmes:,
+        session:,
+        sent_by: current_user
+      }
 
       EmailDeliveryJob.perform_later(:"session_#{type}", **params)
 

spec/lib/govuk_notify_personalisation_spec.rb

@@ -1,17 +1,15 @@
 # frozen_string_literal: true
 
 describe GovukNotifyPersonalisation do
-  subject(:to_h) { described_class.new(**params).to_h }
-
-  let(:params) do
-    {
+  subject(:to_h) do
+    described_class.new(
       patient:,
       session:,
       consent:,
       consent_form:,
       programmes:,
       vaccination_record:
-    }
+    ).to_h
   end
 
   let(:programmes) { [create(:programme, :hpv)] }
@@ -258,20 +256,5 @@
         )
       )
     end
-
-    context "when programmes comes from the session" do
-      let(:params) do
-        { patient:, session:, consent:, consent_form:, vaccination_record: }
-      end
-
-      it do
-        expect(to_h).to match(
-          hash_including(
-            vaccine_side_effects:
-              "- generally feeling unwell\n- swelling or pain where the injection was given"
-          )
-        )
-      end
-    end
   end
 end

spec/models/session_notification_spec.rb

@@ -42,11 +42,10 @@
     let(:parents) { create_list(:parent, 2) }
     let(:patient) { create(:patient, parents:, year_group: 10) }
     let(:programme) { create(:programme, :td_ipv) }
-    let(:organisation) { create(:organisation, programmes: [programme]) }
+    let(:programmes) { [programme] }
+    let(:organisation) { create(:organisation, programmes:) }
     let(:location) { create(:school, organisation:) }
-    let(:session) do
-      create(:session, location:, programmes: [programme], organisation:)
-    end
+    let(:session) { create(:session, location:, programmes:, organisation:) }
     let(:session_date) { session.dates.min }
     let(:patient_session) { create(:patient_session, patient:, session:) }
     let(:current_user) { create(:user) }
@@ -58,7 +57,10 @@
 
       let(:parent) { parents.first }
 
-      before { create(:consent, :given, patient:, parent:, programme:) }
+      before do
+        create(:consent, :given, patient:, parent:, programme:)
+        create(:patient_consent_status, :given, patient:, programme:)
+      end
 
       it "creates a record" do
         expect { create_and_send! }.to change(described_class, :count).by(1)
@@ -73,22 +75,55 @@
       it "enqueues an email per parent who gave consent" do
         expect { create_and_send! }.to have_delivered_email(
           :session_school_reminder
-        ).with(parent:, patient:, session:, sent_by: current_user)
+        ).with(parent:, patient:, programmes:, session:, sent_by: current_user)
       end
 
       it "enqueues a text per parent" do
         expect { create_and_send! }.to have_delivered_sms(
           :session_school_reminder
-        ).with(parent:, patient:, session:, sent_by: current_user)
+        ).with(parent:, patient:, programmes:, session:, sent_by: current_user)
       end
 
       context "when parent doesn't want to receive updates by text" do
-        before { parents.each { _1.update!(phone_receive_updates: false) } }
+        before { parents.each { it.update!(phone_receive_updates: false) } }
 
         it "doesn't enqueues a text" do
           expect { create_and_send! }.not_to have_delivered_sms
         end
       end
+
+      context "with multiple programmes but only one eligible for vaccination" do
+        let(:consented_programmes) { [programme] }
+
+        # No consent for MenACWY
+        let(:programmes) do
+          consented_programmes + [create(:programme, :menacwy)]
+        end
+
+        it "enqueues an email per parent who gave consent" do
+          expect { create_and_send! }.to have_delivered_email(
+            :session_school_reminder
+          ).with(
+            parent:,
+            patient:,
+            programmes: consented_programmes,
+            session:,
+            sent_by: current_user
+          )
+        end
+
+        it "enqueues a text per parent" do
+          expect { create_and_send! }.to have_delivered_sms(
+            :session_school_reminder
+          ).with(
+            parent:,
+            patient:,
+            programmes: consented_programmes,
+            session:,
+            sent_by: current_user
+          )
+        end
+      end
     end
 
     context "with an initial clinic invitation" do
@@ -110,11 +145,13 @@
         ).with(
           parent: parents.first,
           patient:,
+          programmes:,
           session:,
           sent_by: current_user
         ).and have_delivered_email(:session_clinic_initial_invitation).with(
                 parent: parents.second,
                 patient:,
+                programmes:,
                 session:,
                 sent_by: current_user
               )
@@ -126,11 +163,13 @@
         ).with(
           parent: parents.first,
           patient:,
+          programmes:,
           session:,
           sent_by: current_user
         ).and have_delivered_sms(:session_clinic_initial_invitation).with(
                 parent: parents.second,
                 patient:,
+                programmes:,
                 session:,
                 sent_by: current_user
               )
@@ -144,7 +183,13 @@
         it "still enqueues a text" do
           expect { create_and_send! }.to have_delivered_sms(
             :session_clinic_initial_invitation
-          ).with(parent:, patient:, session:, sent_by: current_user)
+          ).with(
+            parent:,
+            patient:,
+            programmes:,
+            session:,
+            sent_by: current_user
+          )
         end
       end
     end
@@ -168,11 +213,13 @@
         ).with(
           parent: parents.first,
           patient:,
+          programmes:,
           session:,
           sent_by: current_user
         ).and have_delivered_email(:session_clinic_subsequent_invitation).with(
                 parent: parents.second,
                 patient:,
+                programmes:,
                 session:,
                 sent_by: current_user
               )
@@ -184,11 +231,13 @@
         ).with(
           parent: parents.first,
           patient:,
+          programmes:,
           session:,
           sent_by: current_user
         ).and have_delivered_sms(:session_clinic_subsequent_invitation).with(
                 parent: parents.second,
                 patient:,
+                programmes:,
                 session:,
                 sent_by: current_user
               )
@@ -202,7 +251,13 @@
         it "still enqueues a text" do
           expect { create_and_send! }.to have_delivered_sms(
             :session_clinic_subsequent_invitation
-          ).with(parent:, patient:, session:, sent_by: current_user)
+          ).with(
+            parent:,
+            patient:,
+            programmes:,
+            session:,
+            sent_by: current_user
+          )
         end
       end
     end