Merge pull request #6548 from NHSDigital/alistair/imms-api-fix-duplicate-referencing

Fix referencing `duplicate_of_vaccination_record_id` after a second `Search...Job` run on the same records

Author: alistair-white-horne-tng

app/jobs/search_vaccination_records_in_nhs_job.rb

@@ -20,19 +20,23 @@ def perform(patient_id)
 
     return unless feature_flags_enabled
 
-    existing_vaccination_records.find_each do |vaccination_record|
+    existing_vaccination_records.each do |vaccination_record|
       incoming_vaccination_record =
         incoming_vaccination_records.find do
           it.nhs_immunisations_api_id ==
             vaccination_record.nhs_immunisations_api_id
         end
 
       if incoming_vaccination_record
-        vaccination_record.update!(
+        vaccination_record.assign_attributes(
           incoming_vaccination_record
             .attributes
             .except("id", "uuid", "created_at")
-            .merge(updated_at: Time.current)
+            .merge(
+              duplicate_of_vaccination_record:
+                incoming_vaccination_record.duplicate_of_vaccination_record,
+              updated_at: Time.current
+            )
         )
 
         incoming_vaccination_records.delete(incoming_vaccination_record)
@@ -41,10 +45,12 @@ def perform(patient_id)
       end
     end
 
-    # Remaining incoming_vaccination_records are new.
     # Save non-discarded records first so they have IDs before discarded
     # duplicates reference them via duplicate_of_vaccination_record_id.
-    incoming_vaccination_records.sort_by { it.discarded? ? 1 : 0 }.each(&:save!)
+    (
+      existing_vaccination_records.reject(&:destroyed?) +
+        incoming_vaccination_records
+    ).sort_by { it.discarded? ? 1 : 0 }.each(&:save!)
 
     update_vaccination_search_timestamps if patient.nhs_number.present?
 
@@ -104,6 +110,7 @@ def existing_vaccination_records
     @existing_vaccination_records ||=
       patient
         .vaccination_records
+        .with_discarded
         .includes(:identity_check)
         .sourced_from_nhs_immunisations_api
         .for_programmes(programmes)
@@ -150,8 +157,23 @@ def deduplicate_vaccination_records(incoming_vaccination_records)
           end
       elsif records.any?(&:nhs_immunisations_api_primary_source)
         # If some records have `primarySource: true`, set `discarded_at` for all `primarySource: false` records,
-        # pointing each at the first `primarySource: true` record
-        canonical = records.find(&:nhs_immunisations_api_primary_source)
+        # pointing each at the first `primarySource: true` record.
+
+        canonical_incoming =
+          records.find(&:nhs_immunisations_api_primary_source)
+        canonical_existing =
+          patient
+            .vaccination_records
+            .sourced_from_nhs_immunisations_api
+            .with_discarded
+            .find_by(
+            nhs_immunisations_api_id:
+              canonical_incoming.nhs_immunisations_api_id
+          )
+
+        # Prefer the persisted DB record (if it already exists from a previous run) so that
+        # `duplicate_of_vaccination_record_id` is non-nil when the non-primary record is saved.
+        canonical = canonical_existing || canonical_incoming
         records
           .select(&:sourced_from_nhs_immunisations_api?)
           .reject(&:nhs_immunisations_api_primary_source)

…iles/fhir/search_response_0_results.json …les/fhir/search_responses/0_results.jsonspec/fixtures/files/fhir/search_response_0_results.json renamed to spec/fixtures/files/fhir/search_responses/0_results.json spec/fixtures/files/fhir/search_response_0_results.json renamed to spec/fixtures/files/fhir/search_responses/0_results.json

@@ -0,0 +1,124 @@
+{
+  "type": "searchset",
+  "total": 1,
+  "link": [
+    {
+      "relation": "self",
+      "url": "https://api.service.nhs.uk/immunisation-fhir-api/Immunization?-immunization.target=FLU,HPV,MENACWY,3IN1,MMR,MMRV&patient.identifier=https%3A%2F%2Ffhir.nhs.uk%2FId%2Fnhs-number%7C9449308357"
+    }
+  ],
+  "entry": [
+    {
+      "fullUrl": "https://api.service.nhs.uk/immunisation-fhir-api/Immunization/322a54c7-acd8-4eb7-adbc-4006938df8f2",
+      "resource": {
+        "id": "322a54c7-acd8-4eb7-adbc-4006938df8f2",
+        "extension": [
+          {
+            "url": "https://fhir.hl7.org.uk/StructureDefinition/Extension-UKCore-VaccinationProcedure",
+            "valueCodeableConcept": {
+              "coding": [
+                {
+                  "system": "http://snomed.info/sct",
+                  "code": "884861000000100",
+                  "display": "Administration of first intranasal seasonal influenza vaccination"
+                }
+              ]
+            }
+          }
+        ],
+        "identifier": [
+          {
+            "use": "official",
+            "system": "YGA",
+            "value": "TPP_V_429814877"
+          }
+        ],
+        "status": "completed",
+        "vaccineCode": {
+          "coding": [
+            {
+              "system": "http://snomed.info/sct",
+              "code": "46233009",
+              "display": "Influenza vaccine"
+            }
+          ]
+        },
+        "patient": {
+          "reference": "urn:uuid:c3e7be44-bb52-4df7-8232-7500ed90c137",
+          "type": "Patient",
+          "identifier": {
+            "system": "https://fhir.nhs.uk/Id/nhs-number",
+            "value": "9449308357"
+          }
+        },
+        "occurrenceDateTime": "2025-09-24T00:00:00+00:00",
+        "recorded": "2025-10-02",
+        "primarySource": false,
+        "location": {
+          "identifier": {
+            "system": "https://fhir.nhs.uk/Id/ods-organization-code",
+            "value": "100001"
+          }
+        },
+        "lotNumber": "BU5086",
+        "site": {
+          "coding": [
+            {
+              "system": "http://snomed.info/sct",
+              "code": "279549004",
+              "display": "Nasal cavity structure"
+            }
+          ]
+        },
+        "performer": [
+          {
+            "actor": {
+              "type": "Organization",
+              "identifier": {
+                "system": "https://fhir.nhs.uk/Id/ods-organization-code",
+                "value": "R1L"
+              }
+            }
+          }
+        ],
+        "protocolApplied": [
+          {
+            "targetDisease": [
+              {
+                "coding": [
+                  {
+                    "system": "http://snomed.info/sct",
+                    "code": "6142004",
+                    "display": "Influenza caused by seasonal influenza virus (disorder)"
+                  }
+                ]
+              }
+            ],
+            "doseNumberPositiveInt": 1
+          }
+        ],
+        "resourceType": "Immunization"
+      },
+      "search": {
+        "mode": "match"
+      }
+    },
+    {
+      "fullUrl": "urn:uuid:c3e7be44-bb52-4df7-8232-7500ed90c137",
+      "resource": {
+        "id": "7101120547",
+        "identifier": [
+          {
+            "system": "https://fhir.nhs.uk/Id/nhs-number",
+            "value": "7101120547"
+          }
+        ],
+        "resourceType": "Patient"
+      },
+      "search": {
+        "mode": "include"
+      }
+    }
+  ],
+  "resourceType": "Bundle"
+}