Fix the tests

google · Sep 13, 2023 · 9c2cef6 · 9c2cef6
1 parent 05b9bf2
commit 9c2cef6
Show file tree

Hide file tree

Showing 5 changed files with 403 additions and 251 deletions.
diff --git a/...main/java/com/google/android/fhir/sync/download/ResourceParamsBasedDownloadWorkManager.kt b/...main/java/com/google/android/fhir/sync/download/ResourceParamsBasedDownloadWorkManager.kt
@@ -102,30 +102,30 @@ class ResourceParamsBasedDownloadWorkManager(
       throw FHIRException(response.issueFirstRep.diagnostics)
     }
 
-    return if (response is Bundle && response.type == Bundle.BundleType.SEARCHSET) {
-      response.link
-        .firstOrNull { component -> component.relation == "next" }
-        ?.url?.let { next -> urlOfTheNextPagesToDownloadForAResource.add(next) }
-
-      response.entry
-        .map { it.resource }
-        .also { resources ->
-          resources
-            .groupBy { it.resourceType }
-            .entries.map { map ->
-              map.value
-                .filter { it.meta.lastUpdated != null }
-                .let {
-                  context.saveLastUpdatedTimestamp(
-                    map.key,
-                    it.maxOfOrNull { it.meta.lastUpdated }?.toTimeZoneString()
-                  )
-                }
-            }
-        }
-    } else {
-      emptyList()
+    if ((response !is Bundle || response.type != Bundle.BundleType.SEARCHSET)) {
+      return emptyList()
     }
+
+    response.link
+      .firstOrNull { component -> component.relation == "next" }
+      ?.url?.let { next -> urlOfTheNextPagesToDownloadForAResource.add(next) }
+
+    return response.entry
+      .map { it.resource }
+      .also { resources ->
+        resources
+          .groupBy { it.resourceType }
+          .entries.map { map ->
+            map.value
+              .filter { it.meta.lastUpdated != null }
+              .let {
+                context.saveLastUpdatedTimestamp(
+                  map.key,
+                  it.maxOfOrNull { it.meta.lastUpdated }?.toTimeZoneString()
+                )
+              }
+          }
+      }
   }
 
   interface TimestampContext {

diff --git a/...e/src/main/java/com/google/android/fhir/sync/upload/request/TransactionBundleGenerator.kt b/...e/src/main/java/com/google/android/fhir/sync/upload/request/TransactionBundleGenerator.kt
@@ -76,7 +76,7 @@ class TransactionBundleGenerator(
       httpVerbToUseForCreate: Bundle.HTTPVerb,
       httpVerbToUseForUpdate: Bundle.HTTPVerb,
       generatedBundleSize: Int,
-      useETagForUpload: Boolean
+      useETagForUpload: Boolean,
     ): TransactionBundleGenerator {
 
       val createFunction =