Revert "Add needs_consent_no_contact_details status and supporting logic"

This reverts commit 3d555a7.

Author: jhenderson

app/lib/patient_status_updater.rb

@@ -48,8 +48,7 @@ def update_programme_statuses!
         :patient,
         :patient_locations,
         :triages,
-        :vaccination_records,
-        :parents
+        :vaccination_records
       )
       .find_in_batches(batch_size: 10_000) do |batch|
         batch.each(&:assign)

app/lib/status_generator/programme.rb

@@ -16,8 +16,7 @@ def initialize(
     consents:,
     triages:,
     attendance_record:,
-    vaccination_records:,
-    parents:
+    vaccination_records:
   )
     @programme_type = programme_type
     @academic_year = academic_year
@@ -26,8 +25,6 @@ def initialize(
     @consents = consents
     @triages = triages
     @attendance_record = attendance_record
-    @vaccination_records = vaccination_records
-    @parents = parents
 
     @vaccination_criteria =
       VaccinationCriteria.new(
@@ -57,8 +54,6 @@ def status
       :cannot_vaccinate_absent
     elsif should_be_cannot_vaccinate_do_not_vaccinate?
       :cannot_vaccinate_do_not_vaccinate
-    elsif should_be_needs_consent_no_contact_details?
-      :needs_consent_no_contact_details
     elsif should_be_needs_consent_no_response?
       :needs_consent_no_response
     elsif should_be_cannot_vaccinate_delay_vaccination?
@@ -165,8 +160,7 @@ def consent_vaccine_methods
               :consents,
               :triages,
               :attendance_record,
-              :vaccination_criteria,
-              :parents
+              :vaccination_criteria
 
   delegate :vaccinated?,
            :vaccinated_vaccination_record,
@@ -238,12 +232,6 @@ def should_be_needs_consent_request_not_scheduled?
     false # TODO: Implement this status.
   end
 
-  def should_be_needs_consent_no_contact_details?
-    is_eligible? && !parents_contactable?
-  end
-
-  def parents_contactable? = parents.any?
-
   def year_group = patient.year_group(academic_year:)
 
   def is_eligible?

app/models/parent.rb

@@ -64,9 +64,6 @@ class Parent < ApplicationRecord
             presence: true,
             if: :contact_method_other?
 
-  scope :contactable,
-        -> { where.not(email: [nil, ""]).or(where.not(phone: [nil, ""])) }
-
   def self.match_existing(patient:, email:, phone:, full_name:)
     if email.present? && (parent = Parent.find_by(email:))
       return parent

app/models/patient/programme_status.rb

@@ -63,8 +63,6 @@ class Patient::ProgrammeStatus < ApplicationRecord
           through: :patient,
           source: :attendance_records
 
-  has_many :parents, -> { contactable }, through: :patient
-
   GROUPS = %w[
     not_eligible
     needs_consent
@@ -82,8 +80,7 @@ class Patient::ProgrammeStatus < ApplicationRecord
     "needs_consent_request_scheduled" => 11,
     "needs_consent_request_failed" => 12,
     "needs_consent_no_response" => 13,
-    "needs_consent_follow_up_requested" => 14,
-    "needs_consent_no_contact_details" => 15
+    "needs_consent_follow_up_requested" => 14
   }.freeze
 
   HAS_REFUSAL_STATUSES = {
@@ -191,8 +188,7 @@ def generator
         consents:,
         triages:,
         attendance_record:,
-        vaccination_records:,
-        parents:
+        vaccination_records:
       )
   end
 end

config/locales/status.en.yml

@@ -57,7 +57,6 @@ en:
         needs_consent_request_failed: Needs consent
         needs_consent_request_not_scheduled: Needs consent
         needs_consent_request_scheduled: Needs consent
-        needs_consent_no_contact_details: No contact details
         needs_triage: Needs triage
         not_eligible: Not eligible
         vaccinated: Vaccinated
@@ -85,7 +84,6 @@ en:
         needs_consent_request_failed: blue
         needs_consent_request_not_scheduled: blue
         needs_consent_request_scheduled: blue
-        needs_consent_no_contact_details: blue
         needs_triage: blue
         not_eligible: grey
         vaccinated: white
@@ -105,7 +103,6 @@ en:
         needs_consent_request_failed: Request failed
         needs_consent_request_not_scheduled: Request not scheduled
         needs_consent_request_scheduled: Request scheduled
-        needs_consent_no_contact_details: No contact details
         vaccinated_already: Already had the vaccine
         vaccinated_fully: Vaccinated
     registration:

spec/components/app_patient_programmes_table_component_spec.rb

@@ -46,7 +46,7 @@
     end
 
     context "when vaccinated last year" do
-      let(:patient) { create(:patient, session:, parents: [create(:parent)]) }
+      let(:patient) { create(:patient, session:) }
 
       before do
         create(

spec/features/vaccination_programmes_spec.rb

@@ -69,7 +69,6 @@ def given_patients_exist_in_year_eleven
         year_group: 10,
         given_name: "John",
         family_name: "Smith",
-        parents: [create(:parent)],
         school:
       )
 

spec/lib/patient_programme_status_resolver_spec.rb

@@ -110,9 +110,7 @@
     let(:date_of_birth) { Date.new(2019, 12, 31) }
 
     context "and eligible for 1st dose" do
-      let(:patient) do
-        create(:patient, date_of_birth:, session:, parents: [create(:parent)])
-      end
+      let(:patient) { create(:patient, date_of_birth:, session:) }
 
       before do
         PatientStatusUpdater.call(patient:)

spec/lib/status_generator/programme_spec.rb

@@ -13,15 +13,13 @@
       consents: patient.consents,
       triages: patient.triages,
       attendance_record: patient.attendance_records.first,
-      vaccination_records: patient.vaccination_records.order_by_performed_at,
-      parents: patient.parents.contactable
+      vaccination_records: patient.vaccination_records.order_by_performed_at
     )
   end
 
   let(:programme) { Programme.sample }
   let(:session) { create(:session, programmes: [programme]) }
-  let(:patient) { create(:patient, session:, parents:) }
-  let(:parents) { [create(:parent)] }
+  let(:patient) { create(:patient, session:) }
   let(:location) { create(:school) }
 
   context "when already vaccinated" do
@@ -370,18 +368,6 @@
     its(:vaccine_methods) { should be_nil }
     its(:without_gelatine) { should be_nil }
 
-    context "when there are no contact details for parents and no consent request has been sent" do
-      let(:parents) { [create(:parent, :non_contactable)] }
-
-      its(:status) { should be(:needs_consent_no_contact_details) }
-    end
-
-    context "when there are no parent relationships and no consent request has been sent" do
-      let(:parents) { [] }
-
-      its(:status) { should be(:needs_consent_no_contact_details) }
-    end
-
     context "with a multi-dose programme" do
       let(:programme) { Programme.mmr }