Merge pull request #3784 from nhsuk/programme-specific-vaccines

Don't show vaccination records for the wrong programme

Author: thomasleese

app/components/app_patient_session_outcome_component.rb

@@ -8,8 +8,8 @@ class AppPatientSessionOutcomeComponent < ViewComponent::Base
       <% card.with_heading { heading } %>
       <%= render AppPatientVaccinationTableComponent.new(
             patient,
-            show_caption: true,
-            show_programme: false,
+            programme:,
+            show_caption: true
           ) %>
     <% end %>
   ERB

app/components/app_patient_vaccination_table_component.rb

@@ -1,21 +1,24 @@
 # frozen_string_literal: true
 
 class AppPatientVaccinationTableComponent < ViewComponent::Base
-  def initialize(patient, show_caption:, show_programme:)
+  def initialize(patient, programme: nil, show_caption: false)
     super
 
     @patient = patient
+    @programme = programme
     @show_caption = show_caption
-    @show_programme = show_programme
   end
 
   private
 
-  attr_reader :patient, :show_caption, :show_programme
+  attr_reader :patient, :programme, :show_caption
+
+  def show_programme = programme.nil?
 
   def vaccination_records
     patient
       .vaccination_records
+      .then { programme ? it.where(programme:) : it }
       .includes(:location, :programme)
       .order(performed_at: :desc)
   end

app/views/patients/show.html.erb

@@ -30,9 +30,5 @@
 
 <%= render AppCardComponent.new(section: true) do |card| %>
   <% card.with_heading { "Vaccinations" } %>
-  <%= render AppPatientVaccinationTableComponent.new(
-        @patient,
-        show_caption: false,
-        show_programme: true,
-      ) %>
+  <%= render AppPatientVaccinationTableComponent.new(@patient, show_caption: false) %>
 <% end %>

spec/components/app_patient_vaccination_table_component_spec.rb

@@ -3,19 +3,15 @@
 describe AppPatientVaccinationTableComponent do
   subject { render_inline(component) }
 
-  let(:component) do
-    described_class.new(patient, show_caption:, show_programme:)
-  end
+  let(:component) { described_class.new(patient, programme:, show_caption:) }
 
   let(:patient) { create(:patient) }
+  let(:programme) { nil }
   let(:show_caption) { false }
-  let(:show_programme) { false }
 
   it { should have_content("No vaccinations") }
 
   context "with a vaccination record" do
-    let(:programme) { create(:programme, :hpv) }
-
     let(:location) do
       create(
         :school,
@@ -26,12 +22,19 @@
       )
     end
 
+    let(:vaccination_record_programme) { create(:programme, :hpv) }
+
     before do
       create(
         :vaccination_record,
         patient:,
-        session: create(:session, location:, programmes: [programme]),
-        programme:,
+        session:
+          create(
+            :session,
+            location:,
+            programmes: [vaccination_record_programme]
+          ),
+        programme: vaccination_record_programme,
         performed_at: Time.zone.local(2024, 1, 1)
       )
     end
@@ -40,12 +43,23 @@
     it { should have_content("Test School") }
     it { should have_content("Waterloo Road, London, SE1 8TY") }
     it { should have_content("Vaccinated") }
-    it { should_not have_content("HPV") }
+    it { should have_content("HPV") }
+
+    context "when showing records from a specific programme" do
+      let(:programme) { vaccination_record_programme }
+
+      it { should_not have_content("HPV") }
+    end
 
-    context "when showing the programme" do
-      let(:show_programme) { true }
+    context "with a vaccination record from a different programme" do
+      let(:programme) { create(:programme, :hpv) }
+      let(:vaccination_record_programme) { create(:programme, :flu) }
 
-      it { should have_content("HPV") }
+      it { should_not have_link("1 January 2024") }
+      it { should_not have_content("Test School") }
+      it { should_not have_content("Waterloo Road, London, SE1 8TY") }
+      it { should_not have_content("Vaccinated") }
+      it { should_not have_content("HPV") }
     end
   end
 end