Add support for not eq expressions

getodk · Dec 3, 2024 · 440d248 · 440d248
1 parent 4086718
commit 440d248
Show file tree

Hide file tree

Showing 2 changed files with 53 additions and 11 deletions.
diff --git a/...ies/src/main/java/org/odk/collect/entities/javarosa/filter/LocalEntitiesFilterStrategy.kt b/...ies/src/main/java/org/odk/collect/entities/javarosa/filter/LocalEntitiesFilterStrategy.kt
@@ -39,23 +39,27 @@ class LocalEntitiesFilterStrategy(entitiesRepository: EntitiesRepository) :
         val candidate = CompareToNodeExpression.parse(predicate)
         return when (val original = candidate?.original) {
             is XPathEqExpr -> {
-                if (original.isEqual) {
-                    val child = candidate.nodeSide.steps[0].name.name
-                    val value = candidate.evalContextSide(sourceInstance, evaluationContext)
+                val child = candidate.nodeSide.steps[0].name.name
+                val value = candidate.evalContextSide(sourceInstance, evaluationContext)
 
-                    val results = instanceAdapter.queryEq(
+                val results = if (original.isEqual) {
+                    instanceAdapter.queryEq(
                         sourceInstance.instanceId,
                         child,
                         value as String
                     )
-
-                    sourceInstance.replacePartialElements(results)
-                    results.map {
-                        it.parent = sourceInstance.root
-                        it.ref
-                    }
                 } else {
-                    next.get()
+                    instanceAdapter.queryNotEq(
+                        sourceInstance.instanceId,
+                        child,
+                        value as String
+                    )
+                }
+
+                sourceInstance.replacePartialElements(results)
+                results.map {
+                    it.parent = sourceInstance.root
+                    it.ref
                 }
             }
 

diff --git a/...s/src/main/java/org/odk/collect/entities/javarosa/intance/LocalEntitiesInstanceAdapter.kt b/...s/src/main/java/org/odk/collect/entities/javarosa/intance/LocalEntitiesInstanceAdapter.kt
@@ -81,6 +81,44 @@ class LocalEntitiesInstanceAdapter(private val entitiesRepository: EntitiesRepos
         }
     }
 
+    fun queryNotEq(instanceId: String, child: String, value: String): List<TreeElement> {
+        return when (child) {
+            EntityItemElement.ID -> {
+                filterAndConvertEntities(instanceId) { it.id != value }
+            }
+
+            EntityItemElement.LABEL -> {
+                filterAndConvertEntities(instanceId) { it.label != value }
+            }
+
+            EntityItemElement.VERSION -> {
+                filterAndConvertEntities(instanceId) { it.version != value.toInt() }
+            }
+
+            EntityItemElement.TRUNK_VERSION -> {
+                filterAndConvertEntities(instanceId) { it.trunkVersion != value.toInt() }
+            }
+
+            EntityItemElement.BRANCH_ID -> {
+                filterAndConvertEntities(instanceId) { it.branchId != value }
+            }
+
+            else -> {
+                val allEntities = entitiesRepository.getEntities(instanceId)
+
+                val entities = entitiesRepository.getAllByProperty(
+                    instanceId,
+                    child,
+                    value
+                )
+
+                allEntities
+                    .filterNot { it in entities }
+                    .map { convertToElement(it) }
+            }
+        }
+    }
+
     private fun filterAndConvertEntities(
         list: String,
         filter: (Entity.Saved) -> Boolean