Merge pull request #6519 from NHSDigital/alistair/imms-api-suppress-duplicates-in-activity-log

Don't show duplicate Imms API vaccs records in activity log

Author: alistair-white-horne-tng

app/components/app_activity_log_component.rb

@@ -485,55 +485,63 @@ def triage_events
   end
 
   def vaccination_events
-    vaccination_records.flat_map do |vaccination_record|
-      title =
-        if vaccination_record.administered?
-          if (vaccine = vaccination_record.vaccine)
-            "Vaccinated with #{vaccine.brand}"
-          elsif vaccination_record.sourced_from_manual_report?
-            "Vaccination record added manually"
-          elsif vaccination_record.sourced_from_historical_upload?
-            "Vaccination record uploaded"
+    events =
+      vaccination_records.flat_map do |vaccination_record|
+        if vaccination_record.sourced_from_nhs_immunisations_api? &&
+             vaccination_record.discarded?
+          next
+        end
+
+        title =
+          if vaccination_record.administered?
+            if (vaccine = vaccination_record.vaccine)
+              "Vaccinated with #{vaccine.brand}"
+            elsif vaccination_record.sourced_from_manual_report?
+              "Vaccination record added manually"
+            elsif vaccination_record.sourced_from_historical_upload?
+              "Vaccination record uploaded"
+            else
+              "Vaccinated"
+            end
           else
-            "Vaccinated"
+            "Vaccination not given: #{vaccination_record.human_enum_name(:outcome)}"
           end
-        else
-          "Vaccination not given: #{vaccination_record.human_enum_name(:outcome)}"
-        end
 
-      subtitle =
-        if historical_vaccination_event?(vaccination_record)
-          "Record added to Mavis #{vaccination_record.created_at.to_fs(:long)} · " \
-            "Vaccination given #{vaccination_record.performed_at.to_date.to_fs(:long)}"
-        end
+        subtitle =
+          if historical_vaccination_event?(vaccination_record)
+            "Record added to Mavis #{vaccination_record.created_at.to_fs(:long)} · " \
+              "Vaccination given #{vaccination_record.performed_at.to_date.to_fs(:long)}"
+          end
 
-      at =
-        if historical_vaccination_event?(vaccination_record)
-          vaccination_record.created_at
-        else
-          vaccination_record.performed_at
-        end
+        at =
+          if historical_vaccination_event?(vaccination_record)
+            vaccination_record.created_at
+          else
+            vaccination_record.performed_at
+          end
 
-      kept = {
-        title:,
-        body: vaccination_record.notes,
-        at:,
-        by: vaccination_record.performed_by,
-        programmes: [vaccination_record.programme],
-        subtitle:
-      }
+        kept = {
+          title:,
+          body: vaccination_record.notes,
+          at:,
+          by: vaccination_record.performed_by,
+          programmes: [vaccination_record.programme],
+          subtitle:
+        }
 
-      discarded =
-        if vaccination_record.discarded?
-          {
-            title: "Vaccination record archived",
-            at: vaccination_record.discarded_at,
-            programmes: [vaccination_record.programme]
-          }
-        end
+        discarded =
+          if vaccination_record.discarded?
+            {
+              title: "Vaccination record archived",
+              at: vaccination_record.discarded_at,
+              programmes: [vaccination_record.programme]
+            }
+          end
 
-      [kept, discarded].compact
-    end
+        [kept, discarded].compact
+      end
+
+    events.compact
   end
 
   def historical_vaccination_event?(vaccination_record)

spec/components/app_activity_log_component_spec.rb

@@ -347,29 +347,6 @@
                      programme: "Flu"
   end
 
-  describe "vaccination not administered" do
-    before do
-      create(
-        :vaccination_record,
-        :not_administered,
-        programme: programmes.first,
-        patient:,
-        session:,
-        performed_at: Time.zone.local(2025, 5, 31, 13),
-        performed_by: user,
-        notes: "Some notes.",
-        vaccine: programmes.first.vaccines.find_by!(upload_name: "Gardasil")
-      )
-    end
-
-    include_examples "card",
-                     title: "Vaccination not given: Unwell",
-                     date: "31 May 2025 at 1:00pm",
-                     notes: "Some notes.",
-                     by: "JOY, Nurse",
-                     programme: "HPV"
-  end
-
   describe "historical upload" do
     let(:date_and_time) { Time.zone.local(2026, 3, 4, 11, 30) }
 
