Send reminders per session date

This updates the session reminders job to send a reminder email per session date that a patient may get vaccinated.
nhsuk · Oct 1, 2024 · e86dc20 · e86dc20
1 parent 5b278b1
commit e86dc20
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 33 deletions.
diff --git a/app/jobs/session_reminders_job.rb b/app/jobs/session_reminders_job.rb
@@ -8,33 +8,33 @@ def perform
 
     date = Date.tomorrow
 
-    patient_sessions(date).each do |patient_session|
+    patient_sessions =
+      PatientSession
+        .includes(:consents, :patient)
+        .joins(:session)
+        .merge(Session.has_date(date))
+        .reminder_not_sent(date)
+
+    patient_sessions.each do |patient_session|
+      # We create a record in the database first to avoid sending duplicate emails/texts.
+      # If a problem occurs while the emails/texts are sent, they will be in the job
+      # queue and restarted at a later date.
+
+      SessionNotification.create!(
+        patient: patient_session.patient,
+        session: patient_session.session,
+        session_date: date
+      )
+
       patient_session.consents_to_send_communication.each do |consent|
         SessionMailer.with(consent:, patient_session:).reminder.deliver_later
+
         TextDeliveryJob.perform_later(
           :session_reminder,
           consent:,
           patient_session:
         )
       end
-
-      patient_session.update!(reminder_sent_at: Time.zone.now)
-
-      SessionNotification.create!(
-        patient: patient_session.patient,
-        session: patient_session.session,
-        session_date: date
-      )
     end
   end
-
-  private
-
-  def patient_sessions(date)
-    PatientSession
-      .includes(:consents, :patient)
-      .joins(:session)
-      .merge(Session.has_date(date))
-      .reminder_not_sent
-  end
 end
diff --git a/app/models/patient_session.rb b/app/models/patient_session.rb
@@ -59,7 +59,21 @@ class PatientSession < ApplicationRecord
 
   has_and_belongs_to_many :immunisation_imports
 
-  scope :reminder_not_sent, -> { where(reminder_sent_at: nil) }
+  scope :reminder_not_sent,
+        ->(session_date) do
+          where.not(
+            SessionNotification
+              .where(
+                "session_notifications.session_id = patient_sessions.session_id"
+              )
+              .where(
+                "session_notifications.patient_id = patient_sessions.patient_id"
+              )
+              .where(session_date:)
+              .arel
+              .exists
+          )
+        end
 
   def vaccination_record
     # HACK: in future, it will be possible to have multiple vaccination records for a patient session

diff --git a/spec/jobs/session_reminders_job_spec.rb b/spec/jobs/session_reminders_job_spec.rb
@@ -41,12 +41,6 @@
       )
     end
 
-    it "updates the reminder_sent_at attribute for patient sessions" do
-      expect { perform_now }.to(
-        change { patient_session.reload.reminder_sent_at }
-      )
-    end
-
     it "records a notification" do
       expect { perform_now }.to change(
         SessionNotification.where(patient:, session:),
@@ -55,7 +49,7 @@
     end
 
     context "when already sent" do
-      before { patient_session.update!(reminder_sent_at: Time.zone.now) }
+      before { create(:session_notification, session:, patient:) }
 
       it "doesn't send a reminder email" do
         expect { perform_now }.not_to have_enqueued_mail(
@@ -68,12 +62,6 @@
         expect { perform_now }.not_to have_enqueued_text(:session_reminder)
       end
 
-      it "doesn't change reminder_sent_at" do
-        expect { perform_now }.not_to(
-          change { patient_session.reload.reminder_sent_at }
-        )
-      end
-
       it "doesn't record a notification" do
         expect { perform_now }.not_to change(SessionNotification, :count)
       end