Merge pull request #5879 from nhsuk/vaccination-record-match-ignore-time

Ignore time when matching vaccination records

Author: stevehook

app/jobs/search_vaccination_records_in_nhs_job.rb

@@ -110,9 +110,7 @@ def deduplicate_vaccination_records(incoming_vaccination_records)
           .includes(:team)
 
     grouped_vaccination_records =
-      vaccination_records.group_by do
-        [it.performed_at.to_date, it.programme_type]
-      end
+      vaccination_records.group_by { [it.performed_at_date, it.programme_type] }
 
     deduplicated_vaccination_records = []
 

app/models/immunisation_import_row.rb

@@ -138,7 +138,6 @@ def to_vaccination_record
       outcome:,
       patient_id: patient.id,
       performed_at_date:,
-      performed_at_time:,
       performed_by_user:,
       performed_ods_code: performed_ods_code&.to_s,
       programme_type: programme.type,
@@ -168,10 +167,11 @@ def to_vaccination_record
     attributes_to_stage_if_already_exists = {
       batch_number: batch_name&.to_s,
       batch_expiry: batch_expiry&.to_date,
-      notes: notes&.to_s,
-      vaccine_id: vaccine&.id,
       discarded_at: nil,
-      source:
+      notes: notes&.to_s,
+      performed_at_time:,
+      source:,
+      vaccine_id: vaccine&.id
     }
 
     vaccination_record =

spec/models/immunisation_import_row_spec.rb

@@ -1311,7 +1311,7 @@
         end
       end
 
-      context "with an existing vaccination record" do
+      context "with an existing vaccination record with the same UUID" do
         let!(:existing_vaccination_record) do
           create(
             :vaccination_record,
@@ -1336,6 +1336,38 @@
         end
       end
 
+      context "with an existing vaccination record with the same programme and date" do
+        let(:vaccine) { Vaccine.find_by!(upload_name: "Gardasil9") }
+        let(:patient) do
+          create(
+            :patient,
+            given_name:,
+            family_name:,
+            date_of_birth: Date.parse(date_of_birth),
+            address_postcode:,
+            nhs_number:
+          )
+        end
+
+        let!(:existing_vaccination_record) do
+          create(
+            :vaccination_record,
+            location_name: "Waterloo Road",
+            patient:,
+            performed_at: Time.zone.local(2024, 1, 1, 12, 30),
+            performed_by_user: nil,
+            performed_ods_code: "ABC",
+            programme: programmes.first,
+            vaccine:
+          )
+        end
+
+        let(:data) { valid_data }
+
+        it { should_not be_nil }
+        it { should eq(existing_vaccination_record) }
+      end
+
       describe "#batch_number" do
         subject(:batch_number) { vaccination_record.batch_number }