FHIR Core Enhancements

.github/workflows/ci.yml

@@ -272,7 +272,7 @@ jobs:
           force-avd-creation: true
           emulator-options: -no-snapshot-save -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none
           disable-animations: true
-          script: ./gradlew clean  -PlocalPropertiesFile=local.properties :quest:fhircoreJacocoReport --info -Pandroid.testInstrumentationRunnerArguments.notPackage=org.smartregister.fhircore.quest.performance
+          script: ./gradlew clean  -PlocalPropertiesFile=local.properties :quest:fhircoreJacocoReport --stacktrace -Pandroid.testInstrumentationRunnerArguments.notPackage=org.smartregister.fhircore.quest.performance
 
       - name: Run Quest module unit and instrumentation tests and generate aggregated coverage report (Disabled)
         if: false

android/engine/src/main/java/org/smartregister/fhircore/engine/configuration/ConfigurationRegistry.kt

@@ -34,6 +34,7 @@
 import java.util.ResourceBundle
 import javax.inject.Inject
 import javax.inject.Singleton
+import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.withLock
 import kotlinx.coroutines.withContext
@@ -76,6 +77,7 @@
 import org.smartregister.fhircore.engine.util.extension.retrieveRelatedEntitySyncLocationState
 import org.smartregister.fhircore.engine.util.extension.searchCompositionByIdentifier
 import org.smartregister.fhircore.engine.util.extension.updateLastUpdated
+import org.smartregister.fhircore.engine.util.forEachAsync
 import org.smartregister.fhircore.engine.util.helper.LocalizationHelper
 import retrofit2.HttpException
 import timber.log.Timber
