Merge pull request #6443 from NHSDigital/revert-needs-consent-sub-statuses

Revert "Consent sub-statuses to indicate whether requests have been scheduled or sent"

Author: jhenderson

app/controllers/patient_sessions/consents_controller.rb

@@ -141,13 +141,4 @@ def withdraw_params
   def invalidate_params
     params.expect(consent: :notes).merge(invalidated_at: Time.current)
   end
-
-  def consent_request_needed?
-    programme_status =
-      @patient.programme_status(@programme, academic_year: @academic_year)
-
-    programme_status.needs_consent_no_response? ||
-      programme_status.needs_consent_request_scheduled? ||
-      programme_status.needs_consent_request_not_scheduled?
-  end
 end

app/lib/patient_status_updater.rb

@@ -46,17 +46,9 @@ def update_programme_statuses!
         :attendance_record,
         :consents,
         :patient,
+        :patient_locations,
         :triages,
-        :vaccination_records,
-        :parents,
-        :consent_notifications,
-        :notify_log_entries,
-        patient_locations: {
-          location: [
-            :location_programme_year_groups,
-            { team_locations: { sessions: :session_programme_year_groups } }
-          ]
-        }
+        :vaccination_records
       )
       .find_in_batches(batch_size: 10_000) do |batch|
         batch.each(&:assign)

app/lib/status_generator/programme.rb

@@ -16,10 +16,7 @@ def initialize(
     consents:,
     triages:,
     attendance_record:,
-    vaccination_records:,
-    parents:,
-    consent_notifications:,
-    notify_log_entries:
+    vaccination_records:
   )
     @programme_type = programme_type
     @academic_year = academic_year
@@ -28,10 +25,6 @@ def initialize(
     @consents = consents
     @triages = triages
     @attendance_record = attendance_record
-    @vaccination_records = vaccination_records
-    @parents = parents
-    @consent_notifications = consent_notifications
-    @notify_log_entries = notify_log_entries
 
     @vaccination_criteria =
       VaccinationCriteria.new(
@@ -61,10 +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_request_failed?
-      :needs_consent_request_failed
     elsif should_be_needs_consent_no_response?
       :needs_consent_no_response
     elsif should_be_cannot_vaccinate_delay_vaccination?
@@ -79,6 +68,8 @@ def status
       :has_refusal_consent_refused
     elsif should_be_needs_consent_follow_up_requested?
       :needs_consent_follow_up_requested
+    elsif should_be_needs_consent_request_failed?
+      :needs_consent_request_failed
     elsif should_be_needs_consent_request_scheduled?
       :needs_consent_request_scheduled
     elsif should_be_needs_consent_request_not_scheduled?
@@ -169,10 +160,7 @@ def consent_vaccine_methods
               :consents,
               :triages,
               :attendance_record,
-              :vaccination_criteria,
-              :parents,
-              :consent_notifications,
-              :notify_log_entries
+              :vaccination_criteria
 
   delegate :vaccinated?,
            :vaccinated_vaccination_record,
@@ -207,8 +195,7 @@ def should_be_cannot_vaccinate_do_not_vaccinate?
   end
 
   def should_be_needs_consent_no_response?
-    is_eligible? && consent_notifications_requested? &&
-      consent_status == :no_response
+    is_eligible? && consent_status == :no_response
   end
 
   def should_be_cannot_vaccinate_delay_vaccination?
@@ -234,49 +221,15 @@ def should_be_needs_consent_follow_up_requested?
   end
 
   def should_be_needs_consent_request_failed?
-    is_eligible? && consent_request_failed?
+    false # TODO: Implement this status.
   end
 
   def should_be_needs_consent_request_scheduled?
-    is_eligible? && parents_contactable? && !consent_notifications_requested? &&
-      sessions.any? { it.send_consent_requests_at&.present? }
+    false # TODO: Implement this status.
   end
 
   def should_be_needs_consent_request_not_scheduled?
-    is_eligible? && parents_contactable? && !consent_notifications_requested? &&
-      (sessions.empty? || sessions.any? { it.send_consent_requests_at.nil? })
-  end
-
-  def should_be_needs_consent_no_contact_details?
-    is_eligible? && !parents_contactable?
-  end
-
-  def parents_contactable? = parents.any?
-
-  def consent_notifications_requested?
-    @consent_notifications_requested ||=
-      consent_notifications.any? do |notification|
-        notification.programme_types.include?(programme.type) &&
-          notification.session&.team_location&.academic_year == academic_year
-      end
-  end
-
-  def consent_request_failed?
-    date_range = academic_year.to_academic_year_date_range
-
-    notify_log_entries.any? do |entry|
-      next false unless entry.patient_id == patient.id
-      next false unless date_range.cover?(entry.created_at.to_date)
-      next false unless notify_log_entry_matches_programme_type?(entry)
-
-      entry.delivery_status.to_s.include?("failure")
-    end
-  end
-
-  def notify_log_entry_matches_programme_type?(entry)
-    entry.notify_log_entry_programmes.any? do |programme|
-      programme.programme_type == programme_type
-    end
+    false # TODO: Implement this status.
   end
 
   def year_group = patient.year_group(academic_year:)
@@ -341,16 +294,4 @@ def triage_generator
         vaccination_records:
       )
   end
-
-  def sessions
-    @sessions ||=
-      patient_locations.flat_map do |patient_location|
-        patient_location
-          .location
-          .team_locations
-          .select { it.academic_year == academic_year }
-          .flat_map(&:sessions)
-          .select { it.programme_types.include?(programme_type) }
-      end
-  end
 end

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

@@ -38,18 +38,7 @@ class Patient::ProgrammeStatus < ApplicationRecord
   belongs_to :location, optional: true
 
   has_many :patient_locations,
-           -> do
-             includes(
-               location: [
-                 :location_programme_year_groups,
-                 {
-                   team_locations: {
-                     sessions: :session_programme_year_groups
-                   }
-                 }
-               ]
-             )
-           end,
+           -> { includes(location: :location_programme_year_groups) },
            through: :patient
 
   has_many :consents,
@@ -74,16 +63,6 @@ class Patient::ProgrammeStatus < ApplicationRecord
           through: :patient,
           source: :attendance_records
 
-  has_many :parents, -> { contactable }, through: :patient
-
-  has_many :consent_notifications,
-           -> { request.includes(session: :team_location) },
-           through: :patient
-
-  has_many :notify_log_entries,
-           -> { consent_request.includes(:notify_log_entry_programmes) },
-           through: :patient
-
   GROUPS = %w[
     not_eligible
     needs_consent
@@ -101,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 = {
@@ -210,10 +188,7 @@ def generator
         consents:,
         triages:,
         attendance_record:,
-        vaccination_records:,
-        parents:,
-        consent_notifications:,
-        notify_log_entries:
+        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: Needs consent
         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: