Resource consolidation after using the AllChangesSquashedBundlePost upload strategy for resource creation.

engine/src/androidTest/java/com/google/android/fhir/sync/upload/HttpPostResourceConsolidatorTest.kt

@@ -20,12 +20,15 @@ import android.content.Context
 import androidx.test.core.app.ApplicationProvider
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import ca.uhn.fhir.context.FhirContext
+import ca.uhn.fhir.context.FhirVersionEnum
 import com.google.android.fhir.FhirServices
 import com.google.android.fhir.db.Database
 import com.google.android.fhir.db.ResourceNotFoundException
 import com.google.android.fhir.logicalId
 import com.google.common.truth.Truth.assertThat
 import kotlinx.coroutines.runBlocking
+import org.hl7.fhir.r4.model.Bundle
+import org.hl7.fhir.r4.model.Bundle.BundleEntryComponent
 import org.hl7.fhir.r4.model.DomainResource
 import org.hl7.fhir.r4.model.InstantType
 import org.hl7.fhir.r4.model.Observation
@@ -228,4 +231,230 @@ class HttpPostResourceConsolidatorTest {
  )
  .isEqualTo("Patient/patient2")
  }
+
+ @Test
+ fun consolidate_allChangesBundleSquashedPost_shouldUpdateResourceId() = runBlocking {
+ val preSyncPatientJsonString =
+ """
+ {
+ "resourceType": "Patient",
+ "id": "patient1"
+ }
+ """
+ .trimIndent()
+ val preSyncPatient =
+ FhirContext.forCached(FhirVersionEnum.R4)
+ .newJsonParser()
+ .parseResource(preSyncPatientJsonString) as DomainResource
+ database.insert(preSyncPatient)
+ val localChanges =
+ database.getLocalChanges(preSyncPatient.resourceType, preSyncPatient.logicalId)
+ val bundleEntryComponentJsonString =
+ """
+ {
+ "resourceType": "Bundle",
+ "id": "bundle1",
+ "type": "transaction-response",
+ "entry": [
+ {
+ "response": {
+ "status": "201 Created",
+ "location": "Patient/patient2/_history/1",
+ "etag": "1",
+ "lastModified": "2024-04-08T11:15:42.648+00:00",
+ "outcome": {
+ "resourceType": "OperationOutcome"
+ }
+ }
+ },
+ {
+ "response": {
+ "status": "201 Created",
+ "location": "Encounter/8055/_history/1",
+ "etag": "1",
+ "lastModified": "2024-04-08T11:15:42.648+00:00",
+ "outcome": {
+ "resourceType": "OperationOutcome"
+ }
+ }
+ }
+ ]
+ }
+ """
+ .trimIndent()
+
+ val postSyncResponseBundle =
+ FhirContext.forCached(FhirVersionEnum.R4)
+ .newJsonParser()
+ .parseResource(bundleEntryComponentJsonString) as Bundle
+
+ val patientResponseEntry =
+ (postSyncResponseBundle.entry.firstOrNull() as BundleEntryComponent).response
+ val secondResponseEntry = postSyncResponseBundle.entry[1]
+
+ val uploadRequestResult =
+ UploadRequestResult.Success(
+ listOf(BundleComponentUploadResponseMapping(localChanges, patientResponseEntry)),
+ )
+
+ resourceConsolidator.consolidate(uploadRequestResult)
+
+ assertThat(database.select(ResourceType.Patient, "patient2").logicalId)
+ .isEqualTo(patientResponseEntry.resourceIdAndType?.first)
+
+ val exception =
+ assertThrows(ResourceNotFoundException::class.java) {
+ runBlocking { database.select(ResourceType.Patient, "patient1") }
+ }
+
+ assertThat(exception.message).isEqualTo("Resource not found with type Patient and id patient1!")
+ }
+
+ @Test
+ fun consolidate_allChangesBundleSquashedPost_dependentResources_shouldUpdateReferenceValue() =
+ runBlocking {
+ val preSyncPatientJsonString =
+ """
+ {
+ "resourceType": "Patient",
+ "id": "patient1"
+ }
+ """
+ .trimIndent()
+ val preSyncPatient =
+ FhirContext.forCached(FhirVersionEnum.R4)
+ .newJsonParser()
+ .parseResource(preSyncPatientJsonString) as DomainResource
+ val preSyncObservationJsonString =
+ """
+ {
+ "resourceType": "Observation",
+ "id": "observation1",
+ "subject": {
+ "reference": "Patient/patient1"
+ }
+ }
+ """
+ .trimIndent()
+ val preSyncObservation =
+ FhirContext.forCached(FhirVersionEnum.R4)
+ .newJsonParser()
+ .parseResource(preSyncObservationJsonString) as DomainResource
+ database.insert(preSyncPatient, preSyncObservation)
+ val patientLocalChanges =
+ database.getLocalChanges(preSyncPatient.resourceType, preSyncPatient.logicalId)
+ val observationLocalChanges =
+ database.getLocalChanges(preSyncObservation.resourceType, preSyncObservation.logicalId)
+ val bundleEntryComponentJsonString =
+ """
+ {
+ "resourceType": "Bundle",
+ "id": "bundle1",
+ "type": "transaction-response",
+ "entry": [
+ {
+ "response": {
+ "status": "201 Created",
+ "location": "Patient/patient2/_history/1",
+ "etag": "1",
+ "lastModified": "2024-04-08T11:15:42.648+00:00",
+ "outcome": {
+ "resourceType": "OperationOutcome"
+ }
+ }
+ },
+ {
+ "response": {
+ "status": "201 Created",
+ "location": "Observation/observation2/_history/1",
+ "etag": "1",
+ "lastModified": "2024-04-08T11:15:42.648+00:00",
+ "outcome": {
+ "resourceType": "OperationOutcome"
+ }
+ }
+ }
+ ]
+ }
+ """
+ .trimIndent()
+
+ val postSyncResponseBundle =
+ FhirContext.forCached(FhirVersionEnum.R4)
+ .newJsonParser()
+ .parseResource(bundleEntryComponentJsonString) as Bundle
+
+ val patientResponseEntry =
+ (postSyncResponseBundle.entry.firstOrNull() as BundleEntryComponent).response
+ val observationResponseEntry =
+ (postSyncResponseBundle.entry[1] as BundleEntryComponent).response
+
+ val uploadRequestResult =
+ UploadRequestResult.Success(
+ listOf(
+ BundleComponentUploadResponseMapping(patientLocalChanges, patientResponseEntry),
+ BundleComponentUploadResponseMapping(observationLocalChanges, observationResponseEntry),
+ ),
+ )
+
+ resourceConsolidator.consolidate(uploadRequestResult)
+
+ assertThat(
+ (database.select(ResourceType.Observation, "observation2") as Observation)
+ .subject
+ .reference,
+ )
+ .isEqualTo("Patient/patient2")
+ }
+
+ @Test
+ fun consolidate_allChangesBundleSquashedPost_shouldDiscardLocalChanges() = runBlocking {
+ val preSyncPatientJsonString =
+ """
+ {
+ "resourceType": "Patient",
+ "id": "patient1"
+ }
+ """
+ .trimIndent()
+ val preSyncPatient =
+ FhirContext.forCached(FhirVersionEnum.R4)
+ .newJsonParser()
+ .parseResource(preSyncPatientJsonString) as DomainResource
+ database.insert(preSyncPatient)
+ val localChanges =
+ database.getLocalChanges(preSyncPatient.resourceType, preSyncPatient.logicalId)
+ val bundleEntryComponentJsonString =
+ """
+ {
+ "resourceType": "Bundle",
+ "id": "bundle1",
+ "type": "transaction-response",
+ "entry": [
+ {
+ "response": {
+ "status": "201 Created",
+ "location": "Patient/patient2/_history/1",
+ "etag": "1"
+ }
+ }
+ ]
+ }
+ """
+ .trimIndent()
+ val postSyncResponseBundle =
+ FhirContext.forCached(FhirVersionEnum.R4)
+ .newJsonParser()
+ .parseResource(bundleEntryComponentJsonString) as Bundle
+ val patientResponseEntry =
+ (postSyncResponseBundle.entry.firstOrNull() as BundleEntryComponent).response
+ val uploadRequestResult =
+ UploadRequestResult.Success(
+ listOf(BundleComponentUploadResponseMapping(localChanges, patientResponseEntry)),
+ )
+
+ resourceConsolidator.consolidate(uploadRequestResult)
+
+ assertThat(database.getAllLocalChanges()).isEmpty()
+ }
 }

