fix: [1.10.1-RC] Port changes in master (#2205)

dhis2 · Aug 19, 2024 · 9033b1a · 9033b1a
2 parents afca151 + d72cace
commit 9033b1a
Show file tree

Hide file tree

Showing 9 changed files with 33 additions and 12 deletions.
diff --git a/...sp/dhis/android/testapp/maintenance/D2ErrorCollectionRepositoryMockIntegrationShould.java b/...sp/dhis/android/testapp/maintenance/D2ErrorCollectionRepositoryMockIntegrationShould.java
@@ -67,7 +67,7 @@ public void filter_d2_error_by_d2_error_code() {
     public void filter_d2_error_by_d2_error_component() {
         List<D2Error> d2Errors = d2.maintenanceModule().d2Errors()
                 .byD2ErrorComponent().eq(D2ErrorComponent.Server).blockingGet();
-        assertThat(d2Errors.size()).isEqualTo(2);
+        assertThat(d2Errors.size()).isEqualTo(4);
     }
 
     @Test
@@ -95,6 +95,6 @@ public void filter_d2_error_by_created() {
         List<D2Error> d2Errors = d2.maintenanceModule().d2Errors()
                 .byCreated().afterOrEqual(startDate).blockingGet();
 
-        assertThat(d2Errors.size()).isEqualTo(3);
+        assertThat(d2Errors.size()).isEqualTo(5);
     }
 }
diff --git a/...Test/java/org/hisp/dhis/android/testapp/maintenance/MaintenanceMockIntegrationShould.java b/...Test/java/org/hisp/dhis/android/testapp/maintenance/MaintenanceMockIntegrationShould.java
@@ -83,6 +83,6 @@ public void get_vulnerabilities_for_low_threshold() {
     @Test
     public void allow_access_to_d2_errors() {
         List<D2Error> d2Errors = d2.maintenanceModule().d2Errors().blockingGet();
-        assertThat(d2Errors.size()).isEqualTo(3);
+        assertThat(d2Errors.size()).isEqualTo(5);
     }
 }
diff --git a/...p/trackedentity/TrackedEntityAttributeValueCollectionRepositoryMockIntegrationShould.java b/...p/trackedentity/TrackedEntityAttributeValueCollectionRepositoryMockIntegrationShould.java
@@ -51,7 +51,7 @@ public class TrackedEntityAttributeValueCollectionRepositoryMockIntegrationShoul
     public void allow_access_to_all_tracked_entity_data_values() {
         List<TrackedEntityAttributeValue> trackedEntityAttributeValues =
                 d2.trackedEntityModule().trackedEntityAttributeValues().blockingGet();
-        assertThat(trackedEntityAttributeValues.size()).isEqualTo(3);
+        assertThat(trackedEntityAttributeValues.size()).isEqualTo(4);
     }
 
     @Test

diff --git a/...testapp/trackedentity/TrackedEntityInstanceCollectionRepositoryMockIntegrationShould.java b/...testapp/trackedentity/TrackedEntityInstanceCollectionRepositoryMockIntegrationShould.java
@@ -69,11 +69,11 @@ public void include_tracked_entity_attribute_values_as_children() {
         TrackedEntityInstance tei = d2.trackedEntityModule().trackedEntityInstances()
                 .withTrackedEntityAttributeValues().uid("nWrB0TfWlvD").blockingGet();
 
-        assertThat(tei.trackedEntityAttributeValues().size()).isEqualTo(1);
+        assertThat(tei.trackedEntityAttributeValues().size()).isEqualTo(2);
 
 
-        assertThat(tei.trackedEntityAttributeValues().get(0).trackedEntityAttribute()).isEqualTo("cejWyOfXge6");
-        assertThat(tei.trackedEntityAttributeValues().get(0).value()).isEqualTo("654321");
+        assertThat(tei.trackedEntityAttributeValues().get(0).trackedEntityAttribute()).isEqualTo("aejWyOfXge6");
+        assertThat(tei.trackedEntityAttributeValues().get(0).value()).isEqualTo("aefryrfXge5");
     }
 
     @Test

diff --git a/...tapp/trackedentity/search/TrackedEntitySearchCollectionRepositoryMockIntegrationShould.kt b/...tapp/trackedentity/search/TrackedEntitySearchCollectionRepositoryMockIntegrationShould.kt
@@ -77,7 +77,7 @@ class TrackedEntitySearchCollectionRepositoryMockIntegrationShould :
             .blockingGet()
 
         assertThat(trackedEntityInstances[0].header).isEqualTo("4081507, befryEfXge5")
-        assertThat(trackedEntityInstances[1].header).isEqualTo("654321, ")
+        assertThat(trackedEntityInstances[1].header).isEqualTo("654321, aefryrfXge5")
     }
 
     @Test

