Fix reporting to only count dose 5 for Td/IPV

The reporting dashboard was counting childhood Td/IPV doses (1-4) as
vaccinated, but in StatusGenerator::Vaccination we only consider dose 5
as completing vaccination.

Author: mikejamesthompson

db/migrate/20251203143325_update_reporting_api_patient_programme_statuses_to_version_8.rb

@@ -4,8 +4,9 @@ class UpdateReportingAPIPatientProgrammeStatusesToVersion8 < ActiveRecord::Migra
   8.1
 ]
   def change
-    replace_view :reporting_api_patient_programme_statuses,
-                 version: 8,
-                 revert_to_version: 7
+    update_view :reporting_api_patient_programme_statuses,
+                version: 8,
+                revert_to_version: 7,
+                materialized: true
   end
 end

db/schema.rb

@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema[8.1].define(version: 2025_12_01_152312) do
+ActiveRecord::Schema[8.1].define(version: 2025_12_03_143325) do
   # These are extensions that must be enabled in order to support this database
   enable_extension "pg_catalog.plpgsql"
   enable_extension "pg_trgm"
@@ -1122,7 +1122,7 @@
              FROM ((vaccination_records vr
                JOIN sessions vr_s ON ((vr_s.id = vr.session_id)))
                JOIN team_locations vr_tl ON ((vr_tl.id = vr_s.team_location_id)))
