Merge pull request #6285 from NHSDigital/bugfix-missing-patient-id-on-notify-log-entries

Bugfix for consent confirmation comms activity log entries not appearing in some cases

Author: thomasleese

app/lib/govuk_notify_personalisation.rb

@@ -25,7 +25,9 @@ def initialize(
     @consent = consent
     @consent_form = consent_form
     @parent = parent || consent&.parent
-    @patient = patient || consent&.patient || vaccination_record&.patient
+    @patient =
+      patient || consent&.patient || vaccination_record&.patient ||
+        Patient.find_by(id: consent_form&.matched_patient&.id)
     @session = session || consent_form&.session || vaccination_record&.session
     @team =
       team || session&.team || consent_form&.team || consent&.team ||

db/data/20260312182158_backfill_patient_id_on_notify_log_entries.rb

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+class BackfillPatientIdOnNotifyLogEntries < ActiveRecord::Migration[8.1]
+  def up
+    migration = self.class.name
+    started_at = Time.zone.now
+
+    scope = NotifyLogEntry.where(patient_id: nil).where.not(consent_form_id: nil)
+
+    Rails.logger.info(event: "data_migration_start", migration:, total_records: scope.count)
+
+    records_updated =
+      scope
+        .joins(
+          "INNER JOIN consents ON consents.consent_form_id = notify_log_entries.consent_form_id"
+        )
+        .update_all("patient_id = consents.patient_id")
+
+    duration_minutes = ((Time.zone.now - started_at) / 60.0).round
+
+    Rails.logger.info(
+      event: "data_migration_finish",
+      migration:,
+      duration_minutes:,
+      records_updated:
+    )
+  end
+
+  def down
+    raise ActiveRecord::IrreversibleMigration
+  end
+end

db/data_schema.rb

@@ -1 +1 @@
-DataMigrate::Data.define(version: 2026_03_05_165603)
+DataMigrate::Data.define(version: 2026_03_12_182158)

spec/features/parental_consent_inexact_auto_match_spec.rb

@@ -121,5 +121,6 @@ def and_they_see_consent_contact_warning_notifications
     expect(page).to have_content("Consent unknown contact details warning sent")
     expect(page).to have_content(@parent.email)
     expect(page).to have_content(@parent.phone)
+    expect(page).to have_content("Consent confirmation given sent")
   end
 end

spec/jobs/email_delivery_job_spec.rb

@@ -206,6 +206,24 @@
         expect(notify_log_entry.programmes.map(&:type)).to eq(programme_types)
       end
 
+      context "when the consent form is matched to a patient" do
+        let(:matched_patient) { create(:patient) }
+
+        before do
+          create(
+            :consent,
+            programme: session.programmes.first,
+            consent_form:,
+            patient: matched_patient
+          )
+        end
+
+        it "sets patient on the log entry from the matched consent form" do
+          perform_now
+          expect(NotifyLogEntry.last.patient).to eq(matched_patient)
+        end
+      end
+
       context "when the parent doesn't have a phone number" do
         let(:consent_form) do
           create(:consent_form, session:, parent_email: nil)