Start saving local lastUpdated to resources for search operations.

engine/schemas/com.google.android.fhir.db.impl.ResourceDatabase/3.json

@@ -2,11 +2,11 @@
  "formatVersion": 1,
  "database": {
  "version": 3,
- "identityHash": "6dd24dd7340c3808456a812933bc6838",
+ "identityHash": "229dd3fb6a2d9524db54c649e8ffb90d",
  "entities": [
  {
  "tableName": "ResourceEntity",
- "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `resourceUuid` BLOB NOT NULL, `resourceType` TEXT NOT NULL, `resourceId` TEXT NOT NULL, `serializedResource` TEXT NOT NULL, `versionId` TEXT, `lastUpdatedRemote` INTEGER)",
+ "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `resourceUuid` BLOB NOT NULL, `resourceType` TEXT NOT NULL, `resourceId` TEXT NOT NULL, `serializedResource` TEXT NOT NULL, `versionId` TEXT, `lastUpdatedRemote` INTEGER, `lastUpdatedLocal` INTEGER)",
  "fields": [
  {
  "fieldPath": "id",
@@ -49,6 +49,12 @@
  "columnName": "lastUpdatedRemote",
  "affinity": "INTEGER",
  "notNull": false
+ },
+ {
+ "fieldPath": "lastUpdatedLocal",
+ "columnName": "lastUpdatedLocal",
+ "affinity": "INTEGER",
+ "notNull": false
  }
  ],
  "primaryKey": {
@@ -935,7 +941,7 @@
  "views": [],
  "setupQueries": [
  "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
- "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, '6dd24dd7340c3808456a812933bc6838')"
+ "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, '229dd3fb6a2d9524db54c649e8ffb90d')"
  ]
  }
 }

engine/src/androidTest/java/com/google/android/fhir/db/impl/DatabaseImplTest.kt

@@ -29,6 +29,7 @@ import com.google.android.fhir.db.ResourceNotFoundException
 import com.google.android.fhir.db.impl.dao.toLocalChange
 import com.google.android.fhir.db.impl.entities.LocalChangeEntity
 import com.google.android.fhir.logicalId
+import com.google.android.fhir.search.LOCAL_LAST_UPDATED_PARAM
 import com.google.android.fhir.search.Operation
 import com.google.android.fhir.search.Order
 import com.google.android.fhir.search.Search
@@ -3075,6 +3076,33 @@ class DatabaseImplTest {
  assertThat(result.map { it.nameFirstRep.nameAsSingleString }).contains("Darcy Smith")
  }
 
+ @Test
+ fun search_patient_with_local_lastUpdated() = runBlocking {
+ database.insert(
+ Patient().apply { id = "patient-test-001" },
+ Patient().apply { id = "patient-test-002" },
+ Patient().apply { id = "patient-test-003" }
+ )
+
+ database.update(
+ Patient().apply {
+ id = "patient-test-002"
+ gender = Enumerations.AdministrativeGender.FEMALE
+ }
+ )
+
+ val result =
+ database.search<Patient>(
+ Search(ResourceType.Patient)
+ .apply { sort(LOCAL_LAST_UPDATED_PARAM, Order.DESCENDING) }
+ .getQuery()
+ )
+
+ assertThat(result.map { it.logicalId })
+ .containsAtLeast("patient-test-002", "patient-test-003", "patient-test-001")
+ .inOrder()
+ }
+
  private companion object {
  const val mockEpochTimeStamp = 1628516301000
  const val TEST_PATIENT_1_ID = "test_patient_1"

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

@@ -16,8 +16,10 @@
 
 package com.google.android.fhir.db
 
+import androidx.annotation.VisibleForTesting
 import com.google.android.fhir.db.impl.dao.LocalChangeToken
 import com.google.android.fhir.db.impl.dao.SquashedLocalChange
+import com.google.android.fhir.db.impl.entities.DateTimeIndexEntity
 import com.google.android.fhir.db.impl.entities.LocalChangeEntity
 import com.google.android.fhir.db.impl.entities.ResourceEntity
 import com.google.android.fhir.search.SearchQuery
@@ -145,4 +147,11 @@ internal interface Database {
  * delete resource entry from LocalChangeEntity table.
  */
  suspend fun purge(type: ResourceType, id: String, forcePurge: Boolean = false)
+
+ /** @return DateTimeIndexEntities for the resource. */
+ @VisibleForTesting
+ suspend fun getDateTimeIndexEntities(
+ resourceId: String,
+ resourceType: ResourceType
+ ): List<DateTimeIndexEntity>
 }

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

@@ -31,9 +31,12 @@ import com.google.android.fhir.db.impl.dao.SquashedLocalChange
 import com.google.android.fhir.db.impl.entities.LocalChangeEntity
 import com.google.android.fhir.db.impl.entities.ResourceEntity
 import com.google.android.fhir.index.ResourceIndexer
+import com.google.android.fhir.index.ResourceIndices
 import com.google.android.fhir.logicalId
 import com.google.android.fhir.search.SearchQuery
 import java.time.Instant
+import java.util.Date
+import org.hl7.fhir.r4.model.InstantType
 import org.hl7.fhir.r4.model.Resource
 import org.hl7.fhir.r4.model.ResourceType
 
@@ -110,22 +113,28 @@ internal class DatabaseImpl(
  override suspend fun <R : Resource> insert(vararg resource: R): List<String> {
  val logicalIds = mutableListOf<String>()
  db.withTransaction {
- logicalIds.addAll(resourceDao.insertAll(resource.toList()))
- localChangeDao.addInsertAll(resource.toList())
+ logicalIds.addAll(
+ resource.map {
+ val timeOfLocalChange = Instant.now()
+ localChangeDao.addInsert(it, timeOfLocalChange)
+ resourceDao.insertResourceLocal(it, timeOfLocalChange)
+ }
+ )
  }
  return logicalIds
  }
 
  override suspend fun <R : Resource> insertRemote(vararg resource: R) {
- db.withTransaction { resourceDao.insertAll(resource.toList()) }
+ db.withTransaction { resourceDao.insertAllRemote(resource.toList()) }
  }
 
  override suspend fun update(vararg resources: Resource) {
  db.withTransaction {
  resources.forEach {
+ val timeOfLocalChange = Instant.now()
  val oldResourceEntity = selectEntity(it.resourceType, it.logicalId)
- resourceDao.update(it)
- localChangeDao.addUpdate(oldResourceEntity, it)
+ resourceDao.update(it, timeOfLocalChange)
+ localChangeDao.addUpdate(oldResourceEntity, it, timeOfLocalChange)
  }
  }
  }
@@ -143,6 +152,20 @@ internal class DatabaseImpl(
  versionId,
  lastUpdated
  )
+ // update the remote lastUpdated index
+ val entity = selectEntity(resourceType, resourceId)
+ val indicesToUpdate =
+ ResourceIndices.Builder(resourceType, resourceId)
+ .apply {
+ addDateTimeIndex(
+ ResourceIndexer.createLastUpdatedIndex(
+ resourceType,
+ InstantType(Date.from(lastUpdated))
+ )
+ )
+ }
+ .build()
+ resourceDao.updateIndicesForResource(indicesToUpdate, resourceType, entity.resourceUuid)
  }
  }
 
@@ -274,6 +297,12 @@ internal class DatabaseImpl(
  }
  }
 
+ override suspend fun getDateTimeIndexEntities(resourceId: String, resourceType: ResourceType) =
+ resourceDao.getResourceEntity(resourceId, resourceType)?.let {
+ resourceDao.getDateTimeIndexes(it.resourceUuid)
+ }
+ ?: emptyList()
+
  companion object {
  /**
  * The name for unencrypted database.

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

@@ -72,5 +72,8 @@ val MIGRATION_2_3 =
  database.execSQL(
  "CREATE INDEX IF NOT EXISTS `index_DateTimeIndexEntity_index_from` ON `DateTimeIndexEntity` (`index_from`)"
  )
+ database.execSQL(
+ "ALTER TABLE `ResourceEntity` ADD COLUMN `lastUpdatedLocal` INTEGER DEFAULT NULL"
+ )
  }
  }

engine/src/main/java/com/google/android/fhir/db/impl/dao/LocalChangeDao.kt

@@ -27,6 +27,7 @@ import com.google.android.fhir.db.impl.entities.ResourceEntity
 import com.google.android.fhir.logicalId
 import com.google.android.fhir.toTimeZoneString
 import com.google.android.fhir.versionId
+import java.time.Instant
 import java.util.Date
 import org.hl7.fhir.r4.model.Resource
 import org.hl7.fhir.r4.model.ResourceType
@@ -46,14 +47,10 @@ internal abstract class LocalChangeDao {
  @Insert abstract suspend fun addLocalChange(localChangeEntity: LocalChangeEntity)
 
  @Transaction
- open suspend fun addInsertAll(resources: List<Resource>) {
- resources.forEach { resource -> addInsert(resource) }
- }
-
- suspend fun addInsert(resource: Resource) {
+ open suspend fun addInsert(resource: Resource, timeOfChange: Instant?) {
  val resourceId = resource.logicalId
  val resourceType = resource.resourceType
- val timestamp = Date().toTimeZoneString()
+ val timestamp = Date.from(timeOfChange).toTimeZoneString()
  val resourceString = iParser.encodeResourceToString(resource)
 
  addLocalChange(
@@ -69,13 +66,13 @@ internal abstract class LocalChangeDao {
  )
  }
 
- suspend fun addUpdate(oldEntity: ResourceEntity, resource: Resource) {
+ suspend fun addUpdate(oldEntity: ResourceEntity, resource: Resource, timeOfChange: Instant) {
  val resourceId = resource.logicalId
  val resourceType = resource.resourceType
- val timestamp = Date().toTimeZoneString()
+ val timestamp = Date.from(timeOfChange).toTimeZoneString()
 
  if (!localChangeIsEmpty(resourceId, resourceType) &&
- lastChangeType(resourceId, resourceType)!!.equals(Type.DELETE)
+ lastChangeType(resourceId, resourceType)!! == Type.DELETE
  ) {
  throw InvalidLocalChangeException(
  "Unexpected DELETE when updating $resourceType/$resourceId. UPDATE failed."