Merge pull request #1239 from dhis2/androsdk-1129

vgarciabnz · web-flow · commit 10fc1741df3c · 2020-04-21T10:18:44.000+02:00
fix: [ANDROSDK-1129] Include UPLOADING state in the list of uploadable states
diff --git a/core/src/main/java/org/hisp/dhis/android/core/common/State.java b/core/src/main/java/org/hisp/dhis/android/core/common/State.java
@@ -69,13 +69,13 @@ public enum State {
 
     public static State[] uploadableStates() {
         return new State[] {
-                TO_POST, TO_UPDATE, SENT_VIA_SMS, SYNCED_VIA_SMS
+                TO_POST, TO_UPDATE, SENT_VIA_SMS, SYNCED_VIA_SMS, UPLOADING
         };
     }
 
     public static State[] uploadableStatesIncludingError() {
         return new State[] {
-                TO_POST, TO_UPDATE, SENT_VIA_SMS, SYNCED_VIA_SMS, ERROR, WARNING
+                TO_POST, TO_UPDATE, SENT_VIA_SMS, SYNCED_VIA_SMS, UPLOADING, ERROR, WARNING
         };
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventStoreImpl.java b/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventStoreImpl.java
@@ -36,6 +36,7 @@
 import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder;
 import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder;
 import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableDeletableDataObjectStoreImpl;
+import org.hisp.dhis.android.core.arch.helpers.CollectionsHelper;
 import org.hisp.dhis.android.core.arch.helpers.internal.EnumHelper;
 import org.hisp.dhis.android.core.common.IdentifiableColumns;
 import org.hisp.dhis.android.core.common.State;
@@ -100,8 +101,10 @@ public Map<String, List<Event>> queryEventsAttachedToEnrollmentToPost() {
 
     @Override
     public List<Event> querySingleEventsToPost() {
+        String states = CollectionsHelper.commaAndSpaceSeparatedArrayValues(
+                CollectionsHelper.withSingleQuotationMarksArray(EnumHelper.asStringList(State.uploadableStates())));
         String singleEventsToPostQuery = QUERY_SINGLE_EVENTS +
-                " AND (Event.state = '" + State.TO_POST + "' OR Event.state = '" + State.TO_UPDATE + "')";
+                " AND (Event.state IN (" + states + "))";
         return eventListFromQuery(singleEventsToPostQuery);
     }
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeValueStoreImpl.java b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeValueStoreImpl.java
@@ -37,6 +37,8 @@
 import org.hisp.dhis.android.core.arch.db.stores.binders.internal.WhereStatementBinder;
 import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStoreImpl;
 import org.hisp.dhis.android.core.arch.db.stores.projections.internal.SingleParentChildProjection;
+import org.hisp.dhis.android.core.arch.helpers.CollectionsHelper;
+import org.hisp.dhis.android.core.arch.helpers.internal.EnumHelper;
 import org.hisp.dhis.android.core.common.State;
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityAttributeValue;
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityAttributeValueTableInfo;
@@ -98,10 +100,10 @@ public Map<String, List<TrackedEntityAttributeValue>> queryTrackedEntityAttribut
         return valueMap;
     }
 
-    // TODO Could we reuse EnumHelper.asStringList(State.uploadableStates())?
     private String teiInUploadableState() {
-        return "(TrackedEntityInstance.state IN ('" + State.TO_POST + "', '" + State.TO_UPDATE + "', '"
-                + State.SENT_VIA_SMS + "', '" + State.SYNCED_VIA_SMS + "'))";
+        String states = CollectionsHelper.commaAndSpaceSeparatedArrayValues(
+                CollectionsHelper.withSingleQuotationMarksArray(EnumHelper.asStringList(State.uploadableStates())));
+        return "(TrackedEntityInstance.state IN (" + states + "))";
     }
 
     @Override
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityDataValueStoreImpl.java b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityDataValueStoreImpl.java
@@ -38,6 +38,8 @@
 import org.hisp.dhis.android.core.arch.db.stores.binders.internal.WhereStatementBinder;
 import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStoreImpl;
 import org.hisp.dhis.android.core.arch.db.stores.projections.internal.SingleParentChildProjection;
+import org.hisp.dhis.android.core.arch.helpers.CollectionsHelper;
+import org.hisp.dhis.android.core.arch.helpers.internal.EnumHelper;
 import org.hisp.dhis.android.core.common.State;
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityDataValue;
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityDataValueTableInfo;
@@ -114,10 +116,10 @@ public Map<String, List<TrackedEntityDataValue>> querySingleEventsTrackedEntityD
         return queryTrackedEntityDataValues(queryStatement);
     }
 
-    // TODO Could we reuse EnumHelper.asStringList(State.uploadableStates())?
     private String eventInUploadableState() {
-        return "(Event.state IN ('" + State.TO_POST + "', '" + State.TO_UPDATE + "', '"
-                + State.SENT_VIA_SMS + "', '" + State.SYNCED_VIA_SMS + "'))";
+        String states = CollectionsHelper.commaAndSpaceSeparatedArrayValues(
+                CollectionsHelper.withSingleQuotationMarksArray(EnumHelper.asStringList(State.uploadableStates())));
+        return "(Event.state IN (" + states + "))";
     }
 
     @Override
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceLocalQueryHelper.java b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceLocalQueryHelper.java
@@ -29,6 +29,8 @@
 package org.hisp.dhis.android.core.trackedentity.search;
 
 import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder;
+import org.hisp.dhis.android.core.arch.helpers.CollectionsHelper;
+import org.hisp.dhis.android.core.arch.helpers.internal.EnumHelper;
 import org.hisp.dhis.android.core.arch.repositories.scope.internal.FilterItemOperator;
 import org.hisp.dhis.android.core.arch.repositories.scope.internal.RepositoryScopeFilterItem;
 import org.hisp.dhis.android.core.common.AssignedUserMode;
@@ -130,10 +132,15 @@ static String getSqlQuery(TrackedEntityInstanceQueryRepositoryScope scope, List<
         }
 
         // TODO In case a program uid is provided, the server orders by enrollmentStatus.
-
+        String order1 = CollectionsHelper.commaAndSpaceSeparatedArrayValues(
+                CollectionsHelper.withSingleQuotationMarksArray(
+                        EnumHelper.asStringList(State.TO_POST, State.TO_UPDATE, State.UPLOADING)));
+        String order2 = CollectionsHelper.commaAndSpaceSeparatedArrayValues(
+                CollectionsHelper.withSingleQuotationMarksArray(
+                        EnumHelper.asStringList(State.SYNCED, State.SYNCED_VIA_SMS, State.SENT_VIA_SMS)));
         queryStr += " ORDER BY CASE " +
-                "WHEN " + TEI_STATE + " IN ('" + State.TO_POST + "','" + State.TO_UPDATE + "') THEN 1 " +
-                "WHEN " + TEI_STATE + " = '" + State.SYNCED + "' THEN 2 ELSE 3 END ASC, " +
+                "WHEN " + TEI_STATE + " IN (" + order1 + ") THEN 1 " +
+                "WHEN " + TEI_STATE + " IN (" + order2 + ") THEN 2 ELSE 3 END ASC, " +
                 TEI_LAST_UPDATED + " DESC ";
 
         if (limit > 0) {

Original file line number	Diff line number	Diff line change
`@@ -69,13 +69,13 @@ public enum State {`
`69`	`69`
`70`	`70`	`public static State[] uploadableStates() {`
`71`	`71`	`return new State[] {`
`72`		`- TO_POST, TO_UPDATE, SENT_VIA_SMS, SYNCED_VIA_SMS`
	`72`	`+ TO_POST, TO_UPDATE, SENT_VIA_SMS, SYNCED_VIA_SMS, UPLOADING`
`73`	`73`	`};`
`74`	`74`	`}`
`75`	`75`
`76`	`76`	`public static State[] uploadableStatesIncludingError() {`
`77`	`77`	`return new State[] {`
`78`		`- TO_POST, TO_UPDATE, SENT_VIA_SMS, SYNCED_VIA_SMS, ERROR, WARNING`
	`78`	`+ TO_POST, TO_UPDATE, SENT_VIA_SMS, SYNCED_VIA_SMS, UPLOADING, ERROR, WARNING`
`79`	`79`	`};`
`80`	`80`	`}`
`81`	`81`	`}`