switching search-bundle from transaction to batch

Author: hhund

codex-process-data-transfer/src/main/java/de/netzwerk_universitaetsmedizin/codex/processes/data_transfer/client/fhir/AbstractFhirClient.java

@@ -115,6 +115,8 @@ public AbstractFhirClient(FhirContext fhirContext, HapiFhirClientFactory clientF
 	public PatientReferenceList getPatientReferencesWithNewData(DateWithPrecision exportFrom, Date exportTo)
 	{
 		Bundle searchBundle = getSearchBundle(exportFrom, exportTo);
+		BundleType expectedResponseType = BundleType.BATCH.equals(searchBundle.getType()) ? BundleType.BATCHRESPONSE
+				: BundleType.TRANSACTIONRESPONSE;
 
 		if (logger.isDebugEnabled())
 			logger.debug("Executing Search-Bundle: {}",
@@ -126,6 +128,29 @@ public PatientReferenceList getPatientReferencesWithNewData(DateWithPrecision ex
 		if (logger.isDebugEnabled())
 			logger.debug("Search-Bundle result: {}", fhirContext.newJsonParser().encodeResourceToString(resultBundle));
 
+		if (!resultBundle.hasType() || !expectedResponseType.equals(resultBundle.getType()) || !resultBundle.hasEntry())
+		{
+			logger.warn("Search-Bundle result not a {} or has no entries", expectedResponseType.toCode());
+			throw new RuntimeException(
+					"Search-Bundle result not a " + expectedResponseType.toCode() + " or has no entries");
+		}
+
+		for (int i = 0; i < resultBundle.getEntry().size(); i++)
+		{
+			BundleEntryComponent entry = resultBundle.getEntry().get(i);
+
+			if (!entry.hasResource() || !(entry.getResource() instanceof Bundle) || !entry.hasResponse()
+					|| !entry.getResponse().hasStatus() || !entry.getResponse().getStatus().startsWith("200"))
+			{
+				logger.warn(
+						"Error in Search-Bundle at index {}: entry has no Bundle resource or response is not 200 OK",
+						i);
+				if (entry.hasResource() && !(entry.getResource() instanceof Bundle))
+					logger.debug("Unexpected entry resource: {}",
+							fhirContext.newJsonParser().encodeResourceToString(entry.getResource()));
+			}
+		}
+
 		Stream<Patient> patients = resultBundle.getEntry().stream()
 				.filter(e -> e.hasResource() && e.getResource() instanceof Bundle).map(e -> (Bundle) e.getResource())
 				.flatMap(this::getPatients);

codex-process-data-transfer/src/main/resources/fhir/Bundle/SearchBundle.xml

@@ -1,5 +1,5 @@
 <Bundle xmlns="http://hl7.org/fhir">
-   <type value="transaction"/>
+   <type value="batch"/>
    <entry>
       <request>
          <method value="GET"/>