Refactor ready_for_vaccinator?

This removes the usage of `ready_for_vaccinator?` with a database query
on the registration status to avoid unnecessary queries to the database.

Author: thomasleese

app/components/app_session_actions_component.rb

@@ -124,9 +124,19 @@ def ready_for_vaccinator_row
 
     counts_by_programme =
       session.programmes.index_with do |programme|
-        patient_sessions.count do
-          it.ready_for_vaccinator?(session_date:, programme:)
-        end
+        patient_sessions
+          .where(
+            PatientSession::RegistrationStatus
+              .for_patient_session
+              .where(status: %w[attending completed], session_date:)
+              .arel
+              .exists
+          )
+          .count do |patient_session|
+            patient_session.patient.consent_given_and_safe_to_vaccinate?(
+              programme:
+            )
+          end
       end
 
     return nil if counts_by_programme.values.all?(&:zero?)

app/controllers/sessions/record_controller.rb

@@ -18,22 +18,30 @@ def show
     @session_date = @session.todays_session_date
 
     scope =
-      @session.patient_sessions.preload_for_status.in_programmes(
-        @session.programmes
-      )
+      @session
+        .patient_sessions
+        .preload_for_status
+        .in_programmes(@session.programmes)
+        .where(
+          PatientSession::RegistrationStatus
+            .for_patient_session
+            .where(status: %w[attending completed], session_date: @session_date)
+            .arel
+            .exists
+        )
+
+    scope = @form.apply(scope)
 
     patient_sessions =
-      @form.apply(scope) do |filtered_scope|
-        filtered_scope.select do
-          it.ready_for_vaccinator?(session_date: @session_date)
+      scope.select do |patient_session|
+        patient_session.programmes.any? do |programme|
+          patient_session.patient.consent_given_and_safe_to_vaccinate?(
+            programme:
+          )
         end
       end
 
-    if patient_sessions.is_a?(Array)
-      @pagy, @patient_sessions = pagy_array(patient_sessions)
-    else
-      @pagy, @patient_sessions = pagy(patient_sessions)
-    end
+    @pagy, @patient_sessions = pagy_array(patient_sessions)
 
     render layout: "full"
   end

app/forms/search_form.rb

@@ -40,10 +40,6 @@ def apply(scope, session_date: nil, programme: nil)
 
     scope = scope.search_by_nhs_number(nil) if missing_nhs_number.present?
 
-    scope = scope.order_by_name
-
-    scope = yield(scope) if block_given?
-
     if (status = consent_status).present?
       scope =
         scope.where(
@@ -91,6 +87,6 @@ def apply(scope, session_date: nil, programme: nil)
         )
     end
 
-    scope
+    scope.order_by_name
   end
 end

app/models/patient_session.rb

@@ -154,19 +154,6 @@ def todays_attendance
     end
   end
 
-  def ready_for_vaccinator?(session_date:, programme: nil)
-    if register_status(session_date:).unknown? ||
-         register_status(session_date:).not_attending?
-      return false
-    end
-
-    programmes_to_check = programme ? [programme] : programmes
-
-    programmes_to_check.any? do
-      patient.consent_given_and_safe_to_vaccinate?(programme: it)
-    end
-  end
-
   def next_activity(programme:)
     return :report if patient.vaccination_status(programme:).vaccinated?
 

spec/models/patient_session_spec.rb

@@ -69,51 +69,6 @@
     end
   end
 
-  describe "#ready_for_vaccinator?" do
-    subject(:ready_for_vaccinator?) do
-      patient_session.ready_for_vaccinator?(session_date:)
-    end
-
-    let(:session_date) { session.session_dates.first }
-
-    it { should be(false) }
-
-    context "when attending the session" do
-      let(:patient_session) do
-        create(:patient_session, :in_attendance, session:)
-      end
-
-      it { should be(false) }
-    end
-
-    context "when attending the session and consent given and triaged as safe to vaccinate" do
-      let(:patient_session) do
-        create(
-          :patient_session,
-          :in_attendance,
-          :consent_given_triage_not_needed,
-          session:
-        )
-      end
-
-      it { should be(true) }
-
-      context "when already vaccinated" do
-        let(:patient_session) do
-          create(
-            :patient_session,
-            :in_attendance,
-            :consent_given_triage_not_needed,
-            :vaccinated,
-            session:
-          )
-        end
-
-        it { should be(false) }
-      end
-    end
-  end
-
   describe "#next_activity" do
     subject { patient_session.next_activity(programme:) }