feat: [ANDROSDK-2309] Add isEmpty property to FilterOperators.kt also update FilterOperatorsDB.kt and FilterOperatorsDTO.kt models (#2643)

taridepaco · web-flow · commit 7141aaec96b4 · 2026-06-25T11:53:33.000+02:00
diff --git a/core/api/core.api b/core/api/core.api
diff --git a/core/src/main/assets/migrations/181.sql b/core/src/main/assets/migrations/181.sql
@@ -131,3 +131,11 @@ ALTER TABLE IndicatorLegendSetLink RENAME TO IndicatorLegendSetLink_Old;
 CREATE TABLE IndicatorLegendSetLink(indicator TEXT NOT NULL, legendSet TEXT NOT NULL, sortOrder INTEGER NOT NULL, PRIMARY KEY(indicator, legendSet), FOREIGN KEY(indicator) REFERENCES Indicator(uid) ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED, FOREIGN KEY(legendSet) REFERENCES LegendSet(uid) ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED);
 INSERT INTO IndicatorLegendSetLink(indicator, legendSet, sortOrder) SELECT indicator, legendSet, sortOrder FROM IndicatorLegendSetLink_Old;
 DROP TABLE IF EXISTS IndicatorLegendSetLink_Old;
+
+# Add isEmpty to  FilterOperator tables table (ANDROSDK-2309)
+
+ALTER TABLE AttributeValueFilter ADD COLUMN isEmpty INTEGER;
+ALTER TABLE EventDataFilter ADD COLUMN isEmpty INTEGER;
+ALTER TABLE ProgramStageWorkingListAttributeValueFilter ADD COLUMN isEmpty INTEGER;
+ALTER TABLE ProgramStageWorkingListEventDataFilter ADD COLUMN isEmpty INTEGER;
+
diff --git a/core/src/main/java/org/hisp/dhis/android/core/common/FilterOperators.kt b/core/src/main/java/org/hisp/dhis/android/core/common/FilterOperators.kt
@@ -55,6 +55,8 @@ interface FilterOperators {
     /** If the dataItem is of type date, then date filtering parameters are specified using this. */
     val dateFilter: DateFilterPeriod?
 
+    val isEmpty: Boolean?
+
     fun le(): String? = le
     fun ge(): String? = ge
     fun gt(): String? = gt
@@ -81,5 +83,7 @@ interface FilterOperators {
         fun like(like: String?): T
 
         fun dateFilter(dateFilter: DateFilterPeriod?): T
+
+        fun isEmpty(isEmpty: Boolean?): T
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/event/EventDataFilter.kt b/core/src/main/java/org/hisp/dhis/android/core/event/EventDataFilter.kt
@@ -43,6 +43,8 @@ data class EventDataFilter(
     override val `in`: Set<String>?,
     override val like: String?,
     override val dateFilter: DateFilterPeriod?,
+    @get:JvmName("getIsEmpty")
+    override val isEmpty: Boolean?,
     val eventFilter: String?,
     val dataItem: String,
 ) : FilterOperators, CoreObject {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/programstageworkinglist/ProgramStageWorkingListAttributeValueFilter.kt b/core/src/main/java/org/hisp/dhis/android/core/programstageworkinglist/ProgramStageWorkingListAttributeValueFilter.kt
@@ -43,6 +43,8 @@ data class ProgramStageWorkingListAttributeValueFilter(
     override val `in`: Set<String>?,
     override val like: String?,
     override val dateFilter: DateFilterPeriod?,
+    @get:JvmName("getIsEmpty")
+    override val isEmpty: Boolean?,
     val programStageWorkingList: String,
     val attribute: String,
     val ew: String?,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/programstageworkinglist/ProgramStageWorkingListEventDataFilter.kt b/core/src/main/java/org/hisp/dhis/android/core/programstageworkinglist/ProgramStageWorkingListEventDataFilter.kt
@@ -43,6 +43,8 @@ data class ProgramStageWorkingListEventDataFilter(
     override val `in`: Set<String>?,
     override val like: String?,
     override val dateFilter: DateFilterPeriod?,
+    @get:JvmName("getIsEmpty")
+    override val isEmpty: Boolean?,
     val programStageWorkingList: String,
     val dataItem: String,
 ) : FilterOperators, CoreObject {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/AttributeValueFilter.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/AttributeValueFilter.kt
@@ -43,6 +43,8 @@ data class AttributeValueFilter(
     override val `in`: Set<String>?,
     override val like: String?,
     override val dateFilter: DateFilterPeriod?,
+    @get:JvmName("getIsEmpty")
+    override val isEmpty: Boolean?,
     val trackedEntityInstanceFilter: String?,
     val attribute: String,
     val ew: String?,
diff --git a/core/src/main/java/org/hisp/dhis/android/network/common/dto/FilterOperatorsDTO.kt b/core/src/main/java/org/hisp/dhis/android/network/common/dto/FilterOperatorsDTO.kt
@@ -40,6 +40,7 @@ internal interface FilterOperatorsDTO {
     val `in`: Set<String>?
     val like: String?
     val dateFilter: DateFilterPeriodDTO?
+    val isEmpty: Boolean?
 }
 
 internal fun <T> T.applyFilterOperatorsFields(item: FilterOperatorsDTO): T where
@@ -52,5 +53,6 @@ internal fun <T> T.applyFilterOperatorsFields(item: FilterOperatorsDTO): T where
     `in`(item.`in`)
     like(item.like)
     dateFilter(item.dateFilter?.toDomain())
+    isEmpty(item.isEmpty)
     return this
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/network/eventfilter/EventDataFilterDTO.kt b/core/src/main/java/org/hisp/dhis/android/network/eventfilter/EventDataFilterDTO.kt
@@ -44,6 +44,7 @@ internal data class EventDataFilterDTO(
     override val `in`: Set<String>?,
     override val like: String?,
     override val dateFilter: DateFilterPeriodDTO?,
+    override val isEmpty: Boolean?,
     val dataItem: String,
 ) : FilterOperatorsDTO {
     fun toDomain(eventFilter: String): EventDataFilter {
diff --git a/core/src/main/java/org/hisp/dhis/android/network/programstageworkinglist/ProgramStageWorkingListAttributeValueFilterDTO.kt b/core/src/main/java/org/hisp/dhis/android/network/programstageworkinglist/ProgramStageWorkingListAttributeValueFilterDTO.kt
@@ -44,6 +44,7 @@ internal data class ProgramStageWorkingListAttributeValueFilterDTO(
     override val `in`: Set<String>?,
     override val like: String?,
     override val dateFilter: DateFilterPeriodDTO?,
+    override val isEmpty: Boolean?,
     val attribute: String,
     val ew: String?,
     val sw: String?,
diff --git a/core/src/main/java/org/hisp/dhis/android/network/programstageworkinglist/ProgramStageWorkingListEventDataFilterDTO.kt b/core/src/main/java/org/hisp/dhis/android/network/programstageworkinglist/ProgramStageWorkingListEventDataFilterDTO.kt
@@ -44,6 +44,7 @@ internal data class ProgramStageWorkingListEventDataFilterDTO(
     override val `in`: Set<String>?,
     override val like: String?,
     override val dateFilter: DateFilterPeriodDTO?,
+    override val isEmpty: Boolean?,
     val dataItem: String,
 ) : FilterOperatorsDTO {
     fun toDomain(programStageWorkingList: String): ProgramStageWorkingListEventDataFilter {
diff --git a/core/src/main/java/org/hisp/dhis/android/network/trackedentityinstancefilter/AttributeValueFilterDTO.kt b/core/src/main/java/org/hisp/dhis/android/network/trackedentityinstancefilter/AttributeValueFilterDTO.kt
@@ -28,6 +28,7 @@
 
 package org.hisp.dhis.android.network.trackedentityinstancefilter
 
+import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 import org.hisp.dhis.android.core.trackedentity.AttributeValueFilter
 import org.hisp.dhis.android.network.common.dto.DateFilterPeriodDTO
@@ -44,6 +45,8 @@ internal data class AttributeValueFilterDTO(
     override val `in`: Set<String>?,
     override val like: String?,
     override val dateFilter: DateFilterPeriodDTO?,
+    @SerialName("null")
+    override val isEmpty: Boolean?,
     val attribute: String,
     val ew: String?,
     val sw: String?,
diff --git a/core/src/main/java/org/hisp/dhis/android/network/trackedentityinstancefilter/AttributeValueFilterFields.kt b/core/src/main/java/org/hisp/dhis/android/network/trackedentityinstancefilter/AttributeValueFilterFields.kt
@@ -34,6 +34,7 @@ import org.hisp.dhis.android.persistence.trackedentity.AttributeValueFilterTable
 
 internal object AttributeValueFilterFields : BaseFields<AttributeValueFilter>() {
     private const val API_IN = "in"
+    private const val API_IS_EMPTY = "null"
 
     val allFields = Fields.from(
         fh.field(Columns.ATTRIBUTE),
@@ -47,5 +48,6 @@ internal object AttributeValueFilterFields : BaseFields<AttributeValueFilter>()
         fh.field(API_IN),
         fh.field(Columns.LIKE),
         fh.field(Columns.DATE_FILTER),
+        fh.field(API_IS_EMPTY),
     )
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/persistence/common/FilterOperatorsDB.kt b/core/src/main/java/org/hisp/dhis/android/persistence/common/FilterOperatorsDB.kt
@@ -39,6 +39,7 @@ internal interface FilterOperatorsDB {
     val inProperty: StringSetDB?
     val like: String?
     val dateFilter: DateFilterPeriodDB?
+    val isEmpty: Boolean?
 }
 
 internal fun <T> T.applyFilterOperatorsFields(item: FilterOperatorsDB): T where
@@ -51,5 +52,6 @@ internal fun <T> T.applyFilterOperatorsFields(item: FilterOperatorsDB): T where
     item.inProperty?.let { `in`(it.toDomain()) }
     like(item.like)
     item.dateFilter?.let { dateFilter(it.toDomain()) }
+    isEmpty(item.isEmpty)
     return this
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/persistence/event/EventDataFilterDB.kt b/core/src/main/java/org/hisp/dhis/android/persistence/event/EventDataFilterDB.kt
@@ -70,6 +70,7 @@ internal data class EventDataFilterDB(
     override val inProperty: StringSetDB?,
     override val like: String?,
     override val dateFilter: DateFilterPeriodDB?,
+    override val isEmpty: Boolean?,
 ) : EntityDB<EventDataFilter>, FilterOperatorsDB {
     override fun toDomain(): EventDataFilter {
         return EventDataFilter.builder()
@@ -92,5 +93,6 @@ internal fun EventDataFilter.toDB(): EventDataFilterDB {
         inProperty = `in`()?.toDB(),
         like = like(),
         dateFilter = dateFilter()?.toDB(),
+        isEmpty = isEmpty,
     )
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/persistence/programstageworkinglist/ProgramStageWorkingListAttributeValueFilterDB.kt b/core/src/main/java/org/hisp/dhis/android/persistence/programstageworkinglist/ProgramStageWorkingListAttributeValueFilterDB.kt
@@ -72,6 +72,7 @@ internal data class ProgramStageWorkingListAttributeValueFilterDB(
     override val inProperty: StringSetDB?,
     override val like: String?,
     override val dateFilter: DateFilterPeriodDB?,
+    override val isEmpty: Boolean?,
 ) : EntityDB<ProgramStageWorkingListAttributeValueFilter>, FilterOperatorsDB {
     override fun toDomain(): ProgramStageWorkingListAttributeValueFilter {
         return ProgramStageWorkingListAttributeValueFilter.builder()
@@ -98,5 +99,6 @@ internal fun ProgramStageWorkingListAttributeValueFilter.toDB(): ProgramStageWor
         inProperty = `in`()?.toDB(),
         like = like(),
         dateFilter = dateFilter()?.toDB(),
+        isEmpty = isEmpty,
     )
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/persistence/programstageworkinglist/ProgramStageWorkingListEventDataFilterDB.kt b/core/src/main/java/org/hisp/dhis/android/persistence/programstageworkinglist/ProgramStageWorkingListEventDataFilterDB.kt
@@ -70,6 +70,7 @@ internal data class ProgramStageWorkingListEventDataFilterDB(
     override val inProperty: StringSetDB?,
     override val like: String?,
     override val dateFilter: DateFilterPeriodDB?,
+    override val isEmpty: Boolean?,
 ) : EntityDB<ProgramStageWorkingListEventDataFilter>, FilterOperatorsDB {
     override fun toDomain(): ProgramStageWorkingListEventDataFilter {
         return ProgramStageWorkingListEventDataFilter.builder()
@@ -92,5 +93,6 @@ internal fun ProgramStageWorkingListEventDataFilter.toDB(): ProgramStageWorkingL
         inProperty = `in`()?.toDB(),
         like = like(),
         dateFilter = dateFilter()?.toDB(),
+        isEmpty = isEmpty,
     )
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/persistence/trackedentity/AttributeValueFilterDB.kt b/core/src/main/java/org/hisp/dhis/android/persistence/trackedentity/AttributeValueFilterDB.kt
@@ -71,6 +71,7 @@ internal data class AttributeValueFilterDB(
     override val inProperty: StringSetDB?,
     override val like: String?,
     override val dateFilter: DateFilterPeriodDB?,
+    override val isEmpty: Boolean?,
 ) : EntityDB<AttributeValueFilter>, FilterOperatorsDB {
     override fun toDomain(): AttributeValueFilter {
         return AttributeValueFilter.builder()
@@ -97,5 +98,6 @@ internal fun AttributeValueFilter.toDB(): AttributeValueFilterDB {
         inProperty = `in`()?.toDB(),
         like = like(),
         dateFilter = dateFilter()?.toDB(),
+        isEmpty = isEmpty,
     )
 }
diff --git a/processor/src/main/java/org/hisp/dhis/android/processor/ModelBuilderProcessor.kt b/processor/src/main/java/org/hisp/dhis/android/processor/ModelBuilderProcessor.kt
@@ -209,13 +209,22 @@ class ModelBuilderProcessor(
             "FilterOperators",
             "FilterOperators",
             "import org.hisp.dhis.android.core.common.FilterOperators",
-            listOf("le", "ge", "gt", "lt", "eq", "`in`", "like", "dateFilter"),
+            listOf("le", "ge", "gt", "lt", "eq", "`in`", "like", "dateFilter", "isEmpty"),
         )
         val queryCriteria = BaseClass(
             "FilterQueryCriteria",
             "FilterQueryCriteria",
             "import org.hisp.dhis.android.core.common.FilterQueryCriteria",
-            listOf("followUp", "organisationUnit", "ouMode", "assignedUserMode", "order", "displayColumnOrder", "eventDate", "lastUpdatedDate"),
+            listOf(
+                "followUp",
+                "organisationUnit",
+                "ouMode",
+                "assignedUserMode",
+                "order",
+                "displayColumnOrder",
+                "eventDate",
+                "lastUpdatedDate",
+            ),
         )
 
         // The order here matters. The first matching base class is used for the builder

Original file line number	Diff line number	Diff line change
`@@ -55,6 +55,8 @@ interface FilterOperators {`
`55`	`55`	`/** If the dataItem is of type date, then date filtering parameters are specified using this. */`
`56`	`56`	`val dateFilter: DateFilterPeriod?`
`57`	`57`
	`58`	`+ val isEmpty: Boolean?`
	`59`	`+`
`58`	`60`	`fun le(): String? = le`
`59`	`61`	`fun ge(): String? = ge`
`60`	`62`	`fun gt(): String? = gt`
`@@ -81,5 +83,7 @@ interface FilterOperators {`
`81`	`83`	`fun like(like: String?): T`
`82`	`84`
`83`	`85`	`fun dateFilter(dateFilter: DateFilterPeriod?): T`
	`86`	`+`
	`87`	`+ fun isEmpty(isEmpty: Boolean?): T`
`84`	`88`	`}`
`85`	`89`	`}`
Original file line number	Diff line number	Diff line change
`@@ -40,6 +40,7 @@ internal interface FilterOperatorsDTO {`
`40`	`40`	val `in`: Set<String>?
`41`	`41`	`val like: String?`
`42`	`42`	`val dateFilter: DateFilterPeriodDTO?`
	`43`	`+ val isEmpty: Boolean?`
`43`	`44`	`}`
`44`	`45`
`45`	`46`	`internal fun <T> T.applyFilterOperatorsFields(item: FilterOperatorsDTO): T where`
`@@ -52,5 +53,6 @@ internal fun <T> T.applyFilterOperatorsFields(item: FilterOperatorsDTO): T where`
`52`	`53`	`in`(item.`in`)
`53`	`54`	`like(item.like)`
`54`	`55`	`dateFilter(item.dateFilter?.toDomain())`
	`56`	`+ isEmpty(item.isEmpty)`
`55`	`57`	`return this`
`56`	`58`	`}`