[26255] update generated bluemedication client, download extended pdf

elexis · Apr 2, 2024 · b553951 · b553951
1 parent 105ad93
commit b553951
Show file tree

Hide file tree

Showing 6 changed files with 34 additions and 2 deletions.
diff --git a/bundles/at.medevit.elexis.bluemedication.core/.classpath b/bundles/at.medevit.elexis.bluemedication.core/.classpath
@@ -8,7 +8,7 @@
 	<classpathentry exported="true" kind="lib" path="lib/gson-fire-1.8.3.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/okhttp-4.10.0.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/openapi-java-client-1.7.0.jar" sourcepath="lib/openapi-java-client-1.7.0-sources.jar"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>

diff --git a/bundles/at.medevit.elexis.bluemedication.core/lib/openapi-java-client-1.7.0-sources.jar b/bundles/at.medevit.elexis.bluemedication.core/lib/openapi-java-client-1.7.0-sources.jar
diff --git a/bundles/at.medevit.elexis.bluemedication.core/lib/openapi-java-client-1.7.0.jar b/bundles/at.medevit.elexis.bluemedication.core/lib/openapi-java-client-1.7.0.jar
diff --git a/....bluemedication.core/src/at/medevit/elexis/bluemedication/core/BlueMedicationService.java b/....bluemedication.core/src/at/medevit/elexis/bluemedication/core/BlueMedicationService.java
@@ -70,6 +70,15 @@ public default Result<UploadResult> uploadDocument(IPatient patient, File docume
 	 */
 	public Result<String> downloadPdf(UploadResult uploadResult);
 
+	/**
+	 * Download the results of upload and user interaction on the browser. The
+	 * result is the original pdf extended with the extracted emediplan.
+	 * 
+	 * @param uploadResult
+	 * @return
+	 */
+	public Result<String> downloadExtendedPdf(UploadResult uploadResult);
+
 	/**
 	 * Add a pending {@link UploadResult} to the map of pending results. One object
 	 * can only have one {@link UploadResult}.
@@ -104,4 +113,5 @@ public default Result<UploadResult> uploadDocument(IPatient patient, File docume
 	 * @param onSuccess
 	 */
 	public void startPollForResult(Object object, UploadResult uploadResult, Consumer<Object> onSuccess);
+
 }
diff --git a/...on.core/src/at/medevit/elexis/bluemedication/core/internal/BlueMedicationServiceImpl.java b/...on.core/src/at/medevit/elexis/bluemedication/core/internal/BlueMedicationServiceImpl.java
@@ -428,6 +428,28 @@ public Result<String> downloadPdf(UploadResult uploadResult) {
 		}
 	}
 
+	@Override
+	public Result<String> downloadExtendedPdf(UploadResult uploadResult) {
+		initProxyOrOauth();
+		try {
+			ExtractionAndConsolidationApi apiInstance = new ExtractionAndConsolidationApi();
+			configureApiClient(apiInstance.getApiClient());
+			ApiResponse<File> response = apiInstance
+					.downloadIdExtractionExtendedpdfGetWithHttpInfo(uploadResult.getId(), true);
+			if (response.getStatusCode() >= 300) {
+				return Result.ERROR("Response status code was [" + response.getStatusCode() + "]");
+			}
+			if (response.getData() == null) {
+				return Result.ERROR("Response has no data");
+			}
+			return Result.OK(response.getData().getAbsolutePath());
+		} catch (ApiException e) {
+			hinAuthHandleException(e);
+			logger.error("Error downloading Document Pdf", e);
+			return Result.ERROR(e.getMessage());
+		}
+	}
+
 	@Override
 	public void addPendingUploadResult(Object object, UploadResult uploadResult) {
 		pendingUploadResults.put(object, uploadResult);

diff --git a/...ion.ui/src/at/medevit/elexis/bluemedication/ui/handler/BlueMedicationDownloadHandler.java b/...ion.ui/src/at/medevit/elexis/bluemedication/ui/handler/BlueMedicationDownloadHandler.java
@@ -64,7 +64,7 @@ public Object execute(ExecutionEvent event) throws ExecutionException {
 	}
 
 	private void downloadAndImportPdf(IDocumentHandle docHandle, UploadResult uploadResult) {
-		Result<String> pdf = BlueMedicationServiceHolder.getService().downloadPdf(uploadResult);
+		Result<String> pdf = BlueMedicationServiceHolder.getService().downloadExtendedPdf(uploadResult);
 		if (pdf.isOK()) {
 			DocumentStore documentsService = DocumentStoreServiceHolder.getService();
 			// debug code, save to new document