Enable custom query running on FhirEngine

buildSrc/src/main/kotlin/Releases.kt

@@ -29,7 +29,7 @@ object Releases {
 
   object Engine {
     const val artifactId = "engine"
-    const val version = "0.1.0-alpha06"
+    const val version = "0.1.0-alpha06-preview-p2p"
     const val name = "Android FHIR Engine Library"
   }
 

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

@@ -20,6 +20,7 @@ import com.google.android.fhir.db.ResourceNotFoundException
 import com.google.android.fhir.db.impl.dao.LocalChangeToken
 import com.google.android.fhir.db.impl.dao.SquashedLocalChange
 import com.google.android.fhir.search.Search
+import com.google.android.fhir.search.SearchQuery
 import java.time.OffsetDateTime
 import org.hl7.fhir.r4.model.Resource
 import org.hl7.fhir.r4.model.ResourceType
@@ -62,6 +63,12 @@ interface FhirEngine {
    */
   suspend fun <R : Resource> search(search: Search): List<R>
 
+
+  /**
+   * Searches the database and returns a list resources according to the [search] specifications.
+   */
+  suspend fun <R : Resource> search(searchQuery: SearchQuery): List<R>
+
   /**
    * Synchronizes the [upload] result in the database. The database will be updated to reflect the
    * result of the [upload] operation.

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

@@ -25,6 +25,7 @@ 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.SyncedResourceEntity
 import com.google.android.fhir.search.Search
+import com.google.android.fhir.search.SearchQuery
 import com.google.android.fhir.search.count
 import com.google.android.fhir.search.execute
 import com.google.android.fhir.toTimeZoneString
@@ -54,6 +55,33 @@ internal class FhirEngineImpl(private val database: Database, private val contex
   override suspend fun <R : Resource> search(search: Search): List<R> {
     return search.execute(database)
   }
+/*
+  suspend fun sample(dateFrom: Long, limit: Long) {
+
+    val searchQuery =
+      SearchQuery(
+        """
+      SELECT a.serializedResource, b.index_to
+      FROM ResourceEntity a
+      LEFT JOIN DateTimeIndexEntity b
+      ON a.resourceType = b.resourceType AND a.resourceId = b.resourceId AND b.index_name = '_lastUpdated'
+      WHERE a.resourceType = 'Patient'
+      AND a.resourceId IN (
+      SELECT resourceId FROM DateTimeIndexEntity
+      WHERE resourceType = 'Patient' AND index_name = '_lastUpdated' AND index_to > ?
+      )
+      ORDER BY b.index_from ASC
+      LIMIT ?
+    """.trimIndent(),
+        listOf(dateFrom, limit)
+      )
+
+    val patients = search<Patient>(searchQuery)
+  }*/
+
+  override suspend fun <R : Resource> search(searchQuery: SearchQuery): List<R> {
+    return database.search(searchQuery)
+  }
 
   override suspend fun count(search: Search): Long {
     return search.count(database)