engine/src/main/java/com/google/android/fhir/FhirEngine.kt

@@ -112,7 +112,7 @@ interface FhirEngine {
  * This function initiates multiple server calls to upload local changes. The results of each call
  * are emitted as [UploadRequestResult] objects, which can be collected using a [Flow].
  *
- * @param localChangesFetchMode Specifies how to fetch local changes for upload.
+ * @param uploadStrategy Defines strategies for uploading FHIR resource.
  * @param upload A suspending function that takes a list of [LocalChange] objects and returns a
  * [Flow] of [UploadRequestResult] objects.
  * @return A [Flow] that emits the progress of the synchronization process as [SyncUploadProgress]

engine/src/main/java/com/google/android/fhir/db/Database.kt

@@ -63,6 +63,30 @@ internal interface Database {
  lastUpdated: Instant,
  )
 
+ /**
+ * Updates existing [Resource] present in the [ResourceEntity]. It updates [Resource.id],
+ * metadata, and reference values of the dependent resources. This method is more suitable if
+ * [preSyncResourceId] and post-sync resourceId [postSyncResource] are different. However, even if
+ * [preSyncResourceId] and post-sync resourceId are the same, it still updates the reference value
+ * of referring resources, which is just redundant.
+ *
+ * @param preSyncResourceId The [Resource.id] of the resource before synchronization.
+ * @param postSyncResourceID The [Resource.id] of the resource after synchronization.
+ * @param postSyncResourceVersionId The version id of the resource after synchronization.
+ * @param postSyncResourceLastUpdated The last modified time of the resource after
+ * synchronization.
+ * @param dependentResources The dependent resources for which the reference value will be
+ * changed.
+ */
+ suspend fun updateResourcesPostSync(
+ preSyncResourceId: String,
+ postSyncResourceID: String,
+ resourceType: ResourceType,
+ postSyncResourceVersionId: String,
+ postSyncResourceLastUpdated: Instant,
+ dependentResources: List<UUID> = emptyList(),
+ )
+
  /**
  * Selects the FHIR resource of type `clazz` with `id`.
  *
@@ -194,6 +218,21 @@ internal interface Database {
  suspend fun getLocalChangeResourceReferences(
  localChangeIds: List<Long>,
  ): List<LocalChangeResourceReference>
+
+ /**
+ * Retrieves a list of UUIDs for resources that reference [preSyncResourceId]. [preSyncResourceId]
+ * can be referenced as the reference value in other resources, returning those resource UUIDs.
+ * Essentially, [LocalChangeResourceReference] contains
+ * [LocalChangeResourceReference.resourceReferenceValue] and
+ * [LocalChangeResourceReference.localChangeId]. [LocalChange] contains UUIDs for every resource.
+ *
+ * @param preSyncResource The resource that is being referenced.
+ * @return A list of UUIDs of resources that reference [preSyncResource].
+ */
+ suspend fun getResourceUuidsThatReferenceTheGivenResource(
+ preSyncResourceId: String,
+ resourceType: ResourceType,
+ ): List<UUID>
 }
 
 internal data class ResourceWithUUID<R>(