Update response metadata for default resource consolidator.

google · Apr 29, 2024 · 26cb5a7 · 26cb5a7
1 parent 366e3d5
commit 26cb5a7
Show file tree

Hide file tree

Showing 4 changed files with 58 additions and 5 deletions.
diff --git a/engine/src/main/java/com/google/android/fhir/db/Database.kt b/engine/src/main/java/com/google/android/fhir/db/Database.kt
@@ -63,6 +63,11 @@ internal interface Database {
     lastUpdated: Instant,
   )
 
+  /** Updates the `resource` meta in the FHIR resource database. */
+  suspend fun updateVersionIdAndLastUpdated(
+    resource: Resource,
+  )
+
   /**
    * Updates existing [Resource] present in the [ResourceEntity] for metadata such as versionId,
    * resourceId, lastModifiedTime, and reference value for other referring resources. In the

diff --git a/engine/src/main/java/com/google/android/fhir/db/impl/DatabaseImpl.kt b/engine/src/main/java/com/google/android/fhir/db/impl/DatabaseImpl.kt
@@ -17,6 +17,7 @@
 package com.google.android.fhir.db.impl
 
 import android.content.Context
+import android.util.Log
 import androidx.annotation.VisibleForTesting
 import androidx.room.Room
 import androidx.room.withTransaction
@@ -34,11 +35,16 @@ import com.google.android.fhir.db.impl.dao.ForwardIncludeSearchResult
 import com.google.android.fhir.db.impl.dao.ReverseIncludeSearchResult
 import com.google.android.fhir.db.impl.entities.ResourceEntity
 import com.google.android.fhir.index.ResourceIndexer
+import com.google.android.fhir.lastUpdated
 import com.google.android.fhir.logicalId
 import com.google.android.fhir.search.SearchQuery
 import com.google.android.fhir.toLocalChange
+import com.google.android.fhir.versionId
 import java.time.Instant
-import java.util.UUID
+import java.util.*
+import org.hl7.fhir.r4.model.IdType
+import org.hl7.fhir.r4.model.InstantType
+import org.hl7.fhir.r4.model.Meta
 import org.hl7.fhir.r4.model.Resource
 import org.hl7.fhir.r4.model.ResourceType
 
@@ -170,6 +176,37 @@ internal class DatabaseImpl(
         versionId,
         lastUpdated,
       )
+      resourceDao.getResourceEntity(resourceId, resourceType)?.let {
+        val preSyncResource = iParser.parseResource(it.serializedResource) as Resource
+        preSyncResource.meta =
+          Meta().apply {
+            versionIdElement = IdType(versionId)
+            lastUpdatedElement = InstantType(Date.from(lastUpdated))
+          }
+        resourceDao.updatePayloadPostSync(
+          preSyncResource.logicalId,
+          preSyncResource.resourceType,
+          iParser.encodeResourceToString(preSyncResource),
+        )
+      }
+    }
+  }
+
+  override suspend fun updateVersionIdAndLastUpdated(
+    resource: Resource,
+  ) {
+    db.withTransaction {
+      resourceDao.updateAndIndexRemoteVersionIdAndLastUpdate(
+        resource.logicalId,
+        resource.resourceType,
+        resource.meta.versionId,
+        resource.meta.lastUpdated.toInstant(),
+      )
+      resourceDao.updatePayloadPostSync(
+        resource.logicalId,
+        resource.resourceType,
+        iParser.encodeResourceToString(resource),
+      )
     }
   }
 

diff --git a/engine/src/main/java/com/google/android/fhir/db/impl/dao/ResourceDao.kt b/engine/src/main/java/com/google/android/fhir/db/impl/dao/ResourceDao.kt
@@ -211,6 +211,20 @@ internal abstract class ResourceDao {
     payloadPostSync: String,
   )
 
+  @Query(
+    """
+        UPDATE ResourceEntity
+        SET serializedResource = :postSyncSerializedResource
+        WHERE resourceId = :resourceId
+        AND resourceType = :resourceType
+    """,
+  )
+  abstract suspend fun updatePayloadPostSync(
+    resourceId: String,
+    resourceType: ResourceType,
+    postSyncSerializedResource: String,
+  )
+
   @Query(
     """
         UPDATE ResourceEntity

diff --git a/engine/src/main/java/com/google/android/fhir/sync/upload/ResourceConsolidator.kt b/engine/src/main/java/com/google/android/fhir/sync/upload/ResourceConsolidator.kt
@@ -85,10 +85,7 @@ internal class DefaultResourceConsolidator(private val database: Database) : Res
   private suspend fun updateVersionIdAndLastUpdated(resource: DomainResource) {
     if (resource.hasMeta() && resource.meta.hasVersionId() && resource.meta.hasLastUpdated()) {
       database.updateVersionIdAndLastUpdated(
-        resource.id,
-        resource.resourceType,
-        resource.meta.versionId,
-        resource.meta.lastUpdated.toInstant(),
+        resource,
       )
     }
   }