Merge pull request #4469 from nhsuk/healthcare-assistant-admin

thomasleese · web-flow · commit 0cc0d2e1cbc9 · 2025-09-02T14:03:02.000+01:00
Ensure HCAs have medical secretary role
diff --git a/app/controllers/concerns/authentication_concern.rb b/app/controllers/concerns/authentication_concern.rb
@@ -49,7 +49,7 @@ def selected_cis2_workgroup_is_valid?
     end
 
     def selected_cis2_role_is_valid?
-      cis2_info.is_admin? || cis2_info.is_nurse? ||
+      cis2_info.is_medical_secretary? || cis2_info.is_nurse? ||
         cis2_info.is_healthcare_assistant? || cis2_info.is_superuser? ||
         cis2_info.is_prescriber?
     end
diff --git a/app/models/cis2_info.rb b/app/models/cis2_info.rb
@@ -4,7 +4,7 @@ class CIS2Info
   include RequestSessionPersistable
 
   NURSE_ROLE = "S8000:G8000:R8001"
-  ADMIN_ROLE = "S8000:G8001:R8006"
+  MEDICAL_SECRETARY_ROLE = "S8000:G8001:R8006"
 
   SUPERUSER_WORKGROUP = "mavissuperusers"
 
@@ -39,16 +39,17 @@ def team
   def has_valid_workgroup? =
     organisation&.teams&.exists?(workgroup: workgroups) || false
 
-  def is_admin?
-    role_code == ADMIN_ROLE
+  def is_medical_secretary?
+    role_code == MEDICAL_SECRETARY_ROLE
   end
 
   def is_nurse?
     role_code == NURSE_ROLE
   end
 
   def is_healthcare_assistant?
-    activity_codes.include?(PERSONAL_MEDICATION_ADMINISTRATION_ACTIVITY_CODE)
+    role_code == MEDICAL_SECRETARY_ROLE &&
+      activity_codes.include?(PERSONAL_MEDICATION_ADMINISTRATION_ACTIVITY_CODE)
   end
 
   def is_prescriber?
