Use parent fields on consent forms

This updates the consent flow to use the parent fields on the consent
forms directly rather than referring to the related parent, which no
longer exists.

Author: thomasleese

app/components/app_matching_criteria_component.rb

@@ -10,7 +10,7 @@ def initialize(consent_form:)
   end
 
   def parent_name
-    @consent_form.parent.name
+    @consent_form.parent_name
   end
 
   def child_full_name
@@ -31,6 +31,6 @@ def address_fields
   end
 
   def parent_guardian_or_other
-    @consent_form.parent.relationship_label
+    @consent_form.parent_relationship_label
   end
 end

app/controllers/parent_interface/consent_forms/edit_controller.rb

@@ -7,8 +7,7 @@ class ConsentForms::EditController < ConsentForms::BaseController
     before_action :set_steps
     before_action :setup_wizard_translated
     before_action :validate_params, only: %i[update]
-    before_action :set_parent
-    before_action :set_health_answer, if: -> { is_health_question_step? }
+    before_action :set_health_answer, if: :is_health_question_step?
     before_action :set_follow_up_changes_start_page, only: %i[show]
 
     def show
@@ -17,45 +16,36 @@ def show
 
     def update
       model = @consent_form
+
       if is_health_question_step?
         @health_answer.assign_attributes(health_answer_params)
 
-        @consent_form.assign_attributes(
+        model.assign_attributes(
           wizard_step: current_step,
           health_question_number: @question_number
         )
-      elsif current_step.in?(%i[parent contact_method])
-        model = @consent_form.draft_parent
-        model.assign_attributes(parent_params)
-
-        if @consent_form.draft_parent.parental_responsibility == "no"
-          return(
-            redirect_to session_parent_interface_consent_form_cannot_consent_responsibility_path(
-                          @session,
-                          @consent_form
-                        )
-          )
-        end
-
-        if model.valid?
-          @consent_form.update!(wizard_step: current_step, draft_parent: model)
-        end
       else
         @consent_form.assign_attributes(update_params)
       end
 
-      set_steps # The wizard_steps can change after certain attrs change
-      setup_wizard_translated # Next/previous steps can change after steps change
-
       if current_step == :school && @consent_form.is_this_their_school == "no"
-        return(
-          redirect_to session_parent_interface_consent_form_cannot_consent_school_path(
-                        @session,
-                        @consent_form
-                      )
-        )
+        redirect_to session_parent_interface_consent_form_cannot_consent_school_path(
+                      @session,
+                      @consent_form
+                    ) and return
       end
 
+      if current_step == :parent &&
+           @consent_form.parental_responsibility == "no"
+        redirect_to session_parent_interface_consent_form_cannot_consent_responsibility_path(
+                      @session,
+                      @consent_form
+                    ) and return
+      end
+
+      set_steps # The wizard_steps can change after certain attrs change
+      setup_wizard_translated # Next/previous steps can change after steps change
+
       skip_to_confirm_or_next_health_question
 
       render_wizard model
@@ -83,7 +73,18 @@ def update_params
           date_of_birth(1i)
         ],
         school: %i[is_this_their_school],
-        contact_method: %i[contact_method_type contact_method_other_details],
+        parent: %i[
+          parent_email
+          parent_name
+          parent_phone
+          parent_relationship_other_name
+          parent_relationship_type
+          parental_responsibility
+        ],
+        contact_method: %i[
+          parent_contact_method_type
+          parent_contact_method_other_details
+        ],
         consent: %i[response],
         reason: %i[reason],
         reason_notes: %i[reason_notes],
@@ -98,21 +99,6 @@ def update_params
         .merge(wizard_step: current_step)
     end
 
-    def parent_params
-      params.fetch(:parent, {}).permit(
-        %i[
-          name
-          email
-          phone
-          relationship
-          relationship_other
-          contact_method_type
-          contact_method_other_details
-          parental_responsibility
-        ]
-      )
-    end
-
     def health_answer_params
       params.fetch(:health_answer, {}).permit(%i[response notes])
     end
@@ -132,10 +118,6 @@ def set_health_answer
       @health_answer = @consent_form.health_answers[@question_number]
     end
 
