Format full names as SURNAME, Firstname (#2980)

This updates how the full names are formatted to use the format
`SURNAME, Firstname` if we're rendering a patient name in the context of
the service used by nurses, and we keep the existing `Firstname Surname`
format when displaying a patient name in the context of comms sent to
parents.

## Screenshots

![Screenshot 2025-02-26 at 08 21
54](https://github.com/user-attachments/assets/d8477585-cc19-42e5-b178-2ec1d1ce85fb)
![Screenshot 2025-02-26 at 08 22
00](https://github.com/user-attachments/assets/19308e83-261b-45e8-ba3b-338ebc572aab)
![Screenshot 2025-02-26 at 08 22
10](https://github.com/user-attachments/assets/10beb98a-2451-42c7-bc80-49b4a87a0632)
![Screenshot 2025-02-26 at 08 23
35](https://github.com/user-attachments/assets/edef4dc5-b308-44a0-a34b-664ce05c9b07)

Author: thomasleese

app/components/app_consent_confirmation_component.rb

@@ -37,13 +37,16 @@ def title
 
   private
 
-  delegate :full_name,
-           :chosen_programmes,
+  delegate :chosen_programmes,
            :not_chosen_programmes,
            :response,
            :parent_email,
            to: :@consent_form
 
+  def full_name
+    @consent_form.full_name(context: :parents)
+  end
+
   def panel_text
     case response
     when "given", "given_one"

app/components/app_simple_status_banner_component.rb

@@ -30,7 +30,7 @@ def call
   delegate :patient, :session, to: :patient_session
 
   def status
-    @status ||= @patient_session.status(programme:)
+    @status ||= patient_session.status(programme:)
   end
 
   def colour

app/lib/full_name_formatter.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+class FullNameFormatter
+  def self.call(nameable, context:, parts_prefix: nil)
+    parts_prefix = "#{parts_prefix}_" if parts_prefix.present?
+
+    given_name =
+      nameable.try(:"#{parts_prefix}given_name").presence ||
+        nameable.send(:given_name)
+    family_name =
+      nameable.try(:"#{parts_prefix}family_name").presence ||
+        nameable.send(:family_name)
+
+    case context
+    when :internal
+      "#{family_name.upcase}, #{given_name.upcase_first}"
+    when :parents
+      "#{given_name.upcase_first} #{family_name.upcase_first}"
+    else
+      raise "Unknown context: #{context}"
+    end
+  end
+end

app/lib/govuk_notify_personalisation.rb

@@ -120,7 +120,7 @@ def day_month_year_of_vaccination
   end
 
   def full_and_preferred_patient_name
-    (consent_form || patient).full_name_with_known_as
+    (consent_form || patient).full_name_with_known_as(context: :parents)
   end
 
   def host

app/models/concerns/full_name_concern.rb

@@ -8,30 +8,27 @@ module FullNameConcern
           -> { order("LOWER(family_name)", "LOWER(given_name)") }
   end
 
-  def full_name
-    [given_name, family_name].join(" ")
+  def full_name(context: :internal)
+    FullNameFormatter.call(self, context:)
   end
 
   def has_preferred_name?
     preferred_given_name.present? || preferred_family_name.present?
   end
 
-  def preferred_full_name
-    [
-      preferred_given_name.presence || given_name,
-      preferred_family_name.presence || family_name
-    ].join(" ")
+  def preferred_full_name(context: :internal)
+    FullNameFormatter.call(self, context:, parts_prefix: :preferred)
   end
 
   def preferred_full_name_changed?
     preferred_given_name_changed? || preferred_family_name_changed?
   end
 
-  def full_name_with_known_as
+  def full_name_with_known_as(context: :internal)
     if has_preferred_name?
-      "#{full_name} (known as #{preferred_full_name})"
+      "#{full_name(context:)} (known as #{preferred_full_name(context: :parents)})"
     else
-      full_name
+      full_name(context:)
     end
   end
 

app/models/concerns/vaccination_record_performed_by_concern.rb

@@ -11,17 +11,20 @@ module VaccinationRecordPerformedByConcern
               }
   end
 
+  PerformedBy =
+    Struct.new(:given_name, :family_name) do
+      def full_name
+        FullNameFormatter.call(self, context: :internal)
+      end
+    end
+
   def performed_by
     return performed_by_user if performed_by_user
 
     if performed_by_given_name.present? || performed_by_family_name.present?
-      OpenStruct.new(
+      PerformedBy.new(
         given_name: performed_by_given_name,
-        family_name: performed_by_family_name,
-        full_name: [
-          performed_by_given_name,
-          performed_by_family_name
-        ].compact_blank.join(" ")
+        family_name: performed_by_family_name
       )
     end
   end

app/views/parent_interface/consent_forms/confirm.html.erb

@@ -139,7 +139,7 @@
   <%= govuk_summary_list do |summary_list|
         summary_list.with_row do |row|
           row.with_key { "Child’s name" }
-          row.with_value { @consent_form.full_name }
+          row.with_value { @consent_form.full_name(context: :parents) }
           row.with_action(text: "Change",
                           href: change_link[:name],
                           visually_hidden_text: "child’s name")
@@ -148,7 +148,7 @@
         if @consent_form.use_preferred_name
           summary_list.with_row do |row|
             row.with_key { "Also known as" }
-            row.with_value { @consent_form.preferred_full_name }
+            row.with_value { @consent_form.preferred_full_name(context: :parents) }
             row.with_action(text: "Change",
                             href: change_link[:name],
                             visually_hidden_text: "common name")

spec/components/app_activity_log_component_spec.rb

@@ -143,7 +143,7 @@
                      title: "Vaccinated with Gardasil 9",
                      date: "31 May 2024 at 12:00pm",
                      notes: "Some notes",
-                     by: "Nurse Joy",
+                     by: "JOY, Nurse",
                      programme: "HPV"
 
     include_examples "card",
@@ -155,14 +155,14 @@
     include_examples "card",
                      title: "Triaged decision: Safe to vaccinate",
                      date: "30 May 2024 at 2:30pm",
-                     by: "Nurse Joy",
+                     by: "JOY, Nurse",
                      programme: "HPV"
 
     include_examples "card",
                      title: "Triaged decision: Keep in triage",
                      date: "30 May 2024 at 2:00pm",
                      notes: "Some notes",
-                     by: "Nurse Joy",
+                     by: "JOY, Nurse",
                      programme: "HPV"
 
     include_examples "card",
@@ -173,7 +173,7 @@
     include_examples "card",
                      title: "Consent given by Jane Doe (Mum)",
                      date: "30 May 2024 at 12:00pm",
-                     by: "Nurse Joy",
+                     by: "JOY, Nurse",
                      programme: "HPV"
 
     include_examples "card",
@@ -184,7 +184,7 @@
                      title: "Consent school request hpv sent",
                      date: "10 May 2024 at 12:00am",
                      notes: "test@example.com",
-                     by: "Nurse Joy",
+                     by: "JOY, Nurse",
                      programme: "HPV"
   end
 
@@ -207,7 +207,7 @@
                      title: "Vaccination not given: Unwell",
                      date: "31 May 2024 at 1:00pm",
                      notes: "Some notes.",
-                     by: "Nurse Joy",
+                     by: "JOY, Nurse",
                      programme: "HPV"
   end
 
@@ -228,7 +228,7 @@
     include_examples "card",
                      title: "Vaccinated with Gardasil 9",
                      date: "31 May 2024 at 1:00pm",
-                     by: "Nurse Joy",
+                     by: "JOY, Nurse",
                      programme: "HPV"
 
     include_examples "card",
@@ -251,7 +251,7 @@
 
     include_examples "card",
                      title:
-                       "Consent given by Sarah Doe (Child (Gillick competent))",
+                       "Consent given by DOE, Sarah (Child (Gillick competent))",
                      date: "30 May 2024 at 12:00pm",
                      programme: "HPV"
   end
@@ -290,7 +290,7 @@
                      title:
                        "Consent response manually matched with child record",
                      date: "30 May 2024 at 1:00pm",
-                     by: "Nurse Joy"
+                     by: "JOY, Nurse"
   end
 
   describe "withdrawn consent" do
@@ -370,15 +370,15 @@
                      title: "Completed Gillick assessment as Gillick competent",
                      notes: "First notes",
                      date: "1 June 2024 at 12:00pm",
-                     by: "Nurse Joy",
+                     by: "JOY, Nurse",
                      programme: "Td/IPV"
 
     include_examples "card",
                      title:
                        "Updated Gillick assessment as not Gillick competent",
                      notes: "Second notes",
                      date: "1 June 2024 at 1:00pm",
-                     by: "Nurse Joy",
+                     by: "JOY, Nurse",
                      programme: "Td/IPV"
   end
 
@@ -400,6 +400,6 @@
                      title: "Completed pre-screening checks",
                      notes: "Some notes",
                      date: "1 June 2024 at 12:00pm",
-                     by: "Nurse Joy"
+                     by: "JOY, Nurse"
   end
 end

spec/components/app_child_summary_component_spec.rb

@@ -42,10 +42,10 @@
   it { should have_content("123\u00A0\u200D456\u00A0\u200D7890") }
 
   it { should have_content("Full name") }
-  it { should have_content("John Doe") }
+  it { should have_content("DOE, John") }
 
   it { should have_content("Known as") }
-  it { should have_content("Johnny Doe") }
+  it { should have_content("DOE, Johnny") }
 
   it { should have_content("Date of birth") }
   it { should have_content("1 January 2000") }
@@ -83,7 +83,7 @@
   context "with pending changes" do
     let(:component) { described_class.new(patient.with_pending_changes) }
 
-    it { should have_css(".app-highlight", text: "Jane Doe") }
+    it { should have_css(".app-highlight", text: "DOE, Jane") }
     it { should have_css(".app-highlight", text: "1 January 2001") }
     it { should have_css(".app-highlight", text: "SW1A 2AA") }
     it { should_not have_css(".app-highlight", text: "Male") }
@@ -103,6 +103,6 @@
       create(:consent_form, :recorded, given_name: "John", family_name: "Doe")
     end
 
-    it { should have_text("John Doe") }
+    it { should have_text("DOE, John") }
   end
 end

spec/components/app_compare_consent_form_and_patient_component_spec.rb

@@ -34,7 +34,7 @@
       )
     end
 
-    it { should have_text("Full name\nJohn Doe").twice }
+    it { should have_text("Full name\nDOE, John").twice }
     it { should have_text("Date of birth\n1 January 2000").twice }
     it { should have_text("Address\n1 Main StreetAreaSome TownSW11 1AA").twice }
     it { should have_text("School\nWaterloo Road").twice }
@@ -55,8 +55,8 @@
       )
     end
 
-    it { should have_text("Full name\nJohn Doe").once }
-    it { should have_text("Full name\nJane Doe").once }
+    it { should have_text("Full name\nDOE, John").once }
+    it { should have_text("Full name\nDOE, Jane").once }
 
     it { should have_text("Date of birth\n1 January 2000").once }
     it { should have_text("Date of birth\n2 January 2000").once }