@@ -431,7 +433,7 @@
             } else {
               val chunkedResourceIdList = entry.value.chunked(MANIFEST_PROCESSOR_BATCH_SIZE)
 
-              chunkedResourceIdList.forEach { sectionComponents ->
+              chunkedResourceIdList.forEachAsync(Dispatchers.IO) { sectionComponents ->
                 Timber.d(
                   "Fetching config resource ${entry.key}: with ids ${
                                         sectionComponents.joinToString(
@@ -558,7 +560,7 @@
   private suspend fun processResultBundleEntries(
     resultBundleEntries: List<Bundle.BundleEntryComponent>,
   ) {
-    resultBundleEntries.forEach { bundleEntryComponent ->
+    resultBundleEntries.forEachAsync(Dispatchers.IO) { bundleEntryComponent ->
       when (bundleEntryComponent.resource) {
         is Bundle -> {
           val bundle = bundleEntryComponent.resource as Bundle
@@ -711,7 +713,7 @@
           }
       }
     } else {
-      sectionComponentEntry.value.forEach {
+      sectionComponentEntry.value.forEachAsync(Dispatchers.IO) {
         fetchResources(
           gatewayModeHeaderValue = FHIR_GATEWAY_MODE_HEADER_VALUE,
           url =

android/engine/src/main/java/org/smartregister/fhircore/engine/sync/SyncBroadcaster.kt

@@ -17,16 +17,20 @@
 package org.smartregister.fhircore.engine.sync
 
 import android.content.Context
+import androidx.work.BackoffPolicy
 import androidx.work.Constraints
 import androidx.work.NetworkType
 import androidx.work.OneTimeWorkRequestBuilder
+import androidx.work.OutOfQuotaPolicy
 import androidx.work.WorkManager
 import com.google.android.fhir.FhirEngine
+import com.google.android.fhir.sync.BackoffCriteria
 import com.google.android.fhir.sync.CurrentSyncJobStatus
 import com.google.android.fhir.sync.LastSyncJobStatus
 import com.google.android.fhir.sync.PeriodicSyncConfiguration
 import com.google.android.fhir.sync.PeriodicSyncJobStatus
 import com.google.android.fhir.sync.RepeatInterval
+import com.google.android.fhir.sync.RetryConfiguration
 import com.google.android.fhir.sync.Sync
 import com.google.android.fhir.sync.SyncJobStatus
 import com.google.android.fhir.sync.download.ResourceParamsBasedDownloadWorkManager
@@ -77,6 +81,12 @@
         .setConstraints(
           Constraints.Builder().setRequiredNetworkType(NetworkType.CONNECTED).build(),
         )
+        .setExpedited(OutOfQuotaPolicy.RUN_AS_NON_EXPEDITED_WORK_REQUEST)
+        .setBackoffCriteria(
+          BackoffPolicy.LINEAR,
+          10,
+          TimeUnit.SECONDS,
+        )
         .build(),
     )
   }
@@ -95,6 +105,16 @@
             syncConstraints =
               Constraints.Builder().setRequiredNetworkType(NetworkType.CONNECTED).build(),
             repeat = RepeatInterval(interval = interval, timeUnit = TimeUnit.MINUTES),
+            retryConfiguration =
+              RetryConfiguration(
+                backoffCriteria =
+                  BackoffCriteria(
+                    backoffDelay = 10,
+                    timeUnit = TimeUnit.SECONDS,
+                    backoffPolicy = BackoffPolicy.EXPONENTIAL,
+                  ),
+                maxRetries = 3,
+              ),
           ),
       )
       .handlePeriodicSyncJobStatus(this)

android/engine/src/main/java/org/smartregister/fhircore/engine/util/ParallelUtil.kt

@@ -16,9 +16,12 @@
 
 package org.smartregister.fhircore.engine.util
 
+import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.async
 import kotlinx.coroutines.awaitAll
 import kotlinx.coroutines.coroutineScope
+import kotlinx.coroutines.launch
 
 /**
  * Launch a new coroutine for each map iteration using async. From
@@ -34,10 +37,16 @@ suspend fun <A, B> Iterable<A>.pmap(f: suspend (A) -> B): Iterable<B> = coroutin
 }
 
 /**
- * Launch a new coroutine for each loop iteration using async.
+ * Launch a new coroutine for each loop iteration using launch and the Default Dispatcher for
+ * computationaly intensive tasks.
  *
  * @param T the type of elements in the iterable
  */
 suspend fun <T> Iterable<T>.forEachAsync(action: suspend (T) -> Unit): Unit = coroutineScope {
-  forEach { async { action(it) } }
+  forEach { launch(Dispatchers.Default) { action(it) } }
 }
+
+suspend fun <T> Iterable<T>.forEachAsync(
+  dispatcher: CoroutineDispatcher,
+  action: suspend (T) -> Unit,
+): Unit = coroutineScope { forEach { launch(dispatcher) { action(it) } } }

android/engine/src/main/res/values/styles.xml

@@ -84,6 +84,7 @@
         <item name="indicatorColor">@color/colorPrimary</item>
     </style>
 
+
     <style name="AppTheme.QuestionnaireSubmitButtonStyle" parent="Widget.MaterialComponents.Button">
         <item name="android:text">@string/str_save</item>
         <item name="android:textAllCaps">true</item>

android/engine/src/test/java/org/smartregister/fhircore/engine/configuration/ConfigurationRegistryTest.kt

@@ -43,6 +43,7 @@ import org.hl7.fhir.r4.model.Bundle.BundleEntryComponent
 import org.hl7.fhir.r4.model.Composition
 import org.hl7.fhir.r4.model.Composition.SectionComponent
 import org.hl7.fhir.r4.model.Enumerations
+import org.hl7.fhir.r4.model.Group
 import org.hl7.fhir.r4.model.Identifier
 import org.hl7.fhir.r4.model.ListResource
 import org.hl7.fhir.r4.model.Reference
@@ -1006,17 +1007,18 @@ class ConfigurationRegistryTest : RobolectricTest() {
 
       assertEquals(4, requestPathArgumentSlot.size)
 
-      assertEquals("Bundle/the-commodities-bundle-id", requestPathArgumentSlot.first().id)
-      assertEquals(ResourceType.Bundle, requestPathArgumentSlot.first().resourceType)
+      val bundles = requestPathArgumentSlot.filterIsInstance<Bundle>().first()
+      assertEquals("Bundle/the-commodities-bundle-id", bundles.id)
+      assertEquals(ResourceType.Bundle, bundles.resourceType)
 
-      assertEquals("Group/1000001", requestPathArgumentSlot.second().id)
-      assertEquals(ResourceType.Group, requestPathArgumentSlot.second().resourceType)
+      val groups = requestPathArgumentSlot.filterIsInstance<Group>()
+      assertEquals(2, groups.size)
+      assertTrue(groups.any { it.id == "Group/1000001" })
+      assertTrue(groups.any { it.id == "Group/2000001" })
 
-      assertEquals("Group/2000001", requestPathArgumentSlot[2].id)
-      assertEquals(ResourceType.Group, requestPathArgumentSlot[2].resourceType)
-
-      assertEquals("composition-id-1", requestPathArgumentSlot.last().id)
-      assertEquals(ResourceType.Composition, requestPathArgumentSlot.last().resourceType)
+      val compositions = requestPathArgumentSlot.filterIsInstance<Composition>().first()
+      assertEquals("composition-id-1", compositions.id)
+      assertEquals(ResourceType.Composition, compositions.resourceType)
     }
 
   @Test

android/gradle/libs.versions.toml

@@ -27,7 +27,7 @@ espresso-core = "3.6.1"
 fhir-sdk-contrib-barcode = "0.1.0-beta3-preview7-rc1-SNAPSHOT"
 fhir-sdk-contrib-locationwidget = "0.1.0-alpha01-preview2-rc1-SNAPSHOT"
 fhir-sdk-data-capture = "1.2.0-preview4-SNAPSHOT"
-fhir-sdk-engine = "1.0.0-preview16-SNAPSHOT"
+fhir-sdk-engine = "1.0.0-preview16.1-SNAPSHOT"
 fhir-sdk-knowledge = "0.1.0-alpha03-preview5-rc1-SNAPSHOT"
 fhir-sdk-workflow = "0.1.0-alpha04-preview10-rc1-SNAPSHOT"
 fragment-ktx = "1.8.3"

android/quest/src/main/java/org/smartregister/fhircore/quest/ui/appsetting/AppSettingViewModel.kt

@@ -25,6 +25,7 @@ import dagger.hilt.android.lifecycle.HiltViewModel
 import java.net.UnknownHostException
 import javax.inject.Inject
 import kotlinx.coroutines.CoroutineExceptionHandler
+import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import okhttp3.RequestBody.Companion.toRequestBody
@@ -50,6 +51,7 @@ import org.smartregister.fhircore.engine.util.extension.getActivity
 import org.smartregister.fhircore.engine.util.extension.launchActivityWithNoBackStackHistory
 import org.smartregister.fhircore.engine.util.extension.retrieveCompositionSections
 import org.smartregister.fhircore.engine.util.extension.retrieveImplementationGuideDefinitionResources
+import org.smartregister.fhircore.engine.util.forEachAsync
 import org.smartregister.fhircore.quest.ui.login.LoginActivity
 import retrofit2.HttpException
 import timber.log.Timber
@@ -163,7 +165,7 @@ constructor(
           .forEach { entry: Map.Entry<String, List<Composition.SectionComponent>> ->
             val chunkedResourceIdList =
               entry.value.chunked(ConfigurationRegistry.MANIFEST_PROCESSOR_BATCH_SIZE)
-            chunkedResourceIdList.forEach { parentIt ->
+            chunkedResourceIdList.forEachAsync(Dispatchers.IO) { parentIt ->
               Timber.d(
                 "Fetching config resource ${entry.key}: with ids ${StringUtils.join(parentIt,",")}",
               )

android/quest/src/main/java/org/smartregister/fhircore/quest/ui/login/LoginViewModel.kt

@@ -22,15 +22,18 @@ import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
+import androidx.work.BackoffPolicy
 import androidx.work.Constraints
 import androidx.work.NetworkType
 import androidx.work.OneTimeWorkRequestBuilder
+import androidx.work.OutOfQuotaPolicy
 import androidx.work.WorkManager
 import dagger.hilt.android.lifecycle.HiltViewModel
 import io.sentry.Sentry
 import io.sentry.protocol.User
 import java.net.SocketTimeoutException
 import java.net.UnknownHostException
+import java.util.concurrent.TimeUnit
 import javax.inject.Inject
 import kotlinx.coroutines.launch
 import org.hl7.fhir.r4.model.Bundle as FhirR4ModelBundle
@@ -460,6 +463,12 @@ constructor(
         .setConstraints(
           Constraints.Builder().setRequiredNetworkType(NetworkType.CONNECTED).build(),
         )
+        .setExpedited(OutOfQuotaPolicy.RUN_AS_NON_EXPEDITED_WORK_REQUEST)
+        .setBackoffCriteria(
+          BackoffPolicy.LINEAR,
+          10,
+          TimeUnit.SECONDS,
+        )
         .build(),
     )
   }