diff --git a/app/models/user.rb b/app/models/user.rb
@@ -77,7 +77,7 @@ class User < ApplicationRecord
   enum :fallback_role,
        {
          nurse: 0,
-         admin: 1,
+         medical_secretary: 1,
          superuser: 2,
          healthcare_assistant: 3,
          prescriber: 4
@@ -133,14 +133,18 @@ def role_description
       elsif is_nurse?
         "Nurse"
       else
-        "Administrator"
+        "Medical secretary"
       end
 
     is_superuser? ? "#{role} (Superuser)" : role
   end
 
-  def is_admin?
-    cis2_enabled? ? cis2_info.is_admin? : fallback_role_admin?
+  def is_medical_secretary?
+    if cis2_enabled?
+      cis2_info.is_medical_secretary?
+    else
+      fallback_role_medical_secretary?
+    end
   end
 
   def is_nurse?
diff --git a/db/seeds.rb b/db/seeds.rb
@@ -258,7 +258,7 @@ def create_team_sessions(user, team)
   # is not available and password= fails to run.
   team = create_team(ods_code: "R1L")
   user = create_user(:nurse, team:, email: "nurse.joy@example.com")
-  create_user(:admin, team:, email: "admin.hope@example.com")
+  create_user(:medical_secretary, team:, email: "admin.hope@example.com")
   create_user(:superuser, team:, email: "superuser@example.com")
   create_user(:healthcare_assistant, team:, email: "hca@example.com")
 
diff --git a/spec/factories/teams.rb b/spec/factories/teams.rb
@@ -53,7 +53,7 @@
     end
 
     trait :with_one_admin do
-      users { [create(:user, :admin, team: instance)] }
+      users { [create(:user, :medical_secretary, team: instance)] }
     end
 
     trait :with_one_healthcare_assistant do
diff --git a/spec/factories/users.rb b/spec/factories/users.rb
@@ -80,10 +80,10 @@
       end
     end
 
-    trait :admin do
-      sequence(:email) { |n| "admin-#{n}@example.com" }
-      role_code { CIS2Info::ADMIN_ROLE }
-      fallback_role { :admin }
+    trait :medical_secretary do
+      sequence(:email) { |n| "medical-secretary-#{n}@example.com" }
+      role_code { CIS2Info::MEDICAL_SECRETARY_ROLE }
+      fallback_role { :medical_secretary }
       show_in_suppliers { false }
     end
 
@@ -96,7 +96,7 @@
 
     trait :healthcare_assistant do
       sequence(:email) { |n| "healthcare-assistant-#{n}@example.com" }
-      role_code { nil }
+      role_code { CIS2Info::MEDICAL_SECRETARY_ROLE }
       activity_codes do
         [CIS2Info::PERSONAL_MEDICATION_ADMINISTRATION_ACTIVITY_CODE]
       end
@@ -117,8 +117,8 @@
     end
   end
 
-  factory :admin, parent: :user, traits: %i[admin]
   factory :healthcare_assistant, parent: :user, traits: %i[healthcare_assistant]
+  factory :medical_secretary, parent: :user, traits: %i[medical_secretary]
   factory :prescriber, parent: :user, traits: %i[prescriber]
   factory :superuser, parent: :user, traits: %i[superuser]
 end
diff --git a/spec/features/doubles_vaccination_cannot_record_as_admin_spec.rb b/spec/features/doubles_vaccination_cannot_record_as_admin_spec.rb
@@ -3,7 +3,7 @@
 describe "MenACWY and Td/IPV vaccination" do
   around { |example| travel_to(Time.zone.local(2024, 2, 1)) { example.run } }
 
-  scenario "Cannot be recorded by an admin" do
+  scenario "Cannot be recorded by a medical secretary" do
     given_i_am_signed_in_as_an_admin
     when_i_go_to_a_patient_that_is_ready_to_vaccinate
     then_i_cannot_record_that_the_patient_has_been_vaccinated
@@ -32,7 +32,7 @@ def given_i_am_signed_in_as_an_admin
       session: @session
     )
 
-    sign_in team.users.first, role: :admin
+    sign_in team.users.first, role: :medical_secretary
 
     visit "/"
   end
diff --git a/spec/features/edit_vaccination_record_spec.rb b/spec/features/edit_vaccination_record_spec.rb
@@ -183,7 +183,7 @@
     then_i_should_see_the_vaccination_record
   end
 
-  scenario "Cannot as an admin" do
+  scenario "Cannot as a medical secretary" do
     given_i_am_signed_in_as_an_admin
     and_an_administered_vaccination_record_exists
 
@@ -254,7 +254,7 @@ def given_i_am_signed_in
   end
 
   def given_i_am_signed_in_as_an_admin
-    sign_in @team.users.first, role: :admin
+    sign_in @team.users.first, role: :medical_secretary
   end
 
   def and_an_administered_vaccination_record_exists
diff --git a/spec/features/patient_specific_directions_spec.rb b/spec/features/patient_specific_directions_spec.rb
@@ -26,7 +26,7 @@
   scenario "admin cannot bulk add PSDs to patients" do
     given_a_flu_programme_with_a_running_session(user_type: :with_one_admin)
     and_a_patient_with_consent_given_nasal_only_triage_not_needed
-    and_i_am_signed_in(role: :admin)
+    and_i_am_signed_in(role: :medical_secretary)
 
     when_i_go_to_the_session_psds_tab
     then_i_should_not_see_link_to_bulk_add_psds
diff --git a/spec/features/td_ipv_already_had_spec.rb b/spec/features/td_ipv_already_had_spec.rb
@@ -61,7 +61,7 @@
     then_i_see_the_patient_doesnt_need_triage
   end
 