@@ -394,32 +371,6 @@
                      programme: "HPV"
   end
 
-  describe "discarded vaccination" do
-    before do
-      create(
-        :vaccination_record,
-        :discarded,
-        programme: programmes.first,
-        patient:,
-        session:,
-        performed_at: Time.zone.local(2025, 5, 31, 13),
-        discarded_at: Time.zone.local(2025, 5, 31, 14),
-        performed_by: user
-      )
-    end
-
-    include_examples "card",
-                     title: "Vaccinated with Gardasil 9",
-                     date: "31 May 2025 at 1:00pm",
-                     by: "JOY, Nurse",
-                     programme: "HPV"
-
-    include_examples "card",
-                     title: "Vaccination record archived",
-                     date: "31 May 2025 at 2:00pm",
-                     programme: "HPV"
-  end
-
   describe "self-consent" do
     before do
       create(
@@ -708,11 +659,34 @@
   end
 
   describe "vaccination records" do
-    context "for the MMRV variant" do
+    let(:programme) { Programme.hpv }
+
+    context "for an administered vaccination record" do
+      before do
+        create(
+          :vaccination_record,
+          programme:,
+          patient:,
+          session:,
+          performed_at: Time.zone.local(2025, 5, 31, 13),
+          performed_by: user,
+          notes: "Some notes.",
+          vaccine: programme.vaccines.find_by!(upload_name: "Gardasil9")
+        )
+      end
+
+      include_examples "card",
+                       title: "Vaccinated with Gardasil 9",
+                       date: "31 May 2025 at 1:00pm",
+                       notes: "Some notes.",
+                       by: "JOY, Nurse",
+                       programme: "HPV"
+    end
+
+    context "for an MMRV variant record" do
       let(:programme) do
         Programme::Variant.new(Programme.mmr, variant_type: "mmrv")
       end
-      let(:programmes) { [programme] }
 
       before do
         create(
@@ -729,6 +703,85 @@
                        date: "31 May 2025 at 1:00pm",
                        programme: "MMRV"
     end
+
+    context "for a not administered record" do
+      before do
+        create(
+          :vaccination_record,
+          :not_administered,
+          programme:,
+          patient:,
+          session:,
+          performed_at: Time.zone.local(2025, 5, 31, 13),
+          performed_by: user,
+          notes: "Some notes.",
+          vaccine: programmes.first.vaccines.find_by!(upload_name: "Gardasil")
+        )
+      end
+
+      include_examples "card",
+                       title: "Vaccination not given: Unwell",
+                       date: "31 May 2025 at 1:00pm",
+                       notes: "Some notes.",
+                       by: "JOY, Nurse",
+                       programme: "HPV"
+    end
+
+    context "for a discarded record" do
+      before do
+        create(
+          :vaccination_record,
+          :discarded,
+          programme:,
+          patient:,
+          session:,
+          performed_at: Time.zone.local(2025, 5, 31, 13),
+          discarded_at: Time.zone.local(2025, 5, 31, 14),
+          performed_by: user
+        )
+      end
+
+      include_examples "card",
+                       title: "Vaccinated with Gardasil 9",
+                       date: "31 May 2025 at 1:00pm",
+                       by: "JOY, Nurse",
+                       programme: "HPV"
+
+      include_examples "card",
+                       title: "Vaccination record archived",
+                       date: "31 May 2025 at 2:00pm",
+                       programme: "HPV"
+    end
+
+    context "for a discarded Imms API record" do
+      before do
+        create(
+          :vaccination_record,
+          :discarded,
+          :sourced_from_nhs_immunisations_api,
+          programme:,
+          patient:,
+          session:,
+          performed_at: Time.zone.local(2025, 5, 31, 13),
+          discarded_at: Time.zone.local(2025, 5, 31, 14),
+          performed_by: user
+        )
+      end
+
+      it "doesn't render card 'vaccinated'" do
+        expect(rendered).not_to have_css(
+          ".app-timeline__header",
+          text: "Vaccinated with"
+        )
+      end
+
+      it "doesn't render card 'archived'" do
+        expect(rendered).not_to have_css(
+          ".app-timeline__header",
+          text: "Vaccination record archived"
+        )
+      end
+    end
   end
 
   describe "patient merge events" do