diff --git a/...rc/main/java/org/hisp/dhis/android/core/fileresource/internal/FileResourceDownloadCall.kt b/...rc/main/java/org/hisp/dhis/android/core/fileresource/internal/FileResourceDownloadCall.kt
@@ -39,6 +39,7 @@ import org.hisp.dhis.android.core.arch.call.fetchers.internal.UidsNoResourceCall
 import org.hisp.dhis.android.core.arch.call.internal.D2ProgressManager
 import org.hisp.dhis.android.core.arch.call.queries.internal.UidsQuery
 import org.hisp.dhis.android.core.arch.helpers.FileResizerHelper
+import org.hisp.dhis.android.core.arch.helpers.Result
 import org.hisp.dhis.android.core.common.State
 import org.hisp.dhis.android.core.common.ValueType
 import org.hisp.dhis.android.core.fileresource.FileResource
@@ -253,12 +254,20 @@ internal class FileResourceDownloadCall(
     private suspend fun <V> getIdsValuePairsSequentially(valueMap: Map<String?, V>): List<Pair<FileResource, V>> {
         return valueMap.mapNotNull { (uid, value) ->
             uid?.let {
-                val fileResource = coroutineAPICallExecutor.wrap {
+                val frResult = coroutineAPICallExecutor.wrap {
                     fileResourceService.getFileResource(
                         uid,
                     )
-                }.getOrThrow()
-                Pair(fileResource, value)
+                }
+                when (frResult) {
+                    is Result.Success -> {
+                        Pair(frResult.value, value)
+                    }
+                    is Result.Failure -> {
+                        Log.v(FileResourceDownloadCall::class.java.canonicalName, frResult.failure.errorDescription())
+                        null
+                    }
+                }
             }
         }
     }

diff --git a/core/src/sharedTest/resources/trackedentity/new_tracker_importer_tracked_entities.json b/core/src/sharedTest/resources/trackedentity/new_tracker_importer_tracked_entities.json
@@ -231,6 +231,12 @@
           "createdAt": "2018-01-10T13:40:28.000",
           "attribute": "cejWyOfXge6",
           "value": "654321"
+        },
+        {
+          "updatedAt": "2019-01-11T13:40:28.000",
+          "createdAt": "2019-01-11T13:40:28.000",
+          "attribute": "aejWyOfXge6",
+          "value": "aefryrfXge5"
         }
       ],
       "enrollments": [

diff --git a/core/src/sharedTest/resources/trackedentity/tracked_entity_instances.json b/core/src/sharedTest/resources/trackedentity/tracked_entity_instances.json
@@ -226,6 +226,12 @@
           "created": "2018-01-10T13:40:28.000",
           "attribute": "cejWyOfXge6",
           "value": "654321"
+        },
+        {
+          "lastUpdated": "2019-01-11T13:40:28.000",
+          "created": "2019-01-11T13:40:28.000",
+          "attribute": "aejWyOfXge6",
+          "value": "aefryrfXge5"
         }
       ],
       "enrollments": [

diff --git a/docs/content/developer/getting-started.md b/docs/content/developer/getting-started.md
@@ -6,7 +6,7 @@ Include dependency in build.gradle.
 
 ```gradle
 dependencies {
-    implementation "org.hisp.dhis:android-core:1.10.0.1"
+    implementation "org.hisp.dhis:android-core:1.10.1"
     ...
 }
 ```