-    def set_parent
-      @consent_form.build_draft_parent if @consent_form.draft_parent.blank?
-    end
-
     def validate_params
       case current_step
       when :date_of_birth

app/controllers/parent_interface/consent_forms_controller.rb

@@ -40,7 +40,6 @@ def confirm
 
     def record
       ActiveRecord::Base.transaction do
-        @consent_form.draft_parent.update!(recorded_at: Time.zone.now)
         @consent_form.update!(recorded_at: Time.zone.now)
       end
 

app/mailers/application_mailer.rb

@@ -19,7 +19,7 @@ def opts(session, patient, parent)
   end
 
   def to
-    @parent.email
+    @parent.is_a?(ConsentForm) ? @parent.parent_email : @parent.email
   end
 
   def reply_to_id
@@ -61,7 +61,7 @@ def short_patient_name_apos
   end
 
   def parent_name
-    @parent.name
+    @parent.is_a?(ConsentForm) ? @parent.parent_name : @parent.name
   end
 
   def location_name

app/mailers/consent_form_mailer.rb

@@ -53,7 +53,7 @@ def opts(consent_form, consent, session = nil)
     @consent = consent
 
     patient = consent_form || consent.patient
-    parent = consent_form&.parent || consent.parent
+    parent = consent_form || consent.parent
 
     super(session || consent_form.session, patient, parent)
   end

app/models/cohort_import_row.rb

@@ -17,7 +17,7 @@ class CohortImportRow
   validates :parent_name, presence: true
   validates :parent_relationship, presence: true
   validates :parent_email, presence: true, notify_safe_email: true
-  validates :parent_phone, phone: true, if: -> { parent_phone.present? }
+  validates :parent_phone, phone: { allow_blank: true }
 
   validate :zero_or_one_existing_patient
 

app/models/consent_form.rb

@@ -79,6 +79,19 @@ class ConsentForm < ApplicationRecord
        prefix: "refused_because"
   enum :gp_response, %w[yes no dont_know], prefix: true
 
+  enum :parent_contact_method_type,
+       Parent.contact_method_types,
+       prefix: :parent_contact_method,
+       validate: {
+         allow_nil: true
+       }
+  enum :parent_relationship_type,
+       ParentRelationship.types,
+       prefix: :parent_relationship,
+       validate: {
+         allow_nil: true
+       }
+
   serialize :health_answers, coder: HealthAnswer::ArraySerializer
 
   encrypts :address_line_1,
@@ -90,6 +103,11 @@ class ConsentForm < ApplicationRecord
            :gp_name,
            :health_answers,
            :last_name,
+           :parent_contact_method_other_details,
+           :parent_email,
+           :parent_name,
+           :parent_phone,
+           :parent_relationship_other_name,
            :reason_notes
 
   validates :address_line_1,
@@ -99,10 +117,23 @@ class ConsentForm < ApplicationRecord
             :first_name,
             :gp_name,
             :last_name,
+            :parent_contact_method_other_details,
+            :parent_name,
+            :parent_relationship_other_name,
             length: {
               maximum: 300
             }
 
+  validates :parent_contact_method_other_details,
+            presence: true,
+            if: :parent_contact_method_other?
+
+  validates :parent_phone, phone: { allow_blank: true }
+
+  validates :parent_relationship_other_name,
+            presence: true,
+            if: :parent_relationship_other?
+
   validates :reason_notes, length: { maximum: 1000 }
 
   on_wizard_step :name do
@@ -126,6 +157,24 @@ class ConsentForm < ApplicationRecord
     validates :is_this_their_school, inclusion: { in: %w[yes no] }
   end
 
+  on_wizard_step :parent do
+    validates :parent_name, presence: true
+    validates :parent_email, notify_safe_email: true
+    validates :parent_relationship_type, presence: true
+  end
+
+  validates :parental_responsibility,
+            inclusion: {
+              in: ["yes"]
+            },
+            if: ->(object) do
+              object.parent_relationship_other? && object.wizard_step == :parent
+            end
+
+  on_wizard_step :contact_method do
+    validates :parent_contact_method_type, presence: true
+  end
+
   on_wizard_step :consent do
     validates :response, presence: true
   end
