Added tests

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

@@ -113,9 +113,13 @@ internal class DatabaseImpl(
  override suspend fun <R : Resource> insert(vararg resource: R): List<String> {
  val logicalIds = mutableListOf<String>()
  db.withTransaction {
- val timeOfLocalChange = Instant.now()
- logicalIds.addAll(resourceDao.insertAllLocal(resource.toList(), timeOfLocalChange))
- localChangeDao.addInsertAll(resource.toList(), timeOfLocalChange)
+ logicalIds.addAll(
+ resource.map {
+ val timeOfLocalChange = Instant.now()
+ localChangeDao.addInsert(it, timeOfLocalChange)
+ resourceDao.insertResourceLocal(it, timeOfLocalChange)
+ }
+ )
  }
  return logicalIds
  }
@@ -293,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/dao/LocalChangeDao.kt

@@ -47,11 +47,7 @@ internal abstract class LocalChangeDao {
  @Insert abstract suspend fun addLocalChange(localChangeEntity: LocalChangeEntity)
 
  @Transaction
- open suspend fun addInsertAll(resources: List<Resource>, timeOfChange: Instant) {
- resources.forEach { resource -> addInsert(resource, timeOfChange) }
- }
-
- suspend fun addInsert(resource: Resource, timeOfChange: Instant?) {
+ open suspend fun addInsert(resource: Resource, timeOfChange: Instant?) {
  val resourceId = resource.logicalId
  val resourceType = resource.resourceType
  val timestamp = Date.from(timeOfChange).toTimeZoneString()

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

@@ -91,13 +91,6 @@ internal abstract class ResourceDao {
  ?: throw ResourceNotFoundException(resource.resourceType.name, resource.id)
  }
 
- open suspend fun insertAllLocal(
- resources: List<Resource>,
- timeOfLocalChange: Instant
- ): List<String> {
- return resources.map { resource -> insertResourceLocal(resource, timeOfLocalChange) }
- }
-
  open suspend fun insertAllRemote(resources: List<Resource>): List<String> {
  return resources.map { resource -> insertResourceRemote(resource) }
  }
@@ -132,6 +125,9 @@ internal abstract class ResourceDao {
  @Insert(onConflict = OnConflictStrategy.REPLACE)
  abstract suspend fun insertPositionIndex(positionIndexEntity: PositionIndexEntity)
 
+ @Query("select * from DateTimeIndexEntity where resourceUuid = :resourceUuid ")
+ abstract suspend fun getDateTimeIndexes(resourceUuid: UUID): List<DateTimeIndexEntity>
+
  @Query(
  """
  UPDATE ResourceEntity
@@ -179,7 +175,7 @@ internal abstract class ResourceDao {
 
  @RawQuery abstract suspend fun countResources(query: SupportSQLiteQuery): Long
 
- private suspend fun insertResourceLocal(resource: Resource, timeOfChange: Instant) =
+ suspend fun insertResourceLocal(resource: Resource, timeOfChange: Instant) =
  insertResource(resource, timeOfChange)
 
  // Since the insert removes any old indexes and lastUpdatedLocal (data not contained in resource

engine/src/test/java/com/google/android/fhir/impl/FhirEngineImplTest.kt

@@ -24,6 +24,7 @@ import com.google.android.fhir.db.ResourceNotFoundException
 import com.google.android.fhir.db.impl.dao.LocalChangeToken
 import com.google.android.fhir.get
 import com.google.android.fhir.logicalId
+import com.google.android.fhir.search.LOCAL_LAST_UPDATED
 import com.google.android.fhir.search.search
 import com.google.android.fhir.sync.AcceptLocalConflictResolver
 import com.google.android.fhir.sync.AcceptRemoteConflictResolver
@@ -495,6 +496,41 @@ class FhirEngineImplTest {
  assertResourceEquals(fhirEngine.get<Patient>("original-002"), localChange)
  }
 
+ @Test
+ fun create_should_save_lastUpdated_Indexes(): Unit = runBlocking {
+ val patient = Patient().apply { id = "patient-id-create" }
+ fhirEngine.create(patient)
+ val indexes =
+ services.database.getDateTimeIndexEntities("patient-id-create", ResourceType.Patient)
+ assertThat(indexes.map { it.index.name }).contains(LOCAL_LAST_UPDATED)
+ }
+
+ @Test
+ fun update_should_save_lastUpdated_Indexes() = runBlocking {
+ val patient = Patient().apply { id = "patient-id-update" }
+ fhirEngine.create(patient)
+ val indexesWhenCreated =
+ services.database.getDateTimeIndexEntities("patient-id-update", ResourceType.Patient)
+ val patientUpdate =
+ Patient().apply {
+ id = "patient-id-update"
+ addName(
+ HumanName().apply {
+ addGiven("John")
+ family = "Doe"
+ }
+ )
+ }
+
+ fhirEngine.update(patientUpdate)
+ val indexesWhenUpdated =
+ services.database.getDateTimeIndexEntities("patient-id-update", ResourceType.Patient)
+
+ assertThat(indexesWhenUpdated.map { it.index.name }).contains(LOCAL_LAST_UPDATED)
+ assertThat(indexesWhenUpdated.first { it.index.name == LOCAL_LAST_UPDATED }.index.from)
+ .isGreaterThan(indexesWhenCreated.first { it.index.name == LOCAL_LAST_UPDATED }.index.from)
+ }
+
  companion object {
  private const val TEST_PATIENT_1_ID = "test_patient_1"
  private var TEST_PATIENT_1 =