Merge pull request #6611 from NHSDigital/revert-needs-consent-sub-statuses-scheduled-not-scheduled

Revert "needs consent request scheduled / not scheduled"

Author: jhenderson

app/components/app_patient_search_form_component.rb

@@ -2,7 +2,11 @@
 
 class AppPatientSearchFormComponent < ViewComponent::Base
   # Remove these statuses once implemented.
-  HIDDEN_PROGRAMME_STATUSES = %w[needs_consent_request_failed].freeze
+  HIDDEN_PROGRAMME_STATUSES = %w[
+    needs_consent_request_failed
+    needs_consent_request_not_scheduled
+    needs_consent_request_scheduled
+  ].freeze
 
   def initialize(
     form,

app/components/app_patient_session_consent_component.html.erb

@@ -21,10 +21,6 @@
       <p><%= patient.full_name %> is ready for the vaccinator.</p>
     <% elsif consent_status_value == :no_contact_details %>
       <p>We cannot send consent requests because we have no parent contact details.</p>
-    <% elsif consent_status_value == :request_not_scheduled %>
-      <p>No consent request is scheduled to be sent because the child has not been added to a scheduled session.</p>
-    <% elsif consent_status_value == :request_scheduled %>
-      <p>A consent request will be sent on <%= session.send_consent_requests_at.to_fs(:long) %>.</p>
     <% end %>
 
     <div class="nhsuk-button-group">

app/components/app_patient_session_consent_component.rb

@@ -63,9 +63,7 @@ def consent_status_generator
         patient:,
         consents:,
         vaccination_records:,
-        parents:,
-        sessions: [session],
-        consent_notifications:
+        parents:
       )
   end
 
@@ -78,14 +76,19 @@ def triage_status_generator
         consents:,
         triages:,
         vaccination_records:,
-        parents:,
-        sessions: [session],
-        consent_notifications:
+        parents:
       )
   end
 
   def latest_consent_request
-    @latest_consent_request ||= consent_notifications.first
+    @latest_consent_request ||=
+      patient
+        .consent_notifications
+        .request
+        .has_all_programmes_of([programme])
+        .for_academic_year(academic_year)
+        .order(sent_at: :desc)
+        .first
   end
 
   def consents
@@ -113,14 +116,8 @@ def vaccination_records
       patient.vaccination_records.for_programme(programme).order_by_performed_at
   end
 
-  SEND_CONSENT_REQUEST_STATUSES = %i[
-    no_response
-    request_scheduled
-    request_not_scheduled
-  ].freeze
-
   def can_send_consent_request?
-    consent_status_value.in?(SEND_CONSENT_REQUEST_STATUSES) &&
+    consent_status_value == :no_response &&
       patient.send_notifications?(team: @session.team) &&
       session.can_receive_consent? && patient.parents.any?(&:contactable?)
   end
@@ -137,13 +134,4 @@ def who_refused
   def show_health_answers?
     grouped_consents.any?(&:response_given?)
   end
-
-  def consent_notifications
-    patient
-      .consent_notifications
-      .request
-      .has_all_programmes_of([programme])
-      .for_academic_year(academic_year)
-      .order(sent_at: :desc)
-  end
 end

app/components/app_patient_session_triage_component.rb

@@ -14,13 +14,6 @@ def initialize(
     @current_user = current_user
     @triage_form = triage_form || default_triage_form
     @parents = patient.parents
-    @patient_locations =
-      patient.patient_locations.includes(
-        location: [
-          :location_programme_year_groups,
-          { team_locations: { sessions: :session_programme_year_groups } }
-        ]
-      )
   end
 
   def render?
@@ -35,8 +28,7 @@ def render?
               :programme,
               :current_user,
               :triage_form,
-              :parents,
-              :patient_locations
+              :parents
 
   delegate :academic_year, :team, to: :session
 
@@ -85,9 +77,7 @@ def triage_status_generator
         consents:,
         triages:,
         vaccination_records:,
-        parents:,
-        sessions: [session],
-        consent_notifications:
+        parents:
       )
   end
 
@@ -99,9 +89,7 @@ def consent_status_generator
         patient:,
         consents:,
         vaccination_records:,
-        parents:,
-        sessions: [session],
-        consent_notifications:
+        parents:
       )
   end
 
@@ -130,12 +118,4 @@ def latest_triage
   def default_triage_form
     TriageForm.new(patient:, session:, programme:, current_user:)
   end
-
-  def consent_notifications
-    patient
-      .consent_notifications
-      .request
-      .has_all_programmes_of([programme])
-      .for_academic_year(academic_year)
-  end
 end

app/forms/triage_form.rb

@@ -130,9 +130,7 @@ def consent_status_generator
         patient:,
         consents: patient.consents,
         vaccination_records: [],
-        parents: [],
-        sessions: [],
-        consent_notifications: []
+        parents: []
       )
   end
 

app/lib/patient_status_updater.rb

@@ -46,19 +46,12 @@ def update_programme_statuses!
         :attendance_record,
         :consents,
         :patient,
+        :patient_locations,
         :triages,
         :vaccination_records,
-        :parents,
-        :consent_notifications,
-        patient_locations: {
-          location: [
-            { team_locations: { sessions: :session_programme_year_groups } }
-          ]
-        }
+        :parents
       )
       .find_in_batches do |batch|
