Merge pull request #6658 from NHSDigital/has-refusal-follow-up-requested

Make "Follow-up requested" a sub-status of "Has a refusal"

Author: murugapl

app/components/app_patient_search_form_component.rb

@@ -1,8 +1,11 @@
 # frozen_string_literal: true
 
 class AppPatientSearchFormComponent < ViewComponent::Base
-  # Remove these statuses once implemented.
-  HIDDEN_PROGRAMME_STATUSES = %w[needs_consent_request_failed].freeze
+  # Remove these statuses once implemented or fully migrated.
+  HIDDEN_PROGRAMME_STATUSES = %w[
+    needs_consent_follow_up_requested
+    needs_consent_request_failed
+  ].freeze
 
   def initialize(
     form,

app/components/app_session_actions_component.rb

@@ -81,16 +81,16 @@ def no_consent_response_row
   def follow_up_requested_row
     count =
       patients.has_programme_status(
-        "needs_consent_follow_up_requested",
+        "has_refusal_follow_up_requested",
         programme: programmes,
         academic_year:
       ).count
 
     href =
       session_patients_path(
         session,
-        programme_status_group: "needs_consent",
-        programme_statuses: %w[needs_consent_follow_up_requested]
+        programme_status_group: "has_refusal",
+        programme_statuses: %w[has_refusal_follow_up_requested]
       )
 
     generate_row(:children_with_follow_up_requested, count:, href:)

app/lib/status_generator/programme.rb

@@ -74,8 +74,8 @@ def status
       :has_refusal_consent_conflicts
     elsif should_be_has_refusal_consent_refused?
       :has_refusal_consent_refused
-    elsif should_be_needs_consent_follow_up_requested?
-      :needs_consent_follow_up_requested
+    elsif should_be_has_refusal_follow_up_requested?
+      :has_refusal_follow_up_requested
     elsif should_be_needs_consent_request_failed?
       :needs_consent_request_failed
     elsif should_be_needs_consent_request_scheduled?
@@ -232,7 +232,7 @@ def should_be_has_refusal_consent_refused?
     consent_status == :refused
   end
 
-  def should_be_needs_consent_follow_up_requested?
+  def should_be_has_refusal_follow_up_requested?
     consent_status == :follow_up_requested
   end
 

app/models/patient/programme_status.rb

@@ -103,7 +103,8 @@ class Patient::ProgrammeStatus < ApplicationRecord
 
   HAS_REFUSAL_STATUSES = {
     "has_refusal_consent_conflicts" => 20,
-    "has_refusal_consent_refused" => 21
+    "has_refusal_consent_refused" => 21,
+    "has_refusal_follow_up_requested" => 22
   }.freeze
 
   NEEDS_TRIAGE_STATUSES = { "needs_triage" => 30 }.freeze

config/locales/status.en.yml

@@ -60,6 +60,7 @@ en:
         has_refusal_consent_conflicts: Has a refusal
         has_refusal_consent_refused: Has a refusal
         needs_consent: Needs consent
+        has_refusal_follow_up_requested: Has a refusal
         needs_consent_follow_up_requested: Needs consent
         needs_consent_no_response: Needs consent
         needs_consent_request_failed: Needs consent
@@ -88,6 +89,7 @@ en:
         has_refusal_consent_conflicts: orange
         has_refusal_consent_refused: orange
         needs_consent: blue
+        has_refusal_follow_up_requested: orange
         needs_consent_follow_up_requested: blue
         needs_consent_no_response: blue
         needs_consent_request_failed: blue
@@ -108,6 +110,7 @@ en:
         cannot_vaccinate_unwell: Child unwell
         has_refusal_consent_conflicts: Conflicting consent
         has_refusal_consent_refused: Consent refused
+        has_refusal_follow_up_requested: Follow-up requested
         needs_consent_follow_up_requested: Follow-up requested
         needs_consent_no_response: No response
         needs_consent_request_failed: Request failed

db/data/20260421100000_update_follow_up_requested_programme_status.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+class UpdateFollowUpRequestedProgrammeStatus < ActiveRecord::Migration[8.1]
+  def up
+    PatientStatusUpdater.call(
+      patient_scope:
+        Patient.has_programme_status(
+          "needs_consent_follow_up_requested", 
+          programme: Programme.all,
+          academic_year: AcademicYear.current
+        )
+    )
+  end
+
+  def down
+    raise ActiveRecord::IrreversibleMigration
+  end
+end

spec/factories/patient_programme_statuses.rb

@@ -53,9 +53,9 @@
       status { "has_refusal_consent_conflicts" }
     end
 
-    trait :needs_consent_follow_up_requested do
+    trait :has_refusal_follow_up_requested do
       consent_status { "follow_up_requested" }
-      status { "needs_consent_follow_up_requested" }
+      status { "has_refusal_follow_up_requested" }
     end
 
     trait :needs_consent_no_contact_details do

spec/factories/patients.rb

@@ -242,7 +242,7 @@
         programmes.map do |programme|
           association(
             :patient_programme_status,
-            :needs_consent_follow_up_requested,
+            :has_refusal_follow_up_requested,
             patient: instance,
             programme:,
             academic_year:

spec/lib/status_generator/programme_spec.rb

@@ -368,7 +368,7 @@
     its(:disease_types) { should be_nil }
     its(:dose_sequence) { should eq(1) }
     its(:location_id) { should be_nil }
-    its(:status) { should be(:needs_consent_follow_up_requested) }
+    its(:status) { should be(:has_refusal_follow_up_requested) }
     its(:vaccine_methods) { should be_nil }
     its(:without_gelatine) { should be_nil }
   end