-            WHERE (vr.discarded_at IS NULL)
+            WHERE ((vr.discarded_at IS NULL) AND ((vr.programme_type <> 'td_ipv'::programme_type) OR (vr.dose_sequence = 5) OR (vr.dose_sequence IS NULL)))
             GROUP BY vr.patient_id, vr.programme_type, vr_tl.team_id, vr_tl.academic_year
           ), all_vaccinations_by_year AS (
            SELECT vr.patient_id,
@@ -1134,7 +1134,7 @@
              FROM ((vaccination_records vr
                JOIN sessions vr_s ON ((vr_s.id = vr.session_id)))
                JOIN team_locations vr_tl ON ((vr_tl.id = vr_s.team_location_id)))
-            WHERE (vr.discarded_at IS NULL)
+            WHERE ((vr.discarded_at IS NULL) AND ((vr.programme_type <> 'td_ipv'::programme_type) OR (vr.dose_sequence = 5) OR (vr.dose_sequence IS NULL)))
           UNION ALL
            SELECT vr.patient_id,
               vr.programme_type,
@@ -1146,7 +1146,7 @@
               vr.outcome,
               vr.source
              FROM vaccination_records vr
-            WHERE ((vr.discarded_at IS NULL) AND (vr.source = ANY (ARRAY[1, 2])) AND (vr.session_id IS NULL))
+            WHERE ((vr.discarded_at IS NULL) AND (vr.source = ANY (ARRAY[1, 2])) AND (vr.session_id IS NULL) AND ((vr.programme_type <> 'td_ipv'::programme_type) OR (vr.dose_sequence = 5)))
           ), base_data AS (
            SELECT concat(p.id, '-', (patient_team_prog.s_programme_type)::text, '-', t.id, '-', tl.academic_year) AS id,
               p.id AS patient_id,
@@ -1243,7 +1243,7 @@
                      FROM ((vaccination_records vr
                        LEFT JOIN sessions vr_s ON ((vr_s.id = vr.session_id)))
                        LEFT JOIN team_locations vr_tl ON ((vr_tl.id = vr_s.team_location_id)))
-                    WHERE ((vr.discarded_at IS NULL) AND (vr.outcome = 4))) vr_elsewhere_declared ON (((vr_elsewhere_declared.patient_id = p.id) AND (vr_elsewhere_declared.programme_type = patient_team_prog.s_programme_type) AND (vr_elsewhere_declared.academic_year = (tl.academic_year)::numeric))))
+                    WHERE ((vr.discarded_at IS NULL) AND (vr.outcome = 4) AND ((vr.programme_type <> 'td_ipv'::programme_type) OR (vr.dose_sequence = 5) OR ((vr.dose_sequence IS NULL) AND (vr.session_id IS NOT NULL))))) vr_elsewhere_declared ON (((vr_elsewhere_declared.patient_id = p.id) AND (vr_elsewhere_declared.programme_type = patient_team_prog.s_programme_type) AND (vr_elsewhere_declared.academic_year = (tl.academic_year)::numeric))))
                LEFT JOIN ( SELECT DISTINCT c.patient_id,
                       c.programme_type,
                       c.academic_year

db/views/reporting_api_patient_programme_statuses_v08.sql

@@ -13,6 +13,12 @@ WITH vaccination_summary AS (
   INNER JOIN sessions vr_s ON vr_s.id = vr.session_id
   INNER JOIN team_locations vr_tl ON vr_tl.id = vr_s.team_location_id
   WHERE vr.discarded_at IS NULL
+    -- For Td/IPV, only count dose 5 or unknown dose (recorded in service)
+    AND (
+      vr.programme_type != 'td_ipv'
+      OR vr.dose_sequence = 5
+      OR vr.dose_sequence IS NULL
+    )
   GROUP BY vr.patient_id, vr.programme_type, vr_tl.team_id, vr_tl.academic_year
 ),
 all_vaccinations_by_year AS (
@@ -27,6 +33,12 @@ all_vaccinations_by_year AS (
   INNER JOIN sessions vr_s ON vr_s.id = vr.session_id
   INNER JOIN team_locations vr_tl ON vr_tl.id = vr_s.team_location_id
   WHERE vr.discarded_at IS NULL
+    -- For Td/IPV, only count dose 5 or unknown dose (recorded in service)
+    AND (
+      vr.programme_type != 'td_ipv'
+      OR vr.dose_sequence = 5
+      OR vr.dose_sequence IS NULL
+    )
 
   UNION ALL
 
@@ -45,6 +57,11 @@ all_vaccinations_by_year AS (
   WHERE vr.discarded_at IS NULL
     AND vr.source IN (1, 2)
     AND vr.session_id IS NULL
+    -- For Td/IPV without session, only dose 5 counts (not recorded in service)
+    AND (
+      vr.programme_type != 'td_ipv'
+      OR vr.dose_sequence = 5
+    )
 ),
 base_data AS (
   SELECT
@@ -194,6 +211,12 @@ LEFT JOIN (
   LEFT JOIN team_locations vr_tl ON vr_tl.id = vr_s.team_location_id
   WHERE vr.discarded_at IS NULL
     AND vr.outcome = 4 -- already_had (declared elsewhere)
+    -- For Td/IPV, only count if dose 5 or unknown dose with session
+    AND (
+      vr.programme_type != 'td_ipv'
+      OR vr.dose_sequence = 5
+      OR (vr.dose_sequence IS NULL AND vr.session_id IS NOT NULL)
+    )
 ) vr_elsewhere_declared ON vr_elsewhere_declared.patient_id = p.id
   AND vr_elsewhere_declared.programme_type = s_programme_type
   AND vr_elsewhere_declared.academic_year = tl.academic_year

spec/controllers/api/reporting/totals_controller_spec.rb

@@ -799,6 +799,25 @@ def refresh_and_get_totals(programme_type: "hpv")
       expect(cohort).to eq(3)
     end
 
+    it "only counts Td/IPV dose 5 as vaccinated previously" do
+      patient = create(:patient, session: td_ipv_session, year_group: 9)
+      create(
+        :vaccination_record,
+        patient:,
+        programme: td_ipv_programme,
+        session: nil,
+        source: "nhs_immunisations_api",
+        nhs_immunisations_api_identifier_system: "test",
+        nhs_immunisations_api_identifier_value: "123",
+        dose_sequence: 4,
+        performed_at: 1.year.ago
+      )
+
+      refresh_and_get_totals(programme_type: "td_ipv")
+
+      expect(vaccinated_previously).to eq(0)
+    end
+
     it "counts year 12 students when session location has year 12 enabled" do
       send_location =
         create(