Quirks patches [DNM]

datacapture/src/main/java/com/google/android/fhir/datacapture/QuestionnaireViewModel.kt

@@ -1123,7 +1123,7 @@ internal class QuestionnaireViewModel(application: Application, state: SavedStat
       // Results in a new questionnaire state being generated synchronously, i.e., the current
       // thread will be suspended until the new state is generated.
       modificationCount.update { it + 1 }
-      forceValidation = false
+      //forceValidation = false
     }
 
     if (

datacapture/src/main/java/com/google/android/fhir/datacapture/extensions/MoreQuestionnaireItemComponents.kt

@@ -941,13 +941,10 @@ internal fun QuestionnaireItemComponent.createQuestionnaireResponseItem():
     ) {
       this.copyNestedItemsToChildlessAnswers(this@createQuestionnaireResponseItem)
     } else if (
-      [email protected] == Questionnaire.QuestionnaireItemType.GROUP &&
-        !repeats
+      [email protected] == Questionnaire.QuestionnaireItemType.GROUP
     ) {
       [email protected] {
-        if (!it.isRepeatedGroup) {
           this.addItem(it.createQuestionnaireResponseItem())
-        }
       }
     }
   }

engine/src/main/java/com/google/android/fhir/FhirEngine.kt

@@ -178,6 +178,8 @@ interface FhirEngine {
    */
   suspend fun getLocalChanges(type: ResourceType, id: String): List<LocalChange>
 
+  suspend fun getUnsyncedLocalChanges(): List<LocalChange>
+
   /**
    * Purges a resource from the database without deleting data from the server.
    *

engine/src/main/java/com/google/android/fhir/db/impl/DatabaseImpl.kt

@@ -44,6 +44,9 @@ import com.google.android.fhir.toLocalChange
 import com.google.android.fhir.updateMeta
 import java.time.Instant
 import java.util.UUID
+import kotlinx.coroutines.async
+import kotlinx.coroutines.awaitAll
+import kotlinx.coroutines.coroutineScope
 import kotlinx.coroutines.Dispatchers
 import org.hl7.fhir.r4.model.IdType
 import org.hl7.fhir.r4.model.Resource
@@ -320,8 +323,8 @@ internal class DatabaseImpl(
       val currentResourceEntity = selectEntity(updatedResource.resourceType, currentResourceId)
       val oldResource = iParser.parseResource(currentResourceEntity.serializedResource) as Resource
       val resourceUuid = currentResourceEntity.resourceUuid
-      updateResourceEntity(resourceUuid, updatedResource)
-
+      updateResourceEntity(resourceUuid, updatedResource) 
+      
       if (currentResourceId == updatedResource.logicalId) {
         return@withTransaction
       }
@@ -449,6 +452,11 @@ internal class DatabaseImpl(
     }
   }
 
+  /** Implementation of a parallelized map */
+  suspend fun <A, B> Iterable<A>.pmap(f: suspend (A) -> B): List<B> = coroutineScope {
+    map { async { f(it) } }.awaitAll()
+  }
+
   companion object {
     /**
      * The name for unencrypted database.

engine/src/main/java/com/google/android/fhir/impl/FhirEngineImpl.kt

@@ -74,6 +74,8 @@ internal class FhirEngineImpl(private val database: Database, private val contex
   override suspend fun getLocalChanges(type: ResourceType, id: String) =
     withContext(Dispatchers.IO) { database.getLocalChanges(type, id) }
 
+  override suspend fun getUnsyncedLocalChanges(): List<LocalChange> = database.getAllLocalChanges()
+
   override suspend fun purge(type: ResourceType, id: String, forcePurge: Boolean) =
     withContext(Dispatchers.IO) { database.purge(type, setOf(id), forcePurge) }
 

engine/src/main/java/com/google/android/fhir/sync/FhirSyncWorker.kt

@@ -21,6 +21,7 @@ import androidx.work.CoroutineWorker
 import androidx.work.Data
 import androidx.work.WorkerParameters
 import androidx.work.workDataOf
+import ca.uhn.fhir.context.FhirContext
 import com.google.android.fhir.FhirEngine
 import com.google.android.fhir.FhirEngineProvider
 import com.google.android.fhir.OffsetDateTimeTypeAdapter
@@ -32,11 +33,15 @@ import com.google.android.fhir.sync.upload.request.UploadRequestGeneratorFactory
 import com.google.gson.ExclusionStrategy
 import com.google.gson.FieldAttributes
 import com.google.gson.GsonBuilder
+import java.nio.charset.StandardCharsets
 import java.time.OffsetDateTime
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.cancel
 import kotlinx.coroutines.launch
+import org.apache.commons.io.IOUtils
+import org.hl7.fhir.r4.model.OperationOutcome
+import retrofit2.HttpException
 import timber.log.Timber
 
 /**
@@ -131,6 +136,8 @@ abstract class FhirSyncWorker(appContext: Context, workerParams: WorkerParameter
       }
 
     val result = synchronizer.synchronize()
+    if (result is SyncJobStatus.Failed) onFailedSyncJobResult(result)
+
     val output = buildWorkData(result)
 
     // await/join is needed to collect states completely
@@ -151,6 +158,34 @@ abstract class FhirSyncWorker(appContext: Context, workerParams: WorkerParameter
     }
   }
 
+  open fun onFailedSyncJobResult(failedSyncJobStatus: SyncJobStatus.Failed) {
+    try {
+      val jsonParser = FhirContext.forR4().newJsonParser()
+      val exceptions = (failedSyncJobStatus).exceptions
+
+      exceptions.forEach { resourceSyncException ->
+        val operationOutcome =
+          jsonParser.parseResource(
+            IOUtils.toString(
+              (resourceSyncException.exception as HttpException)
+                .response()
+                ?.errorBody()
+                ?.byteStream(),
+              StandardCharsets.UTF_8,
+            ),
+          ) as OperationOutcome
+
+        operationOutcome.issue.forEach { operationOutcome ->
+          Timber.e(
+            "SERVER ${operationOutcome.severity} - HTTP ${resourceSyncException.exception.code()} | Code - ${operationOutcome.code} | Diagnostics - ${operationOutcome.diagnostics}",
+          )
+        }
+      }
+    } catch (e: Exception) {
+      Timber.e(e)
+    }
+  }
+
   private fun buildWorkData(state: SyncJobStatus): Data {
     return workDataOf(
       // send serialized state and type so that consumer can convert it back

engine/src/main/java/com/google/android/fhir/sync/upload/request/UploadRequestGenerator.kt

@@ -62,6 +62,7 @@ internal object UploadRequestGeneratorFactory {
           mode.httpVerbToUseForCreate,
           mode.httpVerbToUseForUpdate,
           mode.bundleSize,
+          useETagForUpload = false
         )
     }
 }

engine/src/main/java/com/google/android/fhir/testing/Utilities.kt

@@ -203,6 +203,10 @@ internal object TestFhirEngineImpl : FhirEngine {
     )
   }
 
+  override suspend fun getUnsyncedLocalChanges(): List<LocalChange> {
+    TODO("Not yet implemented")
+  }
+
   override suspend fun purge(type: ResourceType, id: String, forcePurge: Boolean) {}
 
   override suspend fun purge(type: ResourceType, ids: Set<String>, forcePurge: Boolean) {}