-  scenario "can't record as already vaccinated as an admin" do
+  scenario "can't record as already vaccinated as a medical secretary" do
     given_a_td_ipv_programme_with_a_session(clinic: false)
     and_a_patient_is_in_the_session
     and_the_patient_doesnt_need_triage
@@ -147,7 +147,7 @@ def when_i_go_the_session
   end
 
   def when_i_go_the_session_as_an_admin
-    sign_in @nurse, role: :admin
+    sign_in @nurse, role: :medical_secretary
     visit dashboard_path
     click_on "Sessions", match: :first
     choose "Scheduled"
diff --git a/spec/features/user_cis2_authentication_spec.rb b/spec/features/user_cis2_authentication_spec.rb
@@ -3,7 +3,7 @@
 describe "User CIS2 authentication", :cis2 do
   before { given_a_test_team_is_setup_in_mavis_and_cis2 }
 
-  scenario "as an admin" do
+  scenario "as a medical secretary" do
     given_an_admin_user_is_mocked
 
     when_i_go_to_the_start_page
@@ -62,7 +62,7 @@ def given_an_admin_user_is_mocked
       uid: @user.uid,
       given_name: "Admin",
       family_name: "Test",
-      role_code: CIS2Info::ADMIN_ROLE,
+      role_code: CIS2Info::MEDICAL_SECRETARY_ROLE,
       org_code: @team.organisation.ods_code,
       org_name: @team.name,
       workgroups: [@team.workgroup]
diff --git a/spec/features/verbal_consent_but_no_triage_for_admin_spec.rb b/spec/features/verbal_consent_but_no_triage_for_admin_spec.rb
@@ -20,7 +20,7 @@ def given_i_am_signed_in_as_an_admin
 
     StatusUpdater.call
 
-    sign_in team.users.first, role: :admin
+    sign_in team.users.first, role: :medical_secretary
   end
 
   def when_i_record_that_consent_was_given_but_keep_in_triage
diff --git a/spec/models/session_spec.rb b/spec/models/session_spec.rb
@@ -329,8 +329,8 @@
       end
     end
 
-    context "with an admin staff" do
-      let(:user) { create(:admin) }
+    context "with a medical secretary" do
+      let(:user) { create(:medical_secretary) }
 
       it { should be_empty }
     end
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
@@ -57,10 +57,10 @@
   describe "#role_description" do
     subject { user.role_description }
 
-    context "when the user is an admin" do
-      let(:user) { build(:admin) }
+    context "when the user is a medical secretary" do
+      let(:user) { build(:medical_secretary) }
 
-      it { should eq("Administrator") }
+      it { should eq("Medical secretary") }
     end
 
     context "when the user is a nurse" do
@@ -70,24 +70,24 @@
     end
 
     context "when the user is a superuser" do
-      let(:user) { build(:admin, :superuser) }
+      let(:user) { build(:medical_secretary, :superuser) }
 
-      it { should eq("Administrator (Superuser)") }
+      it { should eq("Medical secretary (Superuser)") }
     end
   end
 
-  describe "#is_admin?" do
-    subject { user.is_admin? }
+  describe "#is_medical_secretary?" do
+    subject { user.is_medical_secretary? }
 
     context "cis2 is enabled", cis2: :enabled do
-      context "when the user is an admin" do
-        let(:user) { build(:admin) }
+      context "when the user is a medical secretary" do
+        let(:user) { build(:medical_secretary) }
 
         it { should be(true) }
       end
 
       context "when the user is an admin and superuser" do
-        let(:user) { build(:admin, :superuser) }
+        let(:user) { build(:medical_secretary, :superuser) }
 
         it { should be(true) }
       end
@@ -100,14 +100,14 @@
     end
 
     context "cis2 is disabled", cis2: :disabled do
-      context "when the user is an admin" do
-        let(:user) { build(:admin) }
+      context "when the user is a medical secretary" do
+        let(:user) { build(:medical_secretary) }
 
         it { should be(true) }
       end
 
       context "when the user is an admin and superuser" do
