Merge pull request #6382 from NHSDigital/follow-up-record-flow

Follow up record flow

Author: murugapl

app/components/app_activity_log_component.rb

@@ -219,7 +219,7 @@ def consent_events
       original_response =
         if consent.withdrawn?
           "given"
-        elsif consent.follow_up_requested?
+        elsif consent.follow_up_requested? || consent.follow_up_resolved?
           "follow_up_requested"
         else
           consent.response
@@ -259,7 +259,7 @@ def consent_events
         }
       end
 
-      if consent.invalidated?
+      if consent.invalidated? && !consent.follow_up_resolved?
         events << {
           title: "Consent from #{consent.name} invalidated",
           at: consent.invalidated_at,
@@ -275,6 +275,16 @@ def consent_events
         }
       end
 
+      if consent.follow_up_resolved?
+        events << {
+          title:
+            "Consent response from #{consent.name} (#{consent.who_responded.downcase_first}) " \
+              "followed-up: refusal #{consent.follow_up_outcome}",
+          at: consent.follow_up_resolved_at,
+          programmes: [consent.programme]
+        }
+      end
+
       events
     end
   end

app/components/app_consent_summary_component.rb

@@ -6,6 +6,7 @@ def initialize(
     change_links: {},
     show_email_address: false,
     show_notes: false,
+    show_parent_name: false,
     show_notify_parent: false,
     show_phone_number: false,
     show_programme: false,
@@ -15,6 +16,7 @@ def initialize(
     @change_links = change_links
     @show_email_address = show_email_address
     @show_notes = show_notes
+    @show_parent_name = show_parent_name
     @show_notify_parent = show_notify_parent
     @show_phone_number = show_phone_number
     @show_programme = show_programme
@@ -27,6 +29,7 @@ def call = govuk_summary_list(rows:, actions: @change_links.present?)
 
   attr_reader :consent,
               :change_links,
+              :show_parent_name,
               :show_phone_number,
               :show_email_address,
               :show_programme,
@@ -37,12 +40,14 @@ def call = govuk_summary_list(rows:, actions: @change_links.present?)
   delegate :programme, to: :consent
   delegate :consent_response_tag,
            :govuk_summary_list,
+           :consent_parent_name,
            :consent_parent_email,
            :consent_parent_phone,
            to: :helpers
 
   def rows
     [
+      parent_name_row,
       phone_number_row,
       email_address_row,
       programme_row,
@@ -57,6 +62,12 @@ def rows
     ].compact
   end
 
+  def parent_name_row
+    if show_parent_name && (name = consent_parent_name(consent)).present?
+      { key: { text: "Parent" }, value: { text: name } }
+    end
+  end
+
   def phone_number_row
     if show_phone_number && (phone = consent_parent_phone(consent)).present?
       { key: { text: "Phone number" }, value: { text: phone } }

app/components/app_session_actions_component.rb

@@ -30,6 +30,7 @@ def rows
       no_nhs_number_row,
       unmatched_consent_row,
       no_consent_response_row,
+      follow_up_requested_row,
       conflicting_consent_row,
       triage_required_row,
       register_attendance_row,
@@ -73,6 +74,24 @@ def no_consent_response_row
     generate_row(:children_with_no_consent_response, count:, href:, actions:)
   end
 
+  def follow_up_requested_row
+    count =
+      patients.has_programme_status(
+        "needs_consent_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]
+      )
+
+    generate_row(:children_with_follow_up_requested, count:, href:)
+  end
+
   def conflicting_consent_row
     count =
       patients.has_programme_status(

app/controllers/draft_consents_controller.rb

@@ -42,7 +42,10 @@ def update
 
     @draft_consent.seed_health_questions if current_step == :agree
 
-    jump_to("confirm") if @draft_consent.editing? && current_step != :confirm
+    if @draft_consent.editing? && !@draft_consent.follow_up_flow? &&
+         current_step != :confirm
+      jump_to("confirm")
+    end
 
     reload_steps
 
@@ -82,6 +85,15 @@ def handle_confirm
       PatientStatusUpdater.call(patient: @patient)
     end
 
+    if (old_consent_id = @draft_consent.follow_up_consent_id)
+      Consent.find(old_consent_id).resolve_follow_up!(
+        outcome: :withdrawn,
+        notes:
+          "#{@draft_consent.human_enum_name(:response)} in follow-up discussion.",
+        invalidate: true
+      )
+    end
+
     if @draft_consent.send_confirmation?
       @consent.notifier.send_confirmation(
         session: @session,

app/controllers/patient_sessions/consents_controller.rb

@@ -2,6 +2,17 @@
 
 class PatientSessions::ConsentsController < PatientSessions::BaseController
   before_action :set_consent, except: %i[create send_request]
+  before_action :set_consent_follow_up_form,
+                only: %i[edit_follow_up update_follow_up]
+  before_action :set_consent_confirm_refusal_form,
+                only: %i[edit_confirm_refusal update_confirm_refusal]
+  before_action :ensure_can_follow_up,
+                only: %i[
+                  edit_follow_up
+                  update_follow_up
+                  edit_confirm_refusal
+                  update_confirm_refusal
+                ]
   before_action :ensure_can_withdraw, only: %i[edit_withdraw update_withdraw]
   before_action :ensure_can_invalidate,
                 only: %i[edit_invalidate update_invalidate]
@@ -51,6 +62,69 @@ def send_request
   def show
   end
 
+  def edit_follow_up
+    render :follow_up
+  end
+
+  def update_follow_up
+    @form.assign_attributes(follow_up_params)
+
+    if @form.valid?
+      if @form.decision_stands?
+        redirect_to confirm_refusal_session_patient_programme_consent_path
+      else
+        @draft_consent =
+          DraftConsent.new(request_session: session, current_user:)
+        @draft_consent.clear_attributes
+        @draft_consent.assign_attributes(create_params)
+        @draft_consent.follow_up_consent_id = @consent.id
+        @draft_consent.follow_up_flow = true
+        @draft_consent.new_or_existing_contact = @consent.parent_id.to_s
+        @draft_consent.route = "phone"
+
+        if @draft_consent.save
+          redirect_to draft_consent_path("agree")
+        else
+          render :follow_up, status: :unprocessable_content
+        end
+      end
+    else
+      render :follow_up, status: :unprocessable_content
+    end
+  end
+
+  def edit_confirm_refusal
+    render :confirm_refusal
+  end
+
+  def update_confirm_refusal
+    @form.assign_attributes(confirm_refusal_params)
+
+    if @form.valid?
+      if @form.confirmed?
+        @consent.resolve_follow_up!(
+          outcome: :confirmed,
+          notes: confirm_refusal_params[:notes].to_s
+        )
+
+        @consent.notifier.send_confirmation(
+          session: @session,
+          triage: nil,
+          sent_by: current_user
+        )
+
+        redirect_to session_patient_programme_consent_path,
+                    flash: {
+                      success: "Consent from #{@consent.name} updated."
+                    }
+      else
+        redirect_to session_patient_programme_consent_path
+      end
+    else
+      render :confirm_refusal, status: :unprocessable_content
+    end
+  end
+
   def edit_withdraw
     render :withdraw
   end
@@ -104,16 +178,28 @@ def set_consent
       @patient
         .consents
         .where(academic_year: @session.academic_year)
-        .includes(:consent_form, :parent, patient: :parent_relationships)
+        .includes(:consent_form, :parent, :team, patient: :parent_relationships)
         .find(params[:id])
   end
 
+  def set_consent_follow_up_form
+    @form = ConsentFollowUpForm.new
+  end
+
+  def set_consent_confirm_refusal_form
+    @form = ConsentConfirmRefusalForm.new
+  end
+
   def update_patient_status
     @consent.invalidate_all_triages_and_patient_specific_directions!
 
     PatientStatusUpdater.call(patient: @patient)
   end
 
+  def ensure_can_follow_up
+    redirect_to action: :show unless @consent.can_follow_up?
+  end
+
   def ensure_can_withdraw
     redirect_to action: :show unless @consent.can_withdraw?
   end
@@ -131,6 +217,14 @@ def create_params
     }
   end
 
+  def follow_up_params
+    params.fetch(:consent_follow_up_form, {}).permit(:decision_stands)
+  end
+
+  def confirm_refusal_params
+    params.fetch(:consent_confirm_refusal_form, {}).permit(:confirmed, :notes)
+  end
+
   def withdraw_params
     params.expect(consent: %i[reason_for_refusal notes]).merge(
       response: "refused",

app/controllers/patients_controller.rb

@@ -96,8 +96,7 @@ def set_programme_statuses
         []
       else
         Patient::ProgrammeStatus.statuses.keys -
-          Patient::ProgrammeStatus::NOT_ELIGIBLE_STATUSES.keys -
-          %w[needs_consent_follow_up_requested]
+          Patient::ProgrammeStatus::NOT_ELIGIBLE_STATUSES.keys
       end
   end
 

app/controllers/schools/patients_controller.rb

@@ -54,7 +54,6 @@ def index
   def set_programme_statuses
     @programme_statuses =
       Patient::ProgrammeStatus.statuses.keys -
-        Patient::ProgrammeStatus::NOT_ELIGIBLE_STATUSES.keys -
-        %w[needs_consent_follow_up_requested]
+        Patient::ProgrammeStatus::NOT_ELIGIBLE_STATUSES.keys
   end
 end

app/controllers/sessions/base_controller.rb

@@ -17,7 +17,6 @@ def set_session
   def set_programme_statuses
     @programme_statuses =
       Patient::ProgrammeStatus.statuses.keys -
-        Patient::ProgrammeStatus::NOT_ELIGIBLE_STATUSES.keys -
-        %w[needs_consent_follow_up_requested]
+        Patient::ProgrammeStatus::NOT_ELIGIBLE_STATUSES.keys
   end
 end

app/forms/consent_confirm_refusal_form.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+class ConsentConfirmRefusalForm
+  include ActiveModel::Model
+  include ActiveModel::Attributes
+
+  attribute :confirmed, :string
+  attribute :notes, :string
+
+  validates :confirmed,
+            inclusion: {
+              in: %w[true false],
+              message: "Select yes or no"
+            }
+  validates :notes, length: { maximum: 1000 }
+
+  def confirmed? = confirmed == "true"
+end

app/forms/consent_follow_up_form.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+class ConsentFollowUpForm
+  include ActiveModel::Model
+  include ActiveModel::Attributes
+
+  attribute :decision_stands, :string
+
+  validates :decision_stands,
+            inclusion: {
+              in: %w[true false],
+              message: "Select yes or no"
+            }
+
+  def decision_stands? = decision_stands == "true"
+end