Merge pull request #5174 from nhsuk/eligible-programmes-exclude-unknown-locations

Fix `eligible_for_programmes` scope to exclude vaccinations with unknown location

Author: jhenderson

app/models/patient.rb

@@ -397,7 +397,8 @@ class Patient < ApplicationRecord
   scope :eligible_for_programmes,
         ->(programmes, location:, academic_year:) do
           # We exclude patients who were vaccinated in a previous
-          # academic year, or vaccinated at a different location.
+          # academic year, or vaccinated at a different location,
+          # or the location is not known.
 
           not_eligible_criteria =
             programmes.map do |programme|
@@ -409,9 +410,10 @@ class Patient < ApplicationRecord
                   .vaccinated
 
               scope =
-                vaccinated_statuses
-                  .where(academic_year:)
-                  .where.not(latest_location: location)
+                vaccinated_statuses.where(academic_year:).where(
+                  "latest_location_id IS NULL OR latest_location_id != ?",
+                  location.id
+                )
 
               unless programme.seasonal?
                 scope =

spec/components/app_session_overview_tallies_component_spec.rb

@@ -6,6 +6,7 @@
   let(:hpv_programme) { CachedProgramme.hpv }
   let(:flu_programme) { CachedProgramme.flu }
   let(:session) { create(:session, programmes: [hpv_programme, flu_programme]) }
+  let(:latest_location) { session.location }
 
   let(:component) { described_class.new(session) }
 
@@ -69,7 +70,8 @@
           :patient_vaccination_status,
           :vaccinated,
           patient:,
-          programme: flu_programme
+          programme: flu_programme,
+          latest_location:
         )
       end
 
@@ -268,7 +270,8 @@
         :patient_vaccination_status,
         :vaccinated,
         programme: hpv_programme,
-        patient: patients.second
+        patient: patients.second,
+        latest_location:
       )
       create(
         :patient_consent_status,

spec/features/tallying_session_overview_spec.rb

@@ -85,7 +85,8 @@ def and_one_vaccinated
       :patient_vaccination_status,
       :vaccinated,
       patient: @patients.fifth,
-      programme: @flu_programme
+      programme: @flu_programme,
+      latest_location: @session.location
     )
   end
 

spec/lib/stats/session_spec.rb

@@ -6,6 +6,7 @@
 
     let(:programme) { CachedProgramme.hpv }
     let(:session) { create(:session, programmes: [programme]) }
+    let(:latest_location) { session.location }
 
     context "with no patients" do
       it "returns zero counts for all stats" do
@@ -30,7 +31,13 @@
         end
 
         create(:patient, session:, year_group: 9).tap do |patient|
-          create(:patient_vaccination_status, :vaccinated, patient:, programme:)
+          create(
+            :patient_vaccination_status,
+            :vaccinated,
+            patient:,
+            programme:,
+            latest_location:
+          )
         end
 
         create(:patient, session:, year_group: 9).tap do |patient|
@@ -135,5 +142,23 @@
         expect(stats).to include(eligible_children: 0)
       end
     end
+
+    context "patient is vaccinated but the location is unknown" do
+      before do
+        create(:patient, session:, year_group: 9).tap do |patient|
+          create(
+            :patient_vaccination_status,
+            :vaccinated,
+            patient:,
+            programme:,
+            latest_location: nil
+          )
+        end
+      end
+
+      it "doesn't count the vaccination" do
+        expect(stats).to include(vaccinated: 0)
+      end
+    end
   end
 end