-        preload_location_programme_year_groups(batch)
-
         batch.each(&:assign)
 
         Patient::ProgrammeStatus.import!(
@@ -187,23 +180,4 @@ def programme_types_per_session_id_and_year_group
           hash[session_id][year_group] << programme_type
         end
   end
-
-  # We preload this association separately because including it in the nested
-  # `patient_locations` preload (see includes above) caused the updater process
-  # to be killed, even with very small batches. The likely cause is memory pressure
-  # from eager loading a deeply nested association graph.
-  #
-  # Preloading it here for the distinct `Location` records in each batch keeps
-  # `StatusGenerator::Programme` query-free without incurring the cost of the
-  # larger nested preload.
-  def preload_location_programme_year_groups(batch)
-    locations = batch.flat_map(&:patient_locations).map(&:location).uniq
-
-    ActiveRecord::Associations::Preloader.new(
-      records: locations,
-      associations: {
-        location_programme_year_groups: :location_year_group
-      }
-    ).call
-  end
 end

app/lib/status_generator/consent.rb

@@ -7,18 +7,14 @@ def initialize(
     patient:,
     consents:,
     vaccination_records:,
-    parents:,
-    sessions:,
-    consent_notifications:
+    parents:
   )
     @programme_type = programme_type
     @academic_year = academic_year
     @patient = patient
     @consents = consents
     @vaccination_records = vaccination_records
     @parents = parents
-    @sessions = sessions
-    @consent_notifications = consent_notifications
   end
 
   def programme
@@ -36,10 +32,6 @@ def status
       :conflicts
     elsif status_should_be_no_contact_details?
       :no_contact_details
-    elsif status_should_be_request_scheduled?
-      :request_scheduled
-    elsif status_should_be_request_not_scheduled?
-      :request_not_scheduled
     elsif status_should_be_no_response?
       :no_response
     else
@@ -70,9 +62,7 @@ def disease_types
               :patient,
               :consents,
               :vaccination_records,
-              :parents,
-              :sessions,
-              :consent_notifications
+              :parents
 
   def vaccinated?
     return @vaccinated if defined?(@vaccinated)
@@ -172,28 +162,4 @@ def latest_consents
     @latest_consents ||=
       ConsentGrouper.call(consents, programme_type:, academic_year:)
   end
-
-  def parents_contactable? = parents.any?(&:contactable?)
-
-  def status_should_be_request_scheduled?
-    parents_contactable? && consent_notifications.empty? &&
-      sessions.any? { consent_request_scheduled_in_future?(it) }
-  end
-
-  def status_should_be_request_not_scheduled?
-    parents_contactable? && consent_notifications.empty? &&
-      (sessions.empty? || sessions.any? { consent_request_not_scheduled?(it) })
-  end
-
-  def consent_request_scheduled_in_future?(session)
-    send_at = session.send_consent_requests_at
-
-    # Not using future? because it doesn't work with Timecop
-    send_at.present? && send_at > Time.current
-  end
-
-  def consent_request_not_scheduled?(session)
-    send_at = session.send_consent_requests_at
-    send_at.nil? || send_at < Time.current
-  end
 end

app/lib/status_generator/programme.rb

@@ -17,8 +17,7 @@ def initialize(
     triages:,
     attendance_record:,
     vaccination_records:,
-    parents:,
-    consent_notifications:
+    parents:
   )
     @programme_type = programme_type
     @academic_year = academic_year
@@ -29,8 +28,6 @@ def initialize(
     @attendance_record = attendance_record
     @vaccination_records = vaccination_records
     @parents = parents
-    @consent_notifications =
-      find_matching_consent_notifications(consent_notifications)
 
     @vaccination_criteria =
       VaccinationCriteria.new(
@@ -175,8 +172,7 @@ def consent_vaccine_methods
               :triages,
               :attendance_record,
               :vaccination_criteria,
-              :parents,
-              :consent_notifications
+              :parents
 
   delegate :vaccinated?,
            :vaccinated_vaccination_record,
@@ -241,11 +237,11 @@ def should_be_needs_consent_request_failed?
   end
 
   def should_be_needs_consent_request_scheduled?
-    is_eligible? && consent_status == :request_scheduled
+    false # TODO: Implement this status.
   end
 
   def should_be_needs_consent_request_not_scheduled?
-    is_eligible? && consent_status == :request_not_scheduled
+    false # TODO: Implement this status.
   end
 
   def should_be_needs_consent_no_contact_details?
@@ -292,13 +288,6 @@ def default_programme_year_groups
     Programme.find(programme_type).default_year_groups
   end
 
-  def find_matching_consent_notifications(notifications)
-    notifications.select do |notification|
-      notification.programme_types.include?(programme_type) &&
-        notification.session&.team_location&.academic_year == academic_year
-    end
-  end
-
   def consent_generator
     @consent_generator ||=
       StatusGenerator::Consent.new(
@@ -307,9 +296,7 @@ def consent_generator
         patient:,
         consents:,
         vaccination_records:,
-        parents:,
-        sessions:,
-        consent_notifications:
+        parents:
       )
   end
 
@@ -322,34 +309,7 @@ def triage_generator
         consents:,
         triages:,
         vaccination_records:,
-        parents:,
-        sessions:,
-        consent_notifications:
+        parents:
       )
   end
-
-  def sessions
-    @sessions ||=
-      patient_locations
-        .reject { it.location.generic_clinic? }
-        .flat_map { sessions_for(it) }
-        .uniq
-  end
-
-  def sessions_for(patient_location)
-    patient_location
-      .location
-      .team_locations
-      .select { it.academic_year == academic_year }
-      .flat_map(&:sessions)
-      .select { it.programme_types.include?(programme_type) }
-      .select { session_in_patient_location_date_range?(it, patient_location) }
-      .reject(&:completed?)
-  end
-
-  def session_in_patient_location_date_range?(session, patient_location)
-    return true if session.dates.empty?
-
-    session.dates.any? { |date| date.in?(patient_location.date_range) }
-  end
 end