Generate sqlite selections and selection args instead of adding new helper methods

Author: grzesiek2010

collect_app/src/main/java/org/odk/collect/android/database/entities/DatabaseEntitiesRepository.kt

@@ -208,6 +208,26 @@ class DatabaseEntitiesRepository(context: Context, dbPath: String) : EntitiesRep
         updateRowIdTables()
     }
 
+    override fun query(list: String, selection: String, selectionArgs: Array<String>): List<Entity.Saved> {
+        return databaseConnection.withConnection {
+            readableDatabase
+                .rawQuery(
+                    """
+                    SELECT *, i.$ROW_ID
+                    FROM "$list" e, "${getRowIdTableName(list)}" i
+                    WHERE $selection
+                    ORDER BY i.$ROW_ID
+                    """.trimIndent(),
+                    selectionArgs
+                )
+        }.foldAndClose {
+            mapCursorRowToEntity(
+                it,
+                it.getInt(ROW_ID)
+            )
+        }
+    }
+
     override fun getById(list: String, id: String): Entity.Saved? {
         if (!listExists(list)) {
             return null

entities/src/main/java/org/odk/collect/entities/javarosa/filter/LocalEntitiesFilterStrategy.kt

@@ -40,30 +40,20 @@ class LocalEntitiesFilterStrategy(entitiesRepository: EntitiesRepository) :
         return when (val original = candidate?.original) {
             is XPathEqExpr -> {
                 val child = candidate.nodeSide.steps[0].name.name
-                val value = candidate.evalContextSide(sourceInstance, evaluationContext)
+                val value = candidate.evalContextSide(sourceInstance, evaluationContext) as String
 
-                val results = if (original.isEqual) {
-                    instanceAdapter.queryEq(
-                        sourceInstance.instanceId,
-                        child,
-                        value as String
-                    )
+                val selection = if (original.isEqual) {
+                    "$child = ?"
                 } else {
-                    instanceAdapter.queryNotEq(
-                        sourceInstance.instanceId,
-                        child,
-                        value as String
-                    )
+                    "$child != ?"
                 }
+                val selectionArgs = arrayOf(value)
 
-                if (results == null) {
-                    next.get()
-                } else {
-                    sourceInstance.replacePartialElements(results)
-                    results.map {
-                        it.parent = sourceInstance.root
-                        it.ref
-                    }
+                val results = instanceAdapter.query(sourceInstance.instanceId, selection, selectionArgs)
+                sourceInstance.replacePartialElements(results)
+                results.map {
+                    it.parent = sourceInstance.root
+                    it.ref
                 }
             }
 

entities/src/main/java/org/odk/collect/entities/javarosa/intance/LocalEntitiesInstanceAdapter.kt

@@ -38,6 +38,12 @@ class LocalEntitiesInstanceAdapter(private val entitiesRepository: EntitiesRepos
         }
     }
 
+    fun query(list: String, selection: String, selectionArgs: Array<String>): List<TreeElement> {
+        return entitiesRepository
+            .query(list, selection, selectionArgs)
+            .map { convertToElement(it) }
+    }
+
     fun queryEq(instanceId: String, child: String, value: String): List<TreeElement> {
         return when (child) {
             EntityItemElement.ID -> {

entities/src/main/java/org/odk/collect/entities/storage/EntitiesRepository.kt

@@ -8,6 +8,7 @@ interface EntitiesRepository {
     fun clear()
     fun addList(list: String)
     fun delete(id: String)
+    fun query(list: String, selection: String, selectionArgs: Array<String>): List<Entity.Saved>
     fun getById(list: String, id: String): Entity.Saved?
     fun getByIdNot(list: String, id: String): List<Entity.Saved>
     fun getByLabel(list: String, label: String?): List<Entity.Saved>

entities/src/main/java/org/odk/collect/entities/storage/InMemEntitiesRepository.kt

@@ -46,6 +46,30 @@ class InMemEntitiesRepository : EntitiesRepository {
         }
     }
 
+    override fun query(
+        list: String,
+        selection: String,
+        selectionArgs: Array<String>
+    ): List<Entity.Saved> {
+        return getEntities(list).filter { entity ->
+            val (fieldName, operator, _) = selection.split(" ").map { it }
+            val value = selectionArgs.first()
+
+            val fieldValue = when (fieldName) {
+                "name" -> entity.id
+                "label" -> entity.label
+                "__version" -> entity.version
+                else -> entity.properties.find { it.first == fieldName }?.second
+            }.toString()
+
+            when (operator) {
+                "=" -> fieldValue == value
+                "!=" -> fieldValue != value
+                else -> false
+            }
+        }
+    }
+
     override fun getById(list: String, id: String): Entity.Saved? {
         return getEntities(list).firstOrNull { it.id == id }
     }

entities/src/test/java/org/odk/collect/entities/LocalEntityUseCasesTest.kt

@@ -541,6 +541,15 @@ private class MeasurableEntitiesRepository(private val wrapped: EntitiesReposito
         wrapped.delete(id)
     }
 
+    override fun query(
+        list: String,
+        selection: String,
+        selectionArgs: Array<String>
+    ): List<Entity.Saved> {
+        accesses += 1
+        return wrapped.query(list, selection, selectionArgs)
+    }
+
     override fun getById(list: String, id: String): Entity.Saved? {
         accesses += 1
         return wrapped.getById(list, id)