Create ConsentRefusalFollowUpForm

Use a form class for the follow-up journey on the nurse/SAIS side.
This means validations no longer happen in the controller. Uses session
persistence so decisions from previous steps in the journey are retained.

Author: murugapl

app/controllers/patient_sessions/consents_controller.rb

@@ -2,6 +2,10 @@
 
 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
@@ -63,25 +67,29 @@ def edit_follow_up
   end
 
   def update_follow_up
-    if follow_up_params[:decision_stands].nil?
-      @consent.errors.add(:decision_stands, :blank)
-      render :follow_up, status: :unprocessable_content
-    elsif follow_up_params[:decision_stands] == "true"
-      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")
+    @form.assign_attributes(follow_up_params)
+
+    if @form.valid?
+      if @form.decision_stands?
+        redirect_to confirm_refusal_session_patient_programme_consent_path
       else
-        render :follow_up, status: :unprocessable_content
+        @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
 
@@ -90,29 +98,30 @@ def edit_confirm_refusal
   end
 
   def update_confirm_refusal
-    if confirm_refusal_params[:confirmed].nil?
-      @consent.errors.add(:confirmed, :blank)
-      render :confirm_refusal, status: :unprocessable_content
-    elsif confirm_refusal_params[:confirmed] == "true"
-      ActiveRecord::Base.transaction do
+    @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
         )
-      end
 
-      @consent.notifier.send_confirmation(
-        session: @session,
-        triage: nil,
-        sent_by: current_user
-      )
+        @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."
-                  }
+        redirect_to session_patient_programme_consent_path,
+                    flash: {
+                      success: "Consent from #{@consent.name} updated."
+                    }
+      else
+        redirect_to session_patient_programme_consent_path
+      end
     else
-      redirect_to session_patient_programme_consent_path
+      render :confirm_refusal, status: :unprocessable_content
     end
   end
 
@@ -173,6 +182,14 @@ def set_consent
         .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!
 
@@ -201,11 +218,11 @@ def create_params
   end
 
   def follow_up_params
-    params.permit(consent: :decision_stands)[:consent] || {}
+    params.fetch(:consent_follow_up_form, {}).permit(:decision_stands)
   end
 
   def confirm_refusal_params
-    params.permit(consent: %i[confirmed notes])[:consent] || {}
+    params.fetch(:consent_confirm_refusal_form, {}).permit(:confirmed, :notes)
   end
 
   def withdraw_params

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

app/models/consent.rb

@@ -66,8 +66,6 @@ class Consent < ApplicationRecord
   include Notable
   include Refusable
 
-  attr_accessor :confirmed, :decision_stands
-
   audited associated_with: :patient
 
   belongs_to :patient

app/views/patient_sessions/consents/confirm_refusal.html.erb

@@ -2,7 +2,7 @@
   <%= govuk_back_link(href: follow_up_session_patient_programme_consent_path) %>
 <% end %>
 
-<%= form_with model: @consent, url: confirm_refusal_session_patient_programme_consent_path, method: :post do |f| %>
+<%= form_with model: @form, url: confirm_refusal_session_patient_programme_consent_path, method: :post do |f| %>
   <%= f.mavis_error_summary %>
 
   <% page_title = "Update consent response" %>

app/views/patient_sessions/consents/follow_up.html.erb

@@ -2,7 +2,7 @@
   <%= govuk_back_link(href: session_patient_programme_consent_path) %>
 <% end %>
 
-<%= form_with model: @consent, url: follow_up_session_patient_programme_consent_path, method: :post do |f| %>
+<%= form_with model: @form, url: follow_up_session_patient_programme_consent_path, method: :post do |f| %>
   <%= f.mavis_error_summary %>
 
   <% page_title = "Follow up refusal" %>

config/locales/en.yml

@@ -259,6 +259,14 @@ en:
                 Choose which nurse identified and pre-screened the child and supplied the vaccine
             vaccine_method:
               inclusion: Choose if they are ready to vaccinate
+        consent_refusal_follow_up_form:
+          attributes:
+            decision_stands:
+              inclusion: Select yes or no
+            confirmed:
+              inclusion: Select yes or no
+            notes:
+              too_long: Enter notes that are less than %{count} characters long
         vaccination_report:
           attributes:
             academic_year:
@@ -447,10 +455,6 @@ en:
               blank: Choose a file
         consent:
           attributes:
-            confirmed:
-              blank: Select yes or no
-            decision_stands:
-              blank: Select yes or no
             notes:
               blank: Enter notes
               too_long: Enter notes that are less than %{count} characters long

spec/forms/consent_confirm_refusal_form_spec.rb

@@ -0,0 +1,57 @@
+# frozen_string_literal: true
+
+describe ConsentConfirmRefusalForm do
+  subject(:form) { described_class.new }
+
+  describe "validations" do
+    it "is invalid without confirmed" do
+      expect(form).not_to be_valid
+    end
+
+    context "with confirmed set to true" do
+      before { form.confirmed = "true" }
+
+      it { should be_valid }
+    end
+
+    context "with confirmed set to false" do
+      before { form.confirmed = "false" }
+
+      it { should be_valid }
+    end
+
+    context "with notes exceeding 1000 characters" do
+      before do
+        form.confirmed = "true"
+        form.notes = "a" * 1001
+      end
+
+      it { should_not be_valid }
+    end
+
+    context "with notes at exactly 1000 characters" do
+      before do
+        form.confirmed = "true"
+        form.notes = "a" * 1000
+      end
+
+      it { should be_valid }
+    end
+  end
+
+  describe "#confirmed?" do
+    it "returns true when confirmed is 'true'" do
+      form.confirmed = "true"
+      expect(form.confirmed?).to be true
+    end
+
+    it "returns false when confirmed is 'false'" do
+      form.confirmed = "false"
+      expect(form.confirmed?).to be false
+    end
+
+    it "returns false when confirmed is nil" do
+      expect(form.confirmed?).to be false
+    end
+  end
+end

spec/forms/consent_follow_up_form_spec.rb

@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+
+describe ConsentFollowUpForm do
+  subject(:form) { described_class.new }
+
+  describe "validations" do
+    it "is invalid without decision_stands" do
+      expect(form).not_to be_valid
+    end
+
+    context "with decision_stands set to true" do
+      before { form.decision_stands = "true" }
+
+      it { should be_valid }
+    end
+
+    context "with decision_stands set to false" do
+      before { form.decision_stands = "false" }
+
+      it { should be_valid }
+    end
+
+    context "with an invalid decision_stands value" do
+      before { form.decision_stands = "maybe" }
+
+      it { should_not be_valid }
+    end
+  end
+
+  describe "#decision_stands?" do
+    it "returns true when decision_stands is 'true'" do
+      form.decision_stands = "true"
+      expect(form.decision_stands?).to be true
+    end
+
+    it "returns false when decision_stands is 'false'" do
+      form.decision_stands = "false"
+      expect(form.decision_stands?).to be false
+    end
+
+    it "returns false when decision_stands is nil" do
+      expect(form.decision_stands?).to be false
+    end
+  end
+end