fix: add the missing location details to a newly created declaration which was causing advanced search to break

CHANGELOG.md

@@ -72,6 +72,7 @@
 ## Bug fixes
 
 - On slow connections or in rare corner cases, it was possible that the same record got saved to the database twice. This was caused by a bug in how the unique technical identifier we generate were stored as FHIR. The backend now ensures every record is submitted only once. [#7477](https://github.com/opencrvs/opencrvs-core/issues/7477)
+- When a declaration(birth/death) is created the event location information was not being parsed to ElasticSearch which caused the Advanced search feature to not work when searching for records by event location.[7494](https://github.com/opencrvs/opencrvs-core/issues/7494)
 
 ## 1.5.0 (TBD)
 

packages/workflow/src/records/fhir.ts

@@ -51,7 +51,8 @@ import {
   RegistrationStatus,
   getResourceFromBundleById,
   TransactionResponse,
-  TaskIdentifierSystem
+  TaskIdentifierSystem,
+  Location
 } from '@opencrvs/commons/types'
 import { FHIR_URL } from '@workflow/constants'
 import fetch from 'node-fetch'
@@ -1453,3 +1454,24 @@ export async function getTaskHistory(taskId: string): Promise<Bundle<Task>> {
 
   return res.json()
 }
+
+export async function getLocationsById(
+  locationIds: Array<string>
+): Promise<Bundle<Location>> {
+  const res = await fetch(
+    new URL(`/fhir/Location?_id=${locationIds.join(',')}`, FHIR_URL).href,
+    {
+      method: 'GET',
+      headers: {
+        'Content-Type': 'application/fhir+json'
+      }
+    }
+  )
+  if (!res.ok) {
+    throw new Error(
+      `Fetching locations from Hearth failed with [${res.status}] body: ${res.statusText}`
+    )
+  }
+
+  return res.json()
+}

packages/workflow/src/records/handler/create.ts

@@ -30,7 +30,11 @@ import {
   isValidated,
   isWaitingExternalValidation,
   isComposition,
-  getTaskFromSavedBundle
+  getTaskFromSavedBundle,
+  Encounter,
+  Location,
+  findEncounterFromRecord,
+  Saved
 } from '@opencrvs/commons/types'
 import {
   getToken,
@@ -39,6 +43,7 @@ import {
 } from '@workflow/utils/auth-utils'
 import {
   findTaskFromIdentifier,
+  getLocationsById,
   mergeBundles,
   sendBundleToHearth,
   toSavedBundle,
@@ -137,6 +142,31 @@ function createInProgressOrReadyForReviewTask(
   }
 }
 
+async function resolveLocationsForEncounter(
+  encounter: Encounter
+): Promise<Bundle<Location> | null> {
+  if (encounter.location == null) {
+    return null
+  }
+  const locationIds: Array<string> = []
+  for (const { location } of encounter.location) {
+    locationIds.push(location.reference.split('/')[1])
+  }
+  return getLocationsById(locationIds)
+}
+
+function bundleIncludesLocationResources(record: Saved<Bundle>) {
+  const encounter = findEncounterFromRecord(record)
+  const locationIds =
+    encounter?.location?.map(
+      ({ location }) => location.reference.split('/')[1]
+    ) || []
+
+  return record.entry
+    .filter(({ resource }) => resource.resourceType == 'Location')
+    .every(({ resource }) => locationIds?.includes(resource.id))
+}
+
 async function createRecord(
   recordDetails: z.TypeOf<typeof requestSchema>['record'],
   event: z.TypeOf<typeof requestSchema>['event'],
@@ -192,7 +222,24 @@ async function createRecord(
     ? changeState(savedBundle, 'IN_PROGRESS')
     : changeState(savedBundle, 'READY_FOR_REVIEW')
 
-  return mergeBundles(record, practitionerResourcesBundle)
+  const mergedBundle = mergeBundles(record, practitionerResourcesBundle)
+
+  const encounter = findEncounterFromRecord(record)
+  if (encounter == null) {
+    return mergedBundle
+  }
+
+  if (bundleIncludesLocationResources(record)) {
+    return mergedBundle
+  }
+
+  const locationResourcesBundle = await resolveLocationsForEncounter(encounter)
+
+  if (locationResourcesBundle == null) {
+    return mergedBundle
+  }
+
+  return mergeBundles(mergedBundle, locationResourcesBundle)
 }
 
 type CreatedRecord =