Merge pull request #5798 from nhsuk/stop-using-patient-vaccination-status

Stop using `Patient::VaccinationStatus`

Author: thomasleese

app/components/app_activity_log_component.rb

@@ -203,12 +203,12 @@ def expiration_events
 
       not_vaccinated_programmes =
         all_programmes.reject do |programme|
-          patient.vaccination_status(programme:, academic_year:).vaccinated?
+          patient.programme_status(programme, academic_year:).vaccinated?
         end
 
       vaccinated_but_seasonal_programmes =
         all_programmes.select do |programme|
-          patient.vaccination_status(programme:, academic_year:).vaccinated? &&
+          patient.programme_status(programme, academic_year:).vaccinated? &&
             programme.seasonal?
         end
 

app/components/app_triage_form_component.rb

@@ -53,8 +53,8 @@ def fieldset_options
 
   def patient_eligible_for_additional_dose?
     next_dose =
-      patient.vaccination_status(
-        programme: programme,
+      patient.programme_status(
+        programme,
         academic_year: session.academic_year
       ).dose_sequence
 

app/controllers/draft_sessions_controller.rb

@@ -130,7 +130,7 @@ def set_catch_up_patients_vaccinated_percentage
       @draft_session
         .patient_locations
         .where(patient: { birth_academic_year: birth_academic_years })
-        .includes(patient: :vaccination_statuses)
+        .includes(patient: :programme_statuses)
         .map(&:patient)
 
     total_count = catch_up_patients.count
@@ -141,7 +141,7 @@ def set_catch_up_patients_vaccinated_percentage
           .programmes_for(patient:)
           .all? do |programme|
             if programme.is_catch_up?(year_group:)
-              patient.vaccination_status(programme:, academic_year:).vaccinated?
+              patient.programme_status(programme, academic_year:).vaccinated?
             else
               true
             end
@@ -415,13 +415,13 @@ def catch_up_year_group_has_high_unvaccinated_count?(programme, year_group)
       @draft_session
         .patient_locations
         .where(patient: { birth_academic_year: })
-        .includes(patient: :vaccination_statuses)
+        .includes(patient: :programme_statuses)
         .map(&:patient)
 
     total_count = catch_up_patients.count
     vaccinated_count =
       catch_up_patients.count do |patient|
-        patient.vaccination_status(programme:, academic_year:).vaccinated?
+        patient.programme_status(programme, academic_year:).vaccinated?
       end
 
     vaccinated_count < total_count / 2

app/forms/triage_form.rb

@@ -94,14 +94,13 @@ def show_add_patient_specific_direction?(option)
   end
 
   def next_mmr_dose_date
-    vaccination_status = patient.vaccination_status(programme:, academic_year:)
+    programme_status = patient.programme_status(programme, academic_year:)
 
-    first_dose_date =
-      if vaccination_status.eligible? || vaccination_status.due?
-        vaccination_status.latest_date
-      end
-
-    (first_dose_date || Date.current) + 28.days
+    if programme_status.cannot_vaccinate_delay_vaccination?
+      programme_status.date
+    elsif (first_dose_date = programme_status.date)
+      (first_dose_date + 28.days).to_date
+    end
   end
 
   private
@@ -269,8 +268,8 @@ def associate_triage_with_vaccination_record(next_dose_delay_triage)
 
   def patient_eligible_for_additional_dose?
     next_dose =
-      patient.vaccination_status(
-        programme: programme,
+      patient.programme_status(
+        programme,
         academic_year: session.academic_year
       ).dose_sequence
 

app/jobs/concerns/send_school_consent_notification_concern.rb

@@ -11,7 +11,7 @@ def patient_programmes_eligible_for_notification(session:)
     session
       .patient_locations
       .includes(
-        patient: %i[consent_notifications consent_statuses vaccination_statuses]
+        patient: %i[consent_notifications consent_statuses programme_statuses]
       )
       .find_each do |patient_location|
         patient = patient_location.patient
@@ -33,8 +33,7 @@ def get_programmes_that_need_consent(patient:, session:, programmes:)
     academic_year = session.academic_year
 
     programmes.select do |programme|
-      patient.consent_status(programme:, academic_year:).no_response? &&
-        patient.vaccination_status(programme:, academic_year:).eligible?
+      patient.programme_status(programme, academic_year:).needs_consent?
     end
   end
 

app/jobs/send_clinic_initial_invitations_job.rb

@@ -57,7 +57,7 @@ def should_send_notification?(patient:, team:, academic_year:, programmes:)
     return if already_invited
 
     programmes.any? do |programme|
-      !patient.vaccination_status(programme:, academic_year:).vaccinated? &&
+      !patient.programme_status(programme, academic_year:).vaccinated? &&
         !patient.consent_status(programme:, academic_year:).refused?
     end
   end

app/jobs/send_clinic_subsequent_invitations_job.rb

@@ -57,7 +57,7 @@ def should_send_notification?(patient:, team:, academic_year:, programmes:)
     return unless already_invited
 
     programmes.any? do |programme|
-      !patient.vaccination_status(programme:, academic_year:).vaccinated? &&
+      !patient.programme_status(programme, academic_year:).vaccinated? &&
         !patient.consent_status(programme:, academic_year:).refused?
     end
   end

app/jobs/send_school_session_reminders_job.rb

@@ -47,7 +47,7 @@ def should_send_notification?(patient:, session:)
 
     all_vaccinated =
       programmes.all? do |programme|
-        patient.vaccination_status(programme:, academic_year:).vaccinated?
+        patient.programme_status(programme, academic_year:).vaccinated?
       end
 
     return false if all_vaccinated

app/lib/already_had_notification_sender.rb

@@ -67,7 +67,7 @@ def other_vaccination_records
   end
 
   def would_still_be_vaccinated?
-    # We're not using the existing `Patient::VaccinationStatus` instance here
+    # We're not using the existing `Patient::ProgrammeStatus` instance here
     # because we want to know if the patient would still be vaccinated if we
     # took away the vaccination record in question, to know whether to send
     # the notification.

app/lib/govuk_notify_personalisation.rb

@@ -199,10 +199,9 @@ def mmr_second_dose_message
     return unless patient
     return unless mmr_programme
 
-    vaccination_status =
-      patient.vaccination_status(programme: mmr_programme, academic_year:)
+    programme_status = patient.programme_status(mmr_programme, academic_year:)
 
-    return "" if vaccination_status.vaccinated?
+    return "" if programme_status.vaccinated?
 
     [
       "## Your child still needs a second dose of the MMR vaccine",
@@ -262,15 +261,16 @@ def next_mmr_dose_date
     return if patient.nil?
     return if mmr_programme.nil?
 
-    vaccination_status =
-      patient.vaccination_status(programme: mmr_programme, academic_year:)
+    programme_status = patient.programme_status(mmr_programme, academic_year:)
 
-    first_dose_date =
-      if vaccination_status.eligible? || vaccination_status.due?
-        vaccination_status.latest_date
+    date =
+      if programme_status.cannot_vaccinate_delay_vaccination?
+        programme_status.date
+      elsif (first_dose_date = programme_status.date)
+        (first_dose_date + 28.days).to_date
       end
 
-    (first_dose_date + 28.days).to_date.to_fs(:long) if first_dose_date
+    date.to_fs(:long)
   end
 
   def patient_eligible_for_additional_dose?
@@ -280,7 +280,7 @@ def patient_eligible_for_additional_dose?
     next_dose =
       patient
         .reload
-        .vaccination_status(programme: mmr_programme, academic_year:)
+        .programme_status(mmr_programme, academic_year:)
         .dose_sequence
 
     next_dose == mmr_programme.maximum_dose_sequence