fix: use cached vaccination status

We also need to add StatusUpdater.call(patient: @patient) to a lot of the tests
so that the vaccination status is not nil.

Author: MartinVanIJcken

app/components/app_patient_programmes_table_component.rb

@@ -45,35 +45,47 @@ def seasonal_programme_rows(programme:)
 
       vaccination_records = vaccination_records_for(programme:, academic_year:)
 
-      if vaccination_records.count.positive?
-        (1..vaccination_records.count).to_a.map do |i|
+      rows =
+        (1..vaccination_records.count - 1).to_a.map do |i|
           build_row(
             programme:,
             academic_year:,
             vaccination_records: vaccination_records.slice(0, i)
           )
         end
-      else
-        [build_row(programme:, academic_year:, vaccination_records: [])]
-      end
+
+      rows +
+        [
+          build_row_from_cache(
+            programme:,
+            academic_year:,
+            last_vaccination_record: vaccination_records.last
+          )
+        ]
     end
   end
 
   def non_seasonal_programme_rows(programme:)
     academic_year = AcademicYear.pending
     vaccination_records = vaccination_records_for(programme:)
 
-    if vaccination_records.count.positive?
-      (1..vaccination_records.count).to_a.map do |i|
+    rows =
+      (1..vaccination_records.count - 1).to_a.map do |i|
         build_row(
           programme:,
           academic_year:,
           vaccination_records: vaccination_records.slice(0, i)
         )
       end
-    else
-      [build_row(programme:, academic_year:, vaccination_records: [])]
-    end
+
+    rows +
+      [
+        build_row_from_cache(
+          programme:,
+          academic_year:,
+          last_vaccination_record: vaccination_records.last
+        )
+      ]
   end
 
   def build_row(programme:, academic_year:, vaccination_records: nil)
@@ -98,7 +110,33 @@ def build_row(programme:, academic_year:, vaccination_records: nil)
         vaccination_status:,
         programme:,
         academic_year:,
-        latest_vaccination_record: vaccination_records.last
+        latest_vaccination_record: vaccination_records&.last
+      )
+    ]
+  end
+
+  def build_row_from_cache(programme:, academic_year:, last_vaccination_record:)
+    cached_vaccination_status =
+      @patient.vaccination_status(programme:, academic_year:)
+
+    vaccination_status = {
+      status: cached_vaccination_status.status.to_sym,
+      latest_session_status:
+        cached_vaccination_status.latest_session_status.to_sym
+    }
+
+    [
+      name_for_programme(
+        programme:,
+        academic_year:,
+        dose_sequence: last_vaccination_record&.dose_sequence
+      ),
+      status_for_programme(vaccination_status:, programme:, academic_year:),
+      notes_for_programme(
+        vaccination_status:,
+        programme:,
+        academic_year:,
+        latest_vaccination_record: last_vaccination_record
       )
     ]
   end

db/schema.rb

@@ -256,8 +256,8 @@
     t.boolean "notify_parents_on_vaccination"
     t.datetime "submitted_at", null: false
     t.integer "vaccine_methods", default: [], null: false, array: true
-    t.integer "academic_year", null: false
     t.boolean "notify_parent_on_refusal"
+    t.integer "academic_year", null: false
     t.index ["academic_year"], name: "index_consents_on_academic_year"
     t.index ["parent_id"], name: "index_consents_on_parent_id"
     t.index ["patient_id"], name: "index_consents_on_patient_id"

spec/features/vaccination_programmes_spec.rb

@@ -110,6 +110,8 @@ def then_the_table_has_a_row_showing_hpv_vaccinated
   end
 
   def and_the_table_has_a_row_showing_second_hpv_vaccinated
+    puts page.html
+
     expect(page).to have_selector(
       "table.nhsuk-table tbody tr",
       text: "HPV (2nd dose)"
@@ -183,6 +185,8 @@ def and_the_patient_is_vaccinated_for_hpv
       session: @session,
       performed_at: 6.months.ago
     )
+
+    StatusUpdater.call(patient: @patient)
   end
 
   def and_the_patient_has_a_second_dose_of_hpv
@@ -193,6 +197,8 @@ def and_the_patient_has_a_second_dose_of_hpv
       programme: @hpv_programme,
       session: @session
     )
+
+    StatusUpdater.call(patient: @patient)
   end
 
   def and_the_patient_had_two_flu_doses_last_year