Inital changes to support inline resources via revInclude

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

@@ -54,6 +54,7 @@ import org.hl7.fhir.r4.model.Condition
 import org.hl7.fhir.r4.model.DateTimeType
 import org.hl7.fhir.r4.model.DateType
 import org.hl7.fhir.r4.model.DecimalType
+import org.hl7.fhir.r4.model.Encounter
 import org.hl7.fhir.r4.model.Enumerations
 import org.hl7.fhir.r4.model.Extension
 import org.hl7.fhir.r4.model.HumanName
@@ -65,6 +66,7 @@ import org.hl7.fhir.r4.model.Patient
 import org.hl7.fhir.r4.model.Practitioner
 import org.hl7.fhir.r4.model.Quantity
 import org.hl7.fhir.r4.model.Reference
+import org.hl7.fhir.r4.model.Resource
 import org.hl7.fhir.r4.model.ResourceType
 import org.hl7.fhir.r4.model.RiskAssessment
 import org.hl7.fhir.r4.model.SearchParameter
@@ -3075,6 +3077,147 @@ class DatabaseImplTest {
  assertThat(result.map { it.nameFirstRep.nameAsSingleString }).contains("Darcy Smith")
  }
 
+ @Test
+ fun search_revInclude(): Unit = runBlocking {
+ val resources =
+ listOf(
+ Patient().apply { id = "pa-01" },
+ Patient().apply { id = "pa-02" },
+ Patient().apply { id = "pa-04" },
+ Encounter().apply {
+ id = "en-01"
+ subject = Reference("Patient/pa-01")
+ },
+ Encounter().apply {
+ id = "en-02"
+ subject = Reference("Patient/pa-02")
+ },
+ Encounter().apply {
+ id = "en-03"
+ subject = Reference("Patient/pa-03")
+ }
+ )
+ database.insertRemote(*resources.toTypedArray())
+
+ val result =
+ database.search<Resource>(
+ Search(ResourceType.Patient)
+ .apply { revInclude(ResourceType.Encounter, Encounter.SUBJECT) }
+ .getQuery()
+ )
+ assertThat(result.map { it.logicalId })
+ .containsExactly("pa-01", "pa-02", "pa-04", "en-01", "en-02", "test_patient_1")
+ }
+
+ @Test
+ fun search_patient_revInclude(): Unit = runBlocking {
+ val resources =
+ listOf(
+ Patient().apply {
+ id = "pa-01"
+ addName(
+ HumanName().apply {
+ addGiven("James")
+ family = "Gorden"
+ }
+ )
+ },
+ Patient().apply { id = "pa-02" },
+ Patient().apply { id = "pa-04" },
+ Encounter().apply {
+ id = "en-01"
+ subject = Reference("Patient/pa-01")
+ },
+ Encounter().apply {
+ id = "en-02"
+ subject = Reference("Patient/pa-02")
+ },
+ Encounter().apply {
+ id = "en-03"
+ subject = Reference("Patient/pa-01")
+ }
+ )
+ database.insertRemote(*resources.toTypedArray())
+
+ val result =
+ database.search<Resource>(
+ Search(ResourceType.Patient)
+ .apply {
+ filter(Patient.GIVEN, { value = "James" })
+ revInclude(ResourceType.Encounter, Encounter.SUBJECT)
+ }
+ .getQuery()
+ )
+ assertThat(result.map { it.logicalId }).containsExactly("pa-01", "en-01", "en-03")
+ }
+
+ @Test
+ fun search_patient_has_revInclude(): Unit = runBlocking {
+ val diabetesCodeableConcept =
+ CodeableConcept(Coding("http:https://snomed.info/sct", "44054006", "Diabetes"))
+ val hyperTensionCodeableConcept =
+ CodeableConcept(Coding("http:https://snomed.info/sct", "827069000", "Hypertension stage 1"))
+ val resources =
+ listOf(
+ Patient().apply {
+ id = "pa-01"
+ addName(
+ HumanName().apply {
+ addGiven("James")
+ family = "Gorden"
+ }
+ )
+ },
+ Patient().apply {
+ id = "pa-02"
+ addName(
+ HumanName().apply {
+ addGiven("James")
+ family = "Bond"
+ }
+ )
+ },
+ Patient().apply { id = "pa-04" },
+ Encounter().apply {
+ id = "en-01"
+ subject = Reference("Patient/pa-01")
+ },
+ Encounter().apply {
+ id = "en-02"
+ subject = Reference("Patient/pa-02")
+ },
+ Encounter().apply {
+ id = "en-03"
+ subject = Reference("Patient/pa-01")
+ },
+ Condition().apply {
+ id = "con-01"
+ code = diabetesCodeableConcept
+ subject = Reference("Patient/pa-01")
+ },
+ Condition().apply {
+ id = "con-02"
+ code = hyperTensionCodeableConcept
+ subject = Reference("Patient/pa-02")
+ }
+ )
+ database.insertRemote(*resources.toTypedArray())
+
+ val result =
+ database.search<Resource>(
+ Search(ResourceType.Patient)
+ .apply {
+ filter(Patient.GIVEN, { value = "James" })
+ has<Condition>(Condition.SUBJECT) {
+ filter(Condition.CODE, { value = of(diabetesCodeableConcept) })
+ }
+ revInclude(ResourceType.Encounter, Encounter.SUBJECT)
+ }
+ .getQuery()
+ )
+ assertThat(result.map { it.logicalId }).containsExactly("pa-01", "en-01", "en-03")
+ }
+
  private companion object {
  const val mockEpochTimeStamp = 1628516301000
  const val TEST_PATIENT_1_ID = "test_patient_1"

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

@@ -18,6 +18,7 @@ package com.google.android.fhir.search
 
 import ca.uhn.fhir.rest.gclient.DateClientParam
 import ca.uhn.fhir.rest.gclient.NumberClientParam
+import ca.uhn.fhir.rest.gclient.ReferenceClientParam
 import ca.uhn.fhir.rest.gclient.StringClientParam
 import ca.uhn.fhir.rest.param.ParamPrefixEnum
 import com.google.android.fhir.ConverterException
@@ -34,6 +35,7 @@ import kotlin.math.roundToLong
 import org.hl7.fhir.r4.model.DateTimeType
 import org.hl7.fhir.r4.model.DateType
 import org.hl7.fhir.r4.model.Resource
+import org.hl7.fhir.r4.model.ResourceType
 
 /**
  * The multiplier used to determine the range for the `ap` search prefix. See
@@ -166,6 +168,21 @@ 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()
+ }
  else ->
  """ 
  SELECT a.serializedResource
@@ -295,7 +312,8 @@ internal fun getConditionParamPair(
  (prefix != ParamPrefixEnum.STARTS_AFTER && prefix != ParamPrefixEnum.ENDS_BEFORE)
  ) { "Prefix $prefix not allowed for Integer type" }
  return when (prefix) {
- ParamPrefixEnum.EQUAL, null -> {
+ ParamPrefixEnum.EQUAL,
+ null -> {
  val precision = value.getRange()
  ConditionParam(
  "index_value >= ? AND index_value < ?",
@@ -441,3 +459,12 @@ private fun getApproximateDateRange(
 }
 
 private data class ApproximateDateRange(val start: Long, val end: Long)
+
+private fun Map<ResourceType, List<ReferenceClientParam>>.toSQLQuery() =
+ map { it ->
+ val indexes = it.value.joinToString { "\'${it.paramName}\'" }
+ """
+ SELECT DISTINCT resourceUuid from ReferenceIndexEntity WHERE resourceType = '${it.key}' AND index_name IN ($indexes) AND index_value IN UUIDS
+ """.trimIndent()
+ }
+ .joinToString(prefix = "\nUNION\n", separator = " \nUNION\n")

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 Google LLC
+ * Copyright 2022 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -53,6 +53,7 @@ data class Search(val type: ResourceType, var count: Int? = null, var from: Int?
  internal val uriFilterCriteria = mutableListOf<UriFilterCriteria>()
  internal var sort: IParam? = null
  internal var order: Order? = null
+ internal val revIncludeMap = mutableMapOf<ResourceType, MutableList<ReferenceClientParam>>()
  @PublishedApi internal var nestedSearches = mutableListOf<NestedSearch>()
  var operation = Operation.AND
 
@@ -142,6 +143,10 @@ data class Search(val type: ResourceType, var count: Int? = null, var from: Int?
  sort = parameter
  this.order = order
  }
+
+ fun revInclude(resourceType: ResourceType, vararg clientParam: ReferenceClientParam) {
+ revIncludeMap.computeIfAbsent(resourceType) { mutableListOf() }.addAll(clientParam)
+ }
 }
 
 enum class Order {