RevInclude to return mapped response

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

@@ -48,6 +48,10 @@ interface FhirEngine {
  */
  suspend fun <R : Resource> search(search: Search): List<R>
 
+ suspend fun <R : Resource> searchWithRevInclude(
+ search: Search
+ ): Map<R, Map<ResourceType, List<Resource>>>
+
  /**
  * Synchronizes the [upload] result in the database. [upload] operation may result in multiple
  * calls to the server to upload the data. Result of each call will be emitted by [upload] and the

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

@@ -16,6 +16,7 @@
 
 package com.google.android.fhir.db
 
+import com.google.android.fhir.db.impl.dao.IndexedIdAndResource
 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.LocalChangeEntity
@@ -94,6 +95,8 @@ internal interface Database {
 
  suspend fun <R : Resource> search(query: SearchQuery): List<R>
 
+ suspend fun <R : Resource> searchRev(query: SearchQuery): List<IndexedIdAndResource>
+
  suspend fun count(query: SearchQuery): Long
 
  /**

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

@@ -25,6 +25,7 @@ import ca.uhn.fhir.parser.IParser
 import com.google.android.fhir.DatabaseErrorStrategy
 import com.google.android.fhir.db.ResourceNotFoundException
 import com.google.android.fhir.db.impl.DatabaseImpl.Companion.UNENCRYPTED_DATABASE_NAME
+import com.google.android.fhir.db.impl.dao.IndexedIdAndResource
 import com.google.android.fhir.db.impl.dao.LocalChangeToken
 import com.google.android.fhir.db.impl.dao.LocalChangeUtils
 import com.google.android.fhir.db.impl.dao.SquashedLocalChange
@@ -186,6 +187,17 @@ internal class DatabaseImpl(
  }
  }
 
+ override suspend fun <R : Resource> searchRev(query: SearchQuery): List<IndexedIdAndResource> {
+ return db.withTransaction {
+ resourceDao.getResourcesRev(SimpleSQLiteQuery(query.query, query.args.toTypedArray())).map {
+ IndexedIdAndResource(
+ it.idOfBaseResourceOnWhichThisMatched,
+ iParser.parseResource(it.serializedResource) as Resource
+ )
+ }
+ }
+ }
+
  override suspend fun count(query: SearchQuery): Long {
  return db.withTransaction {
  resourceDao.countResources(SimpleSQLiteQuery(query.query, query.args.toTypedArray()))

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

@@ -17,6 +17,7 @@
 package com.google.android.fhir.db.impl.dao
 
 import androidx.annotation.VisibleForTesting
+import androidx.room.ColumnInfo
 import androidx.room.Dao
 import androidx.room.Insert
 import androidx.room.OnConflictStrategy
@@ -150,6 +151,11 @@ internal abstract class ResourceDao {
 
  @RawQuery abstract suspend fun getResources(query: SupportSQLiteQuery): List<String>
 
+ @RawQuery
+ abstract suspend fun getResourcesRev(
+ query: SupportSQLiteQuery
+ ): List<IndexedIdAndSerializedResource>
+
  @RawQuery abstract suspend fun countResources(query: SupportSQLiteQuery): Long
 
  private suspend fun insertResource(resource: Resource): String {
@@ -279,3 +285,13 @@ internal abstract class ResourceDao {
  }
  }
 }
+
+internal data class IndexedIdAndSerializedResource(
+ @ColumnInfo(name = "index_value") val idOfBaseResourceOnWhichThisMatched: String,
+ val serializedResource: String
+)
+
+internal data class IndexedIdAndResource(
+ val idOfBaseResourceOnWhichThisMatched: String,
+ val resource: Resource
+)

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

@@ -27,6 +27,8 @@ import com.google.android.fhir.logicalId
 import com.google.android.fhir.search.Search
 import com.google.android.fhir.search.count
 import com.google.android.fhir.search.execute
+import com.google.android.fhir.search.getIncludeQuery
+import com.google.android.fhir.search.getQuery
 import com.google.android.fhir.sync.ConflictResolver
 import com.google.android.fhir.sync.Resolved
 import java.time.OffsetDateTime
@@ -60,6 +62,29 @@ internal class FhirEngineImpl(private val database: Database, private val contex
  return search.execute(database)
  }
 
+ override suspend fun <R : Resource> searchWithRevInclude(
+ search: Search
+ ): Map<R, Map<ResourceType, List<Resource>>> {
+ val baseResources = database.search<R>(search.getQuery()) // .subList(0,2)
+ val includedResources =
+ database.searchRev<R>(
+ search.getIncludeQuery(
+ includeIds = baseResources.map { "\'${it.resourceType}/${it.logicalId}\'" }
+ )
+ )
+ val resultMap = mutableMapOf<R, Map<ResourceType, List<Resource>>>()
+ baseResources.forEach { patient ->
+ resultMap[patient] =
+ includedResources
+ .filter {
+ it.idOfBaseResourceOnWhichThisMatched == "${patient.fhirType()}/${patient.logicalId}"
+ }
+ .map { it.resource }
+ .groupBy { it.resourceType }
+ }
+ return resultMap
+ }
+
  override suspend fun count(search: Search): Long {
  return search.count(database)
  }

engine/src/main/java/com/google/android/fhir/search/MoreSearch.kt

@@ -55,6 +55,28 @@ fun Search.getQuery(isCount: Boolean = false): SearchQuery {
  return getQuery(isCount, null)
 }
 
+internal fun Search.getIncludeQuery(includeIds: List<String>): SearchQuery {
+ val match =
+ revIncludeMap
+ .map {
+ " ( a.resourceType = '${it.key}' and a.index_name IN (${it.value.joinToString { "\'${it.paramName}\'" }}) ) "
+ }
+ .joinToString(separator = "OR")
+
+ return SearchQuery(
+ query =
+ """
+ SELECT a.index_value, b.serializedResource
+ FROM ReferenceIndexEntity a 
+ JOIN ResourceEntity b
+ ON a.resourceUuid = b.resourceUuid
+ AND a.index_value IN( ${includeIds.joinToString()} ) 
+ AND ($match)
+ """.trimIndent(),
+ args = listOf()
+ )
+}
+
 internal fun Search.getQuery(
  isCount: Boolean = false,
  nestedContext: NestedContext? = null
@@ -168,22 +190,22 @@ internal fun Search.getQuery(
  $limitStatement)
  """
  }
- revIncludeMap.isNotEmpty() -> {
- """
- select serializedResource from ResourceEntity where resourceUuid in (
- with UUIDS as ( select '${type.name}/' || a.resourceId from ResourceEntity a 
- $sortJoinStatement
- WHERE a.resourceType = ?
- $filterStatement
- $sortOrderStatement
- $limitStatement
- )
- Select resourceUuid
- FROM ResourceEntity
- WHERE '${type.name}/' || resourceId in UUIDS ${revIncludeMap.toSQLQuery()}
- )
- """.trimIndent()
- }
+ // revIncludeMap.isNotEmpty() -> {
+ //  """
+ // select serializedResource from ResourceEntity where resourceUuid in (
+ // with UUIDS as ( select '${type.name}/' || a.resourceId from ResourceEntity a
+ // $sortJoinStatement
+ // WHERE a.resourceType = ?
+ // $filterStatement
+ // $sortOrderStatement
+ // $limitStatement
+ // )
+ // Select resourceUuid
+ // FROM ResourceEntity
+ // WHERE '${type.name}/' || resourceId in UUIDS ${revIncludeMap.toSQLQuery()}
+ // )
+ // """.trimIndent()
+ // }
  else ->
  """ 
  SELECT a.serializedResource

engine/src/main/java/com/google/android/fhir/search/Search.kt

@@ -42,3 +42,11 @@ suspend fun FhirEngine.search(resourceType: ResourceType, init: Search.() -> Uni
  search.init()
  return this.search(search)
 }
+
+suspend inline fun <reified R : Resource> FhirEngine.searchWithRevInclude(
+ init: Search.() -> Unit
+): Map<R, Map<ResourceType, List<Resource>>> {
+ val search = Search(type = R::class.java.newInstance().resourceType)
+ search.init()
+ return this.searchWithRevInclude(search)
+}

engine/src/main/java/com/google/android/fhir/testing/Utilities.kt

@@ -140,6 +140,12 @@ object TestFhirEngineImpl : FhirEngine {
  return emptyList()
  }
 
+ override suspend fun <R : Resource> searchWithRevInclude(
+ search: Search
+ ): Map<R, Map<ResourceType, List<Resource>>> {
+ TODO("Not yet implemented")
+ }
+
  override suspend fun syncUpload(
  upload: suspend (List<LocalChange>) -> Flow<Pair<LocalChangeToken, Resource>>
  ) {