@@ -209,10 +258,6 @@ def any_health_answers_truthy?
     health_answers.any? { _1.response == "yes" }
   end
 
-  def who_responded
-    parent&.relationship_label
-  end
-
   def gelatine_content_status_in_vaccines
     # we don't YET track the vaccine type that the user is agreeing to in the consent form,
     # so we have to check all vaccines
@@ -278,6 +323,20 @@ def summary_with_route
     "#{human_enum_name(:response).capitalize} (online)"
   end
 
+  def parent_contact_method_description
+    Parent.new(
+      contact_method_type: parent_contact_method_type,
+      contact_method_other_details: parent_contact_method_other_details
+    ).contact_method_description
+  end
+
+  def parent_relationship_label
+    ParentRelationship.new(
+      type: parent_relationship_type,
+      other_name: parent_relationship_other_name
+    ).label
+  end
+
   private
 
   def refused_and_not_had_it_already?
@@ -320,7 +379,7 @@ def health_answers_valid?
   end
 
   def ask_for_contact_method?
-    Flipper.enabled?(:parent_contact_method) && draft_parent&.phone.present?
+    Flipper.enabled?(:parent_contact_method) && parent_phone.present?
   end
 
   # Because there are branching paths in the consent form journey, fields
@@ -340,6 +399,12 @@ def reset_unused_fields
       self.health_answers = []
     end
 
+    self.parent_contact_method_type = nil if parent_phone.blank?
+    self.parent_contact_method_other_details =
+      nil unless parent_contact_method_other?
+
+    self.parent_relationship_other_name = nil unless parent_relationship_other?
+
     if consent_given?
       self.contact_injection = nil
 

app/models/parent.rb

@@ -50,7 +50,7 @@ class Parent < ApplicationRecord
   normalizes :email, with: ->(str) { str.nil? ? nil : str.to_s.downcase.strip }
 
   validates :name, presence: true
-  validates :phone, phone: true, if: -> { phone.present? }
+  validates :phone, phone: { allow_blank: true }
   validates :email, presence: true, notify_safe_email: true
   validates :relationship_other, presence: true, if: -> { relationship_other? }
   validate :has_parental_responsibility, if: -> { relationship_other? }
@@ -84,15 +84,9 @@ def contact_method_description
 
   def has_parental_responsibility
     return if parental_responsibility == "yes"
-    if parental_responsibility == "no" && validation_context != :manage_consent
-      return
-    end
+    return if parental_responsibility == "no"
 
-    if validation_context == :manage_consent
-      errors.add(:parental_responsibility, :inclusion)
-    else
-      errors.add(:parental_responsibility, :inclusion_on_consent_form)
-    end
+    errors.add(:parental_responsibility, :inclusion)
   end
 
   private

app/views/consent_forms/review_match.html.erb

@@ -10,7 +10,7 @@
   <div class="nhsuk-grid-column-two-thirds">
     <%= h1 page_title: do %>
       <span class="nhsuk-caption-l nhsuk-u-margin-top-2">
-        Consent response from <%= @consent_form.parent.name %>
+        Consent response from <%= @consent_form.parent_name %>
       </span>
       <%= page_title %>
     <% end %>
@@ -24,11 +24,11 @@
     <%= render AppCardComponent.new do |c|
           c.with_heading { "Consent response" }
           render AppConsentSummaryComponent.new(
-            name: @consent_form.parent.name,
-            relationship: @consent_form.who_responded,
+            name: @consent_form.parent_name,
+            relationship: @consent_form.parent_relationship_label,
             contact: {
-              phone: @consent_form.parent.phone,
-              email: @consent_form.parent.email,
+              phone: @consent_form.parent_phone,
+              email: @consent_form.parent_email,
             },
             response: {
               text: @consent_form.summary_with_route,

app/views/consent_forms/show.html.erb

@@ -8,7 +8,7 @@
 <% page_title = "Search for a child record" %>
 <%= h1 page_title: do %>
   <span class="nhsuk-caption-l nhsuk-u-margin-top-2">
-    Consent response from <%= @consent_form.parent.name %>
+    Consent response from <%= @consent_form.parent_name %>
   </span>
   <%= page_title %>
 <% end %>