-        let(:user) { build(:admin, :superuser) }
+        let(:user) { build(:medical_secretary, :superuser) }
 
         it { should be(false) }
       end
@@ -130,8 +130,8 @@
         it { should be(true) }
       end
 
-      context "when the user is admin staff" do
-        let(:user) { build(:admin) }
+      context "when the user is a medical secretary" do
+        let(:user) { build(:medical_secretary) }
 
         it { should be(false) }
       end
@@ -144,8 +144,8 @@
         it { should be(true) }
       end
 
-      context "when the user is admin staff" do
-        let(:user) { build(:admin) }
+      context "when the user is a medical secretary" do
+        let(:user) { build(:medical_secretary) }
 
         it { should be(false) }
       end
@@ -162,8 +162,8 @@
         it { should be(false) }
       end
 
-      context "when the user is admin staff" do
-        let(:user) { build(:admin) }
+      context "when the user is a medical secretary" do
+        let(:user) { build(:medical_secretary) }
 
         it { should be(false) }
       end
@@ -182,8 +182,8 @@
         it { should be(false) }
       end
 
-      context "when the user is admin staff" do
-        let(:user) { build(:admin) }
+      context "when the user is a medical secretary" do
+        let(:user) { build(:medical_secretary) }
 
         it { should be(false) }
       end
@@ -206,8 +206,8 @@
         it { should be(false) }
       end
 
-      context "when the user is admin staff" do
-        let(:user) { build(:admin) }
+      context "when the user is a medical secretary" do
+        let(:user) { build(:medical_secretary) }
 
         it { should be(false) }
       end
@@ -226,8 +226,8 @@
         it { should be(false) }
       end
 
-      context "when the user is admin staff" do
-        let(:user) { build(:admin) }
+      context "when the user is a medical secretary" do
+        let(:user) { build(:medical_secretary) }
 
         it { should be(false) }
       end
@@ -244,19 +244,19 @@
     subject { user.is_superuser? }
 
     context "cis2 is enabled", cis2: :enabled do
-      context "when the user is an admin" do
-        let(:user) { build(:admin) }
+      context "when the user is a medical secretary" do
+        let(:user) { build(:medical_secretary) }
 
         it { should be(false) }
 
         context "with superuser access" do
-          let(:user) { build(:admin, :superuser) }
+          let(:user) { build(:medical_secretary, :superuser) }
 
           it { should be(true) }
         end
 
         context "without workgroups" do
-          let(:user) { build(:admin, role_workgroups: []) }
+          let(:user) { build(:medical_secretary, role_workgroups: []) }
 
           it { should be(false) }
         end
@@ -282,13 +282,13 @@
     end
 
     context "cis2 is disabled", cis2: :disabled do
-      context "when the user is an admin" do
-        let(:user) { build(:admin) }
+      context "when the user is a medical secretary" do
+        let(:user) { build(:medical_secretary) }
 
         it { should be(false) }
 
         context "with superuser access" do
-          let(:user) { build(:admin, :superuser) }
+          let(:user) { build(:medical_secretary, :superuser) }
 
           it { should be(true) }
         end
diff --git a/spec/policies/gillick_assessment_policy_spec.rb b/spec/policies/gillick_assessment_policy_spec.rb
diff --git a/spec/policies/programme_policy_spec.rb b/spec/policies/programme_policy_spec.rb
diff --git a/spec/policies/session_policy_spec.rb b/spec/policies/session_policy_spec.rb
diff --git a/spec/policies/triage_policy_spec.rb b/spec/policies/triage_policy_spec.rb
diff --git a/spec/policies/vaccination_record_policy_spec.rb b/spec/policies/vaccination_record_policy_spec.rb
diff --git a/spec/support/cis2_auth_helper.rb b/spec/support/cis2_auth_helper.rb
