Show the denormalised batch data in the UI

This displays the denormalised batch data on the VaccinationRecord
view page.

Author: alistair-white-horne-tng

app/components/app_vaccination_record_summary_component.rb

@@ -13,6 +13,8 @@ def initialize(
     @show_notes = show_notes
 
     @batch = vaccination_record.batch
+    @batch_name = vaccination_record.batch_name
+    @batch_expiry = vaccination_record.batch_expiry
     @identity_check = vaccination_record.identity_check
     @patient = vaccination_record.patient
     @programme = vaccination_record.programme
@@ -68,10 +70,10 @@ def call
         summary_list.with_row do |row|
           row.with_key { "Batch ID" }
 
-          if @batch
+          if @batch || @batch_name
             row.with_value(classes: ["app-u-monospace"]) { batch_id_value }
 
-            if (href = @change_links[:batch])
+            if @batch && (href = @change_links[:batch])
               row.with_action(
                 text: "Change",
                 href:,
@@ -85,7 +87,7 @@ def call
           end
         end
 
-        if @batch
+        if @batch || @batch_expiry
           summary_list.with_row do |row|
             row.with_key { "Batch expiry date" }
             row.with_value { batch_expiry_value }
@@ -318,13 +320,18 @@ def dose_volume_value
   end
 
   def batch_id_value
-    highlight_if(@batch.name, @vaccination_record.batch_id_changed?)
+    highlight_if(
+      @batch&.name || @batch_name,
+      @vaccination_record.batch_id_changed? ||
+        @vaccination_record.batch_name_changed?
+    )
   end
 
   def batch_expiry_value
     highlight_if(
-      @batch.expiry&.to_fs(:long) || "Unknown",
-      @vaccination_record.batch_id_changed?
+      @batch&.expiry&.to_fs(:long) || @batch_expiry&.to_fs(:long) || "Unknown",
+      @vaccination_record.batch_id_changed? ||
+        @vaccination_record.batch_expiry_changed?
     )
   end
 

spec/components/app_vaccination_record_summary_component_spec.rb

@@ -17,6 +17,8 @@
   let(:batch) do
     create(:batch, name: "ABC", expiry: Date.new(2026, 1, 1), vaccine:)
   end
+  let(:batch_name) { nil }
+  let(:batch_expiry) { nil }
   let(:other_batch) do
     create(:batch, name: "DEF", expiry: Date.new(2027, 1, 1), vaccine:)
   end
@@ -31,6 +33,8 @@
       performed_at:,
       outcome:,
       batch:,
+      batch_name:,
+      batch_expiry:,
       vaccine:,
       patient:,
       session:,
@@ -161,24 +165,89 @@
   end
 
   describe "batch ID row" do
-    it { should have_css(".nhsuk-summary-list__row", text: "Batch IDABC") }
+    context "with a batch, and vaccine" do
+      it { should have_css(".nhsuk-summary-list__row", text: "Batch IDABC") }
+    end
 
-    context "without a vaccine" do
+    context "with a batch_name, and vaccine" do
+      let(:batch) { nil }
+      let(:batch_name) { "ABC" }
+      let(:batch_expiry) { Date.new(2026, 1, 1) }
+
+      it { should have_css(".nhsuk-summary-list__row", text: "Batch IDABC") }
+    end
+
+    context "with a batch_name, and no vaccine" do
+      let(:vaccine) { nil }
+      let(:batch) { nil }
+      let(:batch_name) { "ABC" }
+      let(:batch_expiry) { nil }
+      let(:other_batch) { nil }
+
+      it { should have_css(".nhsuk-summary-list__row", text: "Batch IDABC") }
+    end
+
+    context "without a vaccine, batch_name or batch_expiry" do
       let(:outcome) { :not_well }
       let(:vaccine) { nil }
       let(:batch) { nil }
+      let(:batch_name) { nil }
+      let(:batch_expiry) { nil }
       let(:other_batch) { nil }
 
       it { should_not have_css(".nhsuk-summary-list__row", text: "Batch ID") }
     end
   end
 
   describe "batch expiry date row" do
-    it do
-      expect(rendered).to have_css(
-        ".nhsuk-summary-list__row",
-        text: "Batch expiry date1 January 2026"
-      )
+    context "with a batch, and vaccine" do
+      it do
+        expect(rendered).to have_css(
+          ".nhsuk-summary-list__row",
+          text: "Batch expiry date1 January 2026"
+        )
+      end
+    end
+
+    context "with a batch_expiry, and vaccine" do
+      let(:batch) { nil }
+      let(:batch_name) { "ABC" }
+      let(:batch_expiry) { Date.new(2026, 1, 1) }
+
+      it do
+        expect(rendered).to have_css(
+          ".nhsuk-summary-list__row",
+          text: "Batch expiry date1 January 2026"
+        )
+      end
+    end
+
+    context "with a batch_expiry, and no vaccine" do
+      let(:vaccine) { nil }
+      let(:batch) { nil }
+      let(:batch_name) { "ABC" }
+      let(:batch_expiry) { Date.new(2026, 1, 1) }
+      let(:other_batch) { nil }
+
+      it do
+        expect(rendered).to have_css(
+          ".nhsuk-summary-list__row",
+          text: "Batch expiry date1 January 2026"
+        )
+      end
+    end
+
+    context "with a batch_expiry, but no batch_name" do
+      let(:batch) { nil }
+      let(:batch_name) { nil }
+      let(:batch_expiry) { Date.new(2026, 1, 1) }
+
+      it do
+        expect(rendered).to have_css(
+          ".nhsuk-summary-list__row",
+          text: "Batch expiry date1 January 2026"
+        )
+      end
     end
 
     context "without a vaccine" do