Merge branch 'master' into ak/localLastUpdated

engine/src/main/java/com/google/android/fhir/index/ResourceIndexer.kt

@@ -111,72 +111,14 @@ internal class ResourceIndexer(
   }
 
   companion object {
-
-    /**
-     * Manually add indexes for [SearchParameter]s defined in [Resource] class. This is because:
-     * 1. There is no clear way defined in the search parameter definitions to figure out the class
-     * hierarchy of the model classes in codegen.
-     * 2. Common [SearchParameter]'s paths are defined for [Resource] class e.g even for the
-     * [Patient] model, the [SearchParameter] expression for id would be `Resource.id` and
-     * [FHIRPathEngine.evaluate] doesn't return anything when [Patient] is passed to the function.
-     */
-    private fun <R : Resource> addIndexesFromResourceClass(
-      resource: R,
-      indexBuilder: ResourceIndices.Builder
-    ) {
-      indexBuilder.addTokenIndex(
-        TokenIndex(
-          "_id",
-          arrayOf(resource.fhirType(), "id").joinToString(separator = "."),
-          null,
-          resource.logicalId
-        )
-      )
-      // Add 'lastUpdated' index to all resources.
-      if (resource.meta.hasLastUpdated()) {
-        val lastUpdatedElement = resource.meta.lastUpdatedElement
-        indexBuilder.addDateTimeIndex(
-          createLastUpdatedIndex(resource.resourceType, lastUpdatedElement)
-        )
-      }
-
-      if (resource.meta.hasProfile()) {
-        resource.meta.profile
-          .filter { it.value != null && it.value.isNotEmpty() }
-          .forEach {
-            indexBuilder.addReferenceIndex(
-              ReferenceIndex(
-                "_profile",
-                arrayOf(resource.fhirType(), "meta", "profile").joinToString(separator = "."),
-                it.value
-              )
-            )
-          }
-      }
-
-      if (resource.meta.hasTag()) {
-        resource.meta.tag
-          .filter { it.code != null && it.code!!.isNotEmpty() }
-          .forEach {
-            indexBuilder.addTokenIndex(
-              TokenIndex(
-                "_tag",
-                arrayOf(resource.fhirType(), "meta", "tag").joinToString(separator = "."),
-                it.system ?: "",
-                it.code
-              )
-            )
-          }
-      }
-    }
-
+
     private fun numberIndex(searchParam: SearchParamDefinition, value: Base): NumberIndex? =
-      when (value.fhirType()) {
-        "integer" ->
-          NumberIndex(searchParam.name, searchParam.path, BigDecimal((value as IntegerType).value))
-        "decimal" -> NumberIndex(searchParam.name, searchParam.path, (value as DecimalType).value)
-        else -> null
-      }
+    when (value.fhirType()) {
+      "integer" ->
+        NumberIndex(searchParam.name, searchParam.path, BigDecimal((value as IntegerType).value))
+      "decimal" -> NumberIndex(searchParam.name, searchParam.path, (value as DecimalType).value)
+      else -> null
+    }
 
     private fun dateIndex(searchParam: SearchParamDefinition, value: Base): DateIndex {
       val date = value as DateType
@@ -318,24 +260,37 @@ internal class ResourceIndexer(
         "code",
         "Coding" -> {
           val coding = value as ICoding
-          listOf(TokenIndex(searchParam.name, searchParam.path, coding.system ?: "", coding.code))
+          if (coding.code != null) {
+            listOf(TokenIndex(searchParam.name, searchParam.path, coding.system ?: "", coding.code))
+          } else {
+            listOf()
+          }
+        }
+        "id" -> {
+          val id = value as IdType
+          if (id.value != null) {
+            listOf(TokenIndex(searchParam.name, searchParam.path, null, id.idPart ?: id.value))
+          } else {
+            listOf()
+          }
         }
         else -> listOf()
       }
 
     private fun referenceIndex(searchParam: SearchParamDefinition, value: Base): ReferenceIndex? {
-      return when (value) {
-        is Reference -> value.reference
-        is CanonicalType -> value.value
-        is UriType -> value.value
-        else -> throw UnsupportedOperationException("Value $value is not readable by SDK")
-      }?.let { ReferenceIndex(searchParam.name, searchParam.path, it) }
+      return if (!value.isEmpty) {
+        when (value) {
+          is Reference -> value.reference
+          is CanonicalType -> value.value
+          is UriType -> value.value
+          else -> throw UnsupportedOperationException("Value $value is not readable by SDK")
+        }?.let { ReferenceIndex(searchParam.name, searchParam.path, it) }
+      } else {
+        null
+      }
     }
 
-    private fun quantityIndex(
-      searchParam: SearchParamDefinition,
-      value: Base
-    ): List<QuantityIndex> =
+    private fun quantityIndex(searchParam: SearchParamDefinition, value: Base): List<QuantityIndex> =
       when (value.fhirType()) {
         "Money" -> {
           val money = value as Money
@@ -365,8 +320,7 @@ internal class ResourceIndexer(
           var canonicalValue = quantity.value
           if (quantity.system == ucumUrl && quantity.code != null) {
             try {
-              val ucumUnit =
-                UnitConverter.getCanonicalForm(UcumValue(quantity.code, quantity.value))
+              val ucumUnit = UnitConverter.getCanonicalForm(UcumValue(quantity.code, quantity.value))
               canonicalCode = ucumUnit.code
               canonicalValue = ucumUnit.value
             } catch (exception: ConverterException) {