feat: [ANDROSDK-2309] simplify WhereClauseFromScopeBuilder.kt using getSqlCondition to append filters

Author: andresmr

core/src/main/java/org/hisp/dhis/android/core/arch/repositories/scope/internal/WhereClauseFromScopeBuilder.kt

@@ -36,12 +36,7 @@ internal class WhereClauseFromScopeBuilder(private val builder: WhereClauseBuild
             return "1"
         }
         for (item in scope.filters()) {
-            when (item.operator()) {
-                FilterItemOperator.NULL_OR_BLANK, FilterItemOperator.NOT_NULL_AND_NOT_BLANK ->
-                    builder.appendComplexQuery(item.operator().getSqlCondition(item.key()))
-
-                else -> builder.appendKeyOperatorValue(item.key(), item.operator().sqlOperator, item.value() ?: "")
-            }
+            builder.appendComplexQuery(item.operator().getSqlCondition(item.key(), item.value() ?: ""))
         }
         for (item in scope.complexFilters()) {
             builder.appendComplexQuery(item.whereQuery())

core/src/test/java/org/hisp/dhis/android/core/arch/repositories/scope/WhereClauseFromScopeBuilderShould.kt

@@ -62,7 +62,7 @@ class WhereClauseFromScopeBuilderShould {
         whenever(builder.build()).doReturn("1")
 
         scopeBuilder.getWhereClause(scopeForItems(filterItems))
-        verify(builder).appendKeyOperatorValue(eqItem.key(), eqItem.operator().sqlOperator, eqItem.value()!!)
+        verify(builder).appendComplexQuery("k1 = v1")
         verify(builder).build()
         verifyNoMoreInteractions(builder)
     }
@@ -74,8 +74,7 @@ class WhereClauseFromScopeBuilderShould {
         whenever(builder.build()).doReturn("1")
 
         scopeBuilder.getWhereClause(scopeForItems(filterItems))
-        verify(builder)
-            .appendKeyOperatorValue(likeItem.key(), likeItem.operator().sqlOperator, likeItem.value()!!)
+        verify(builder).appendComplexQuery("k2 LIKE v2")
         verify(builder).build()
         verifyNoMoreInteractions(builder)
     }
@@ -87,9 +86,8 @@ class WhereClauseFromScopeBuilderShould {
         whenever(builder.build()).doReturn("1")
 
         scopeBuilder.getWhereClause(scopeForItems(filterItems))
-        verify(builder).appendKeyOperatorValue(eqItem.key(), eqItem.operator().sqlOperator, eqItem.value()!!)
-        verify(builder)
-            .appendKeyOperatorValue(likeItem.key(), likeItem.operator().sqlOperator, likeItem.value()!!)
+        verify(builder).appendComplexQuery("k1 = v1")
+        verify(builder).appendComplexQuery("k2 LIKE v2")
         verify(builder).build()
         verifyNoMoreInteractions(builder)
     }