Refactor user to handle given and family name

The full name field has been removed and replaced by a separate
given name and family name, so we need to refactor the user model and
various code paths to use the new fields.

Author: thomasleese

app/controllers/users/accounts_controller.rb

@@ -52,7 +52,12 @@ def set_user
     end
 
     def user_params
-      params.require(:user).permit(:full_name, :email, :registration)
+      params.require(:user).permit(
+        :email,
+        :family_name,
+        :given_name,
+        :registration
+      )
     end
   end
 end

app/models/user.rb

@@ -48,9 +48,10 @@ class User < ApplicationRecord
   has_and_belongs_to_many :teams
 
   encrypts :email, deterministic: true
-  encrypts :full_name
+  encrypts :family_name, :given_name
+
+  validates :family_name, :given_name, presence: true, length: { maximum: 255 }
 
-  validates :full_name, presence: true, length: { maximum: 255 }
   validates :registration, length: { maximum: 255 }
   validates :email,
             presence: true,
@@ -63,6 +64,10 @@ class User < ApplicationRecord
   scope :recently_active,
         -> { where(last_sign_in_at: 1.week.ago..Time.current) }
 
+  def full_name
+    [given_name, family_name].join(" ")
+  end
+
   def team
     # TODO: Update the app to properly support multiple teams per user
     teams.first
@@ -74,7 +79,9 @@ def self.find_or_create_user_from_cis2_oidc(userinfo)
         provider: userinfo[:provider],
         uid: userinfo[:uid]
       )
-    user.full_name = userinfo[:info][:name]
+
+    user.family_name = userinfo[:extra][:raw_info][:family_name]
+    user.given_name = userinfo[:extra][:raw_info][:given_name]
     user.email = userinfo[:info][:email]
     user.password = Devise.friendly_token if user.new_record?
 

app/views/users/accounts/show.html.erb

@@ -3,7 +3,9 @@
 <%= form_for @user, url: users_account_path(@user), method: :patch do |f| %>
   <%= f.govuk_error_summary %>
 
-  <%= f.govuk_text_field :full_name, label: { text: "Full name" } %>
+  <%= f.govuk_text_field :given_name, label: { text: "Given name" } %>
+  <%= f.govuk_text_field :family_name, label: { text: "Family name" } %>
+
   <%= f.govuk_text_field :email, label: { text: "Email address" } %>
   <%= f.govuk_text_field :registration,
                          width: 10,

config/locales/en.yml

@@ -381,9 +381,12 @@ en:
               invalid: Enter a valid email address, such as j.doe@gmail.com
               taken: This email address is already in use
               too_long: Enter an email address that is less than 255 characters long
-            full_name:
-              blank: Enter your full name
-              too_long: Enter a full name that is less than 255 characters long
+            family_name:
+              blank: Enter your family name
+              too_long: Enter a family name that is less than 255 characters long
+            given_name:
+              blank: Enter your given name
+              too_long: Enter a given name that is less than 255 characters long
             ods_code:
               blank: Enter an ODS code
             password:

db/seeds.rb

@@ -15,7 +15,8 @@
   User.find_by(email: "nurse.joy@example.com") ||
     FactoryBot.create(
       :user,
-      full_name: "Nurse Joy",
+      family_name: "Joy",
+      given_name: "Nurse",
       email: "nurse.joy@example.com",
       password: "nurse.joy@example.com"
     )

spec/components/app_activity_log_component_spec.rb

@@ -28,7 +28,9 @@
     )
   end
   let(:component) { described_class.new(patient_session) }
-  let(:user) { create(:user, teams: [team], full_name: "Nurse Joy") }
+  let(:user) do
+    create(:user, teams: [team], family_name: "Joy", given_name: "Nurse")
+  end
   let(:campaign) { create(:campaign, :hpv, team:) }
   let(:location) { create(:location, :school, name: "Hogwarts") }
   let(:session) { create(:session, campaign:, location:) }

spec/components/app_timestamped_entry_component_spec.rb

@@ -28,7 +28,12 @@
         text: "Summary of a thing",
         timestamp: Time.zone.local(2024, 2, 17, 12, 23, 0),
         recorded_by:
-          create(:user, full_name: "Test User", email: "test@example.com")
+          create(
+            :user,
+            family_name: "User",
+            given_name: "Test",
+            email: "test@example.com"
+          )
       )
     end
 

spec/components/app_triage_notes_component_spec.rb

@@ -19,7 +19,7 @@
       Timecop.freeze(Time.zone.local(2023, 12, 4, 10, 4)) { example.run }
     end
 
-    let(:user) { create(:user, full_name: "Joe Gear") }
+    let(:user) { create(:user, family_name: "Gear", given_name: "Joe") }
 
     before do
       create(

spec/components/previews/app_consent_summary_component_preview.rb

@@ -61,7 +61,8 @@ def multiple_responses
                  recorded_by:
                    build(
                      :user,
-                     full_name: "Nurse Joy",
+                     family_name: "Joy",
+                     given_name: "Nurse",
                      email: "nurse.joy@example.com"
                    )
                }

spec/factories/users.rb

@@ -35,7 +35,9 @@
 #
 FactoryBot.define do
   factory :user do
-    sequence(:full_name) { |n| "Test User #{n}" }
+    sequence(:family_name) { |n| "User #{n}" }
+    given_name { "Test" }
+
     sequence(:email) { |n| "test-#{n}@example.com" }
     sequence(:teams) { [Team.first || create(:team)] }
     password { "power overwhelming!" } # avoid a password that was found in a data breach