fix: [ANDROSDK-2208] Rename eventStatus to status in EventQueryCriteria to match API response

core/api/core.api

@@ -3293,7 +3293,6 @@ public abstract class org/hisp/dhis/android/core/common/FilterQueryCriteria {
 	public abstract fun assignedUserMode ()Lorg/hisp/dhis/android/core/common/AssignedUserMode;
 	public abstract fun displayColumnOrder ()Ljava/util/List;
 	public abstract fun eventDate ()Lorg/hisp/dhis/android/core/common/DateFilterPeriod;
-	public abstract fun eventStatus ()Lorg/hisp/dhis/android/core/event/EventStatus;
 	public abstract fun followUp ()Ljava/lang/Boolean;
 	public abstract fun lastUpdatedDate ()Lorg/hisp/dhis/android/core/common/DateFilterPeriod;
 	public abstract fun order ()Ljava/lang/String;
@@ -3306,7 +3305,6 @@ public abstract class org/hisp/dhis/android/core/common/FilterQueryCriteria$Buil
 	public abstract fun assignedUserMode (Lorg/hisp/dhis/android/core/common/AssignedUserMode;)Lorg/hisp/dhis/android/core/common/FilterQueryCriteria$Builder;
 	public abstract fun displayColumnOrder (Ljava/util/List;)Lorg/hisp/dhis/android/core/common/FilterQueryCriteria$Builder;
 	public abstract fun eventDate (Lorg/hisp/dhis/android/core/common/DateFilterPeriod;)Lorg/hisp/dhis/android/core/common/FilterQueryCriteria$Builder;
-	public abstract fun eventStatus (Lorg/hisp/dhis/android/core/event/EventStatus;)Lorg/hisp/dhis/android/core/common/FilterQueryCriteria$Builder;
 	public abstract fun followUp (Ljava/lang/Boolean;)Lorg/hisp/dhis/android/core/common/FilterQueryCriteria$Builder;
 	public abstract fun lastUpdatedDate (Lorg/hisp/dhis/android/core/common/DateFilterPeriod;)Lorg/hisp/dhis/android/core/common/FilterQueryCriteria$Builder;
 	public abstract fun order (Ljava/lang/String;)Lorg/hisp/dhis/android/core/common/FilterQueryCriteria$Builder;
@@ -5486,6 +5484,7 @@ public final class org/hisp/dhis/android/core/event/EventFilterCollectionReposit
 	public final fun byOuMode ()Lorg/hisp/dhis/android/core/arch/repositories/filters/internal/EnumFilterConnector;
 	public final fun byProgram ()Lorg/hisp/dhis/android/core/arch/repositories/filters/internal/StringFilterConnector;
 	public final fun byProgramStage ()Lorg/hisp/dhis/android/core/arch/repositories/filters/internal/StringFilterConnector;
+	public final fun byStatus ()Lorg/hisp/dhis/android/core/arch/repositories/filters/internal/EnumFilterConnector;
 	public final fun withEventDataFilters ()Lorg/hisp/dhis/android/core/event/EventFilterCollectionRepository;
 }
 
@@ -5530,7 +5529,9 @@ public abstract class org/hisp/dhis/android/core/event/EventQueryCriteria : org/
 	public abstract fun completedDate ()Lorg/hisp/dhis/android/core/common/DateFilterPeriod;
 	public abstract fun dataFilters ()Ljava/util/List;
 	public abstract fun dueDate ()Lorg/hisp/dhis/android/core/common/DateFilterPeriod;
+	public fun eventStatus ()Lorg/hisp/dhis/android/core/event/EventStatus;
 	public abstract fun events ()Ljava/util/List;
+	public abstract fun status ()Lorg/hisp/dhis/android/core/event/EventStatus;
 	public abstract fun toBuilder ()Lorg/hisp/dhis/android/core/event/EventQueryCriteria$Builder;
 }
 
@@ -5540,7 +5541,9 @@ public abstract class org/hisp/dhis/android/core/event/EventQueryCriteria$Builde
 	public abstract fun completedDate (Lorg/hisp/dhis/android/core/common/DateFilterPeriod;)Lorg/hisp/dhis/android/core/event/EventQueryCriteria$Builder;
 	public abstract fun dataFilters (Ljava/util/List;)Lorg/hisp/dhis/android/core/event/EventQueryCriteria$Builder;
 	public abstract fun dueDate (Lorg/hisp/dhis/android/core/common/DateFilterPeriod;)Lorg/hisp/dhis/android/core/event/EventQueryCriteria$Builder;
+	public fun eventStatus (Lorg/hisp/dhis/android/core/event/EventStatus;)Lorg/hisp/dhis/android/core/event/EventQueryCriteria$Builder;
 	public abstract fun events (Ljava/util/List;)Lorg/hisp/dhis/android/core/event/EventQueryCriteria$Builder;
+	public abstract fun status (Lorg/hisp/dhis/android/core/event/EventStatus;)Lorg/hisp/dhis/android/core/event/EventQueryCriteria$Builder;
 }
 
 public abstract interface class org/hisp/dhis/android/core/event/EventService {
@@ -10342,6 +10345,7 @@ public abstract class org/hisp/dhis/android/core/trackedentity/EntityQueryCriter
 	public abstract fun enrollmentCreatedDate ()Lorg/hisp/dhis/android/core/common/DateFilterPeriod;
 	public abstract fun enrollmentIncidentDate ()Lorg/hisp/dhis/android/core/common/DateFilterPeriod;
 	public abstract fun enrollmentStatus ()Lorg/hisp/dhis/android/core/enrollment/EnrollmentStatus;
+	public abstract fun eventStatus ()Lorg/hisp/dhis/android/core/event/EventStatus;
 	public abstract fun programStage ()Ljava/lang/String;
 	public abstract fun toBuilder ()Lorg/hisp/dhis/android/core/trackedentity/EntityQueryCriteria$Builder;
 	public abstract fun trackedEntityInstances ()Ljava/util/List;
@@ -10355,6 +10359,7 @@ public abstract class org/hisp/dhis/android/core/trackedentity/EntityQueryCriter
 	public abstract fun enrollmentCreatedDate (Lorg/hisp/dhis/android/core/common/DateFilterPeriod;)Lorg/hisp/dhis/android/core/trackedentity/EntityQueryCriteria$Builder;
 	public abstract fun enrollmentIncidentDate (Lorg/hisp/dhis/android/core/common/DateFilterPeriod;)Lorg/hisp/dhis/android/core/trackedentity/EntityQueryCriteria$Builder;
 	public abstract fun enrollmentStatus (Lorg/hisp/dhis/android/core/enrollment/EnrollmentStatus;)Lorg/hisp/dhis/android/core/trackedentity/EntityQueryCriteria$Builder;
+	public abstract fun eventStatus (Lorg/hisp/dhis/android/core/event/EventStatus;)Lorg/hisp/dhis/android/core/trackedentity/EntityQueryCriteria$Builder;
 	public abstract fun programStage (Ljava/lang/String;)Lorg/hisp/dhis/android/core/trackedentity/EntityQueryCriteria$Builder;
 	public abstract fun trackedEntityInstances (Ljava/util/List;)Lorg/hisp/dhis/android/core/trackedentity/EntityQueryCriteria$Builder;
 	public abstract fun trackedEntityType (Ljava/lang/String;)Lorg/hisp/dhis/android/core/trackedentity/EntityQueryCriteria$Builder;
@@ -13301,7 +13306,6 @@ public final class org/hisp/dhis/android/persistence/event/EventFilterTableInfo$
 	public static final field DUE_DATE Ljava/lang/String;
 	public static final field EVENTS Ljava/lang/String;
 	public static final field EVENT_DATE Ljava/lang/String;
-	public static final field EVENT_STATUS Ljava/lang/String;
 	public static final field FOLLOW_UP Ljava/lang/String;
 	public static final field LAST_UPDATED Ljava/lang/String;
 	public static final field LAST_UPDATED_DATE Ljava/lang/String;
@@ -13311,6 +13315,7 @@ public final class org/hisp/dhis/android/persistence/event/EventFilterTableInfo$
 	public static final field OU_MODE Ljava/lang/String;
 	public static final field PROGRAM Ljava/lang/String;
 	public static final field PROGRAM_STAGE Ljava/lang/String;
+	public static final field STATUS Ljava/lang/String;
 	public static final field UID Ljava/lang/String;
 	public fun <init> ()V
 	public fun all ()[Ljava/lang/String;

core/src/main/assets/migrations/178.sql

@@ -0,0 +1,3 @@
+# Rename eventStatus property to status on EventFilter class (ANDROSDK-2208)
+
+ALTER TABLE EventFilter RENAME COLUMN eventStatus TO status;

core/src/main/java/org/hisp/dhis/android/core/arch/db/access/internal/AppDatabase.kt

@@ -610,6 +610,6 @@ abstract class AppDatabase : RoomDatabase() {
     internal abstract fun visualizationDimensionItemDao(): VisualizationDimensionItemDao
 
     companion object {
-        const val VERSION = 177
+        const val VERSION = 178
     }
 }

core/src/main/java/org/hisp/dhis/android/core/common/FilterQueryCriteria.java

@@ -30,7 +30,6 @@
 
 import androidx.annotation.Nullable;
 
-import org.hisp.dhis.android.core.event.EventStatus;
 import org.hisp.dhis.android.core.organisationunit.OrganisationUnitMode;
 
 import java.util.List;
@@ -55,9 +54,6 @@ public abstract class FilterQueryCriteria {
     @Nullable
     public abstract List<String> displayColumnOrder();
 
-    @Nullable
-    public abstract EventStatus eventStatus();
-
     @Nullable
     public abstract DateFilterPeriod eventDate();
 
@@ -78,8 +74,6 @@ public abstract static class Builder<T extends Builder> {
 
         public abstract T displayColumnOrder(List<String> displayColumnOrder);
 
-        public abstract T eventStatus(EventStatus  eventStatus);
-
         public abstract T eventDate(DateFilterPeriod eventDate);
 
         public abstract T lastUpdatedDate(DateFilterPeriod lastUpdatedDate);

core/src/main/java/org/hisp/dhis/android/core/event/EventFilterCollectionRepository.kt

@@ -99,8 +99,13 @@ class EventFilterCollectionRepository internal constructor(
         return cf.string(EventFilterTableInfo.Columns.EVENTS)
     }
 
+    fun byStatus(): EnumFilterConnector<EventFilterCollectionRepository, EventStatus> {
+        return cf.enumC(EventFilterTableInfo.Columns.STATUS)
+    }
+
+    @Deprecated("Use byStatus() instead", ReplaceWith("byStatus()"))
     fun byEventStatus(): EnumFilterConnector<EventFilterCollectionRepository, EventStatus> {
-        return cf.enumC(EventFilterTableInfo.Columns.EVENT_STATUS)
+        return byStatus()
     }
 
     fun byEventDate(): StringFilterConnector<EventFilterCollectionRepository> {

core/src/main/java/org/hisp/dhis/android/core/event/EventQueryCriteria.java

@@ -41,6 +41,18 @@
 @AutoValue
 public abstract class EventQueryCriteria extends FilterQueryCriteria implements CoreObject {
 
+    @Nullable
+    public abstract EventStatus status();
+
+    /**
+     * @deprecated Use {@link #status()} instead.
+     */
+    @Deprecated
+    @Nullable
+    public EventStatus eventStatus() {
+        return status();
+    }
+
     @Nullable
     public abstract List<EventDataFilter> dataFilters();
 
@@ -61,6 +73,16 @@ public static Builder builder() {
 
     @AutoValue.Builder
     public abstract static class Builder extends FilterQueryCriteria.Builder<Builder> {
+        public abstract Builder status(EventStatus status);
+
+        /**
+         * @deprecated Use {@link #status(EventStatus)} instead.
+         */
+        @Deprecated
+        public Builder eventStatus(EventStatus eventStatus) {
+            return status(eventStatus);
+        }
+
         public abstract Builder dataFilters(List<EventDataFilter> dataFilters);
 
         public abstract Builder events(List<String> events);

core/src/main/java/org/hisp/dhis/android/core/event/search/EventQueryRepositoryScopeHelper.kt

@@ -50,7 +50,7 @@ internal object EventQueryRepositoryScopeHelper {
             criteria.order()?.let { builder.order(parseOrderString(it)) }
             criteria.dataFilters()?.let { builder.dataFilters(it) }
             criteria.events()?.let { builder.events(it) }
-            criteria.eventStatus()?.let { builder.eventStatus(listOf(it)) }
+            criteria.status()?.let { builder.eventStatus(listOf(it)) }
             criteria.eventDate()?.let { builder.eventDate(it) }
             criteria.dueDate()?.let { builder.dueDate(it) }
             criteria.lastUpdatedDate()?.let { builder.lastUpdatedDate(it) }

core/src/main/java/org/hisp/dhis/android/core/trackedentity/EntityQueryCriteria.java

@@ -36,12 +36,16 @@
 import org.hisp.dhis.android.core.common.DateFilterPeriod;
 import org.hisp.dhis.android.core.common.FilterQueryCriteria;
 import org.hisp.dhis.android.core.enrollment.EnrollmentStatus;
+import org.hisp.dhis.android.core.event.EventStatus;
 
 import java.util.List;
 
 @AutoValue
 public abstract class EntityQueryCriteria extends FilterQueryCriteria implements CoreObject {
 
+    @Nullable
+    public abstract EventStatus eventStatus();
+
     @Nullable
     public abstract String programStage();
 
@@ -71,6 +75,8 @@ public static Builder builder() {
 
     @AutoValue.Builder
     public abstract static class Builder extends FilterQueryCriteria.Builder<Builder> {
+        public abstract Builder eventStatus(EventStatus eventStatus);
+
         public abstract Builder programStage(String programStage);
 
         public abstract Builder trackedEntityInstances(List<String> trackedEntityInstances);

core/src/main/java/org/hisp/dhis/android/network/common/dto/FilterQueryCriteriaDTO.kt

@@ -30,7 +30,6 @@ package org.hisp.dhis.android.network.common.dto
 
 import org.hisp.dhis.android.core.common.AssignedUserMode
 import org.hisp.dhis.android.core.common.FilterQueryCriteria
-import org.hisp.dhis.android.core.event.EventStatus
 import org.hisp.dhis.android.core.organisationunit.OrganisationUnitMode
 
 internal interface FilterQueryCriteriaDTO {
@@ -40,7 +39,6 @@ internal interface FilterQueryCriteriaDTO {
     val assignedUserMode: String?
     val order: String?
     val displayColumnOrder: List<String>?
-    val eventStatus: String?
     val eventDate: DateFilterPeriodDTO?
     val lastUpdatedDate: DateFilterPeriodDTO?
 }
@@ -53,7 +51,6 @@ internal fun <T> T.applyFilterQueryCriteriaFields(item: FilterQueryCriteriaDTO):
     item.assignedUserMode?.let { assignedUserMode(AssignedUserMode.valueOf(it)) }
     order(item.order)
     displayColumnOrder(item.displayColumnOrder)
-    item.eventStatus?.let { eventStatus(EventStatus.valueOf(it)) }
     eventDate(item.eventDate?.toDomain())
     lastUpdatedDate(item.lastUpdatedDate?.toDomain())
     return this

core/src/main/java/org/hisp/dhis/android/network/eventfilter/EventQueryCriteriaDTO.kt

@@ -30,6 +30,7 @@ package org.hisp.dhis.android.network.eventfilter
 
 import kotlinx.serialization.Serializable
 import org.hisp.dhis.android.core.event.EventQueryCriteria
+import org.hisp.dhis.android.core.event.EventStatus
 import org.hisp.dhis.android.network.common.dto.DateFilterPeriodDTO
 import org.hisp.dhis.android.network.common.dto.FilterQueryCriteriaDTO
 import org.hisp.dhis.android.network.common.dto.applyFilterQueryCriteriaFields
@@ -42,9 +43,9 @@ internal data class EventQueryCriteriaDTO(
     override val assignedUserMode: String?,
     override val order: String?,
     override val displayColumnOrder: List<String>?,
-    override val eventStatus: String?,
     override val eventDate: DateFilterPeriodDTO?,
     override val lastUpdatedDate: DateFilterPeriodDTO?,
+    val status: String?,
     val dataFilters: List<EventDataFilterDTO>?,
     val events: List<String>?,
     val dueDate: DateFilterPeriodDTO?,
@@ -53,6 +54,7 @@ internal data class EventQueryCriteriaDTO(
     fun toDomain(eventFilter: String): EventQueryCriteria {
         return EventQueryCriteria.builder()
             .applyFilterQueryCriteriaFields(this)
+            .status(status?.let { EventStatus.valueOf(it) })
             .dataFilters(dataFilters?.map { it.toDomain(eventFilter) })
             .events(events)
             .dueDate(dueDate?.toDomain())

core/src/main/java/org/hisp/dhis/android/network/eventfilter/EventQueryCriteriaFields.kt

@@ -47,7 +47,7 @@ internal object EventQueryCriteriaFields : BaseFields<EventQueryCriteria>() {
         fh.field(ORDER),
         fh.field(Columns.DISPLAY_COLUMN_ORDER),
         fh.field(Columns.EVENTS),
-        fh.field(Columns.EVENT_STATUS),
+        fh.field(Columns.STATUS),
         fh.nestedField<EventDataFilter>(DATA_FILTERS).with(EventDataFilterFields.allFields),
         fh.nestedField<DateFilterPeriod>(Columns.EVENT_DATE).with(DateFilterPeriodFields.allFields),
         fh.nestedField<DateFilterPeriod>(Columns.DUE_DATE).with(DateFilterPeriodFields.allFields),

core/src/main/java/org/hisp/dhis/android/network/trackedentityinstancefilter/EntityQueryCriteriaDTO.kt

@@ -30,6 +30,7 @@ package org.hisp.dhis.android.network.trackedentityinstancefilter
 
 import kotlinx.serialization.Serializable
 import org.hisp.dhis.android.core.enrollment.EnrollmentStatus
+import org.hisp.dhis.android.core.event.EventStatus
 import org.hisp.dhis.android.core.trackedentity.EntityQueryCriteria
 import org.hisp.dhis.android.network.common.dto.DateFilterPeriodDTO
 import org.hisp.dhis.android.network.common.dto.FilterQueryCriteriaDTO
@@ -43,9 +44,9 @@ internal data class EntityQueryCriteriaDTO(
     override val assignedUserMode: String?,
     override val order: String?,
     override val displayColumnOrder: List<String>?,
-    override val eventStatus: String?,
     override val eventDate: DateFilterPeriodDTO?,
     override val lastUpdatedDate: DateFilterPeriodDTO?,
+    val eventStatus: String?,
     val programStage: String?,
     val trackedEntityInstances: List<String>?,
     val trackedEntityType: String?,
@@ -57,6 +58,7 @@ internal data class EntityQueryCriteriaDTO(
     internal fun toDomain(trackedEntityInstanceFilter: String): EntityQueryCriteria {
         return EntityQueryCriteria.builder()
             .applyFilterQueryCriteriaFields(this)
+            .eventStatus(eventStatus?.let { EventStatus.valueOf(it) })
             .programStage(programStage)
             .trackedEntityInstances(trackedEntityInstances)
             .trackedEntityType(trackedEntityType)

core/src/main/java/org/hisp/dhis/android/persistence/common/FilterQueryCriteriaDB.kt

@@ -30,7 +30,6 @@ package org.hisp.dhis.android.persistence.common
 
 import org.hisp.dhis.android.core.common.AssignedUserMode
 import org.hisp.dhis.android.core.common.FilterQueryCriteria
-import org.hisp.dhis.android.core.event.EventStatus
 import org.hisp.dhis.android.core.organisationunit.OrganisationUnitMode
 
 internal interface FilterQueryCriteriaDB {
@@ -40,7 +39,6 @@ internal interface FilterQueryCriteriaDB {
     val assignedUserMode: String?
     val orderProperty: String?
     val displayColumnOrder: StringListDB?
-    val eventStatus: String?
     val eventDate: DateFilterPeriodDB?
     val lastUpdatedDate: DateFilterPeriodDB?
 }
@@ -53,7 +51,6 @@ internal fun <T> T.applyFilterQueryCriteriaFields(item: FilterQueryCriteriaDB):
     item.assignedUserMode?.let { assignedUserMode(AssignedUserMode.valueOf(it)) }
     order(item.orderProperty)
     item.displayColumnOrder?.let { displayColumnOrder(it.toDomain()) }
-    item.eventStatus?.let { eventStatus(EventStatus.valueOf(it)) }
     item.eventDate?.let { eventDate(it.toDomain()) }
     item.lastUpdatedDate?.let { lastUpdatedDate(it.toDomain()) }
     return this

core/src/main/java/org/hisp/dhis/android/persistence/event/EventFilterDB.kt

@@ -58,7 +58,7 @@ internal data class EventFilterDB(
     val orderProperty: String?,
     val displayColumnOrder: StringListDB?,
     val events: StringListDB?,
-    val eventStatus: String?,
+    val status: String?,
     val eventDate: DateFilterPeriodDB?,
     val dueDate: DateFilterPeriodDB?,
     val lastUpdatedDate: DateFilterPeriodDB?,
@@ -79,7 +79,7 @@ internal data class EventFilterDB(
                     orderProperty = orderProperty,
                     displayColumnOrder = displayColumnOrder,
                     events = events,
-                    eventStatus = eventStatus,
+                    status = status,
                     eventDate = eventDate,
                     dueDate = dueDate,
                     lastUpdatedDate = lastUpdatedDate,
@@ -110,7 +110,7 @@ internal fun EventFilter.toDB(): EventFilterDB {
         orderProperty = eventQueryCriteria?.orderProperty,
         displayColumnOrder = eventQueryCriteria?.displayColumnOrder,
         events = eventQueryCriteria?.events,
-        eventStatus = eventQueryCriteria?.eventStatus,
+        status = eventQueryCriteria?.status,
         eventDate = eventQueryCriteria?.eventDate,
         dueDate = eventQueryCriteria?.dueDate,
         lastUpdatedDate = eventQueryCriteria?.lastUpdatedDate,

core/src/main/java/org/hisp/dhis/android/persistence/event/EventQueryCriteriaDB.kt

@@ -29,6 +29,7 @@
 package org.hisp.dhis.android.persistence.event
 
 import org.hisp.dhis.android.core.event.EventQueryCriteria
+import org.hisp.dhis.android.core.event.EventStatus
 import org.hisp.dhis.android.persistence.common.DateFilterPeriodDB
 import org.hisp.dhis.android.persistence.common.EntityDB
 import org.hisp.dhis.android.persistence.common.FilterQueryCriteriaDB
@@ -43,17 +44,18 @@ internal data class EventQueryCriteriaDB(
     override val assignedUserMode: String?,
     override val orderProperty: String?,
     override val displayColumnOrder: StringListDB?,
-    override val eventStatus: String?,
-    override val eventDate: DateFilterPeriodDB?,
-    override val lastUpdatedDate: DateFilterPeriodDB?,
     val events: StringListDB?,
+    val status: String?,
+    override val eventDate: DateFilterPeriodDB?,
     val dueDate: DateFilterPeriodDB?,
+    override val lastUpdatedDate: DateFilterPeriodDB?,
     val completedDate: DateFilterPeriodDB?,
 ) : EntityDB<EventQueryCriteria>, FilterQueryCriteriaDB {
 
     override fun toDomain(): EventQueryCriteria {
         return EventQueryCriteria.builder().apply {
             applyFilterQueryCriteriaFields(this@EventQueryCriteriaDB)
+            status?.let { status(EventStatus.valueOf(it)) }
             events(events?.toDomain())
             dueDate(dueDate?.toDomain())
             completedDate(completedDate?.toDomain())
@@ -69,11 +71,11 @@ internal fun EventQueryCriteria.toDB(): EventQueryCriteriaDB {
         assignedUserMode = assignedUserMode()?.name,
         orderProperty = order(),
         displayColumnOrder = displayColumnOrder()?.toDB(),
-        eventStatus = eventStatus()?.name,
-        eventDate = eventDate()?.toDB(),
-        lastUpdatedDate = lastUpdatedDate()?.toDB(),
         events = events()?.toDB(),
+        status = status()?.name,
+        eventDate = eventDate()?.toDB(),
         dueDate = dueDate()?.toDB(),
+        lastUpdatedDate = lastUpdatedDate()?.toDB(),
         completedDate = completedDate()?.toDB(),
     )
 }