additional logging

num-codex · Jun 20, 2022 · 103b2c0 · 103b2c0
1 parent 3d10fac
commit 103b2c0
Show file tree

Hide file tree

Showing 12 changed files with 111 additions and 20 deletions.
diff --git a/...a/de/netzwerk_universitaetsmedizin/codex/processes/data_transfer/logging/ErrorLogger.java b/...a/de/netzwerk_universitaetsmedizin/codex/processes/data_transfer/logging/ErrorLogger.java
@@ -7,11 +7,35 @@
 public class ErrorLogger
 {
 	private static final Logger validationLogger = LoggerFactory.getLogger("validation-error-logger");
+	private static final Logger errorLogger = LoggerFactory.getLogger("error-logger");
 
 	public void logValidationFailed(IdType taskId)
 	{
-		validationLogger.debug(
-				"Validation of FHIR resources faild during execution of data-send process started by Task {}",
-				taskId.getValue());
+		validationLogger.debug("Validation of FHIR resources failed, started by Task {}", taskId.getValue());
+	}
+
+	public void logValidationFailedLocal(IdType taskId)
+	{
+		validationLogger.debug("Local validation of FHIR resources failed, started by Task {}", taskId.getValue());
+	}
+
+	public void logValidationFailedRemote(IdType taskId)
+	{
+		validationLogger.debug("Remote validation of FHIR resources failed, started by Task {}", taskId.getValue());
+	}
+
+	public void logDataSendFailed(IdType taskId)
+	{
+		errorLogger.debug("Send process failed, started by Task {}", taskId.getValue());
+	}
+
+	public void logDataTranslateFailed(IdType taskId)
+	{
+		errorLogger.debug("Translate process failed, started by Task {}", taskId.getValue());
+	}
+
+	public void logDataReceiveFailed(IdType taskId)
+	{
+		errorLogger.debug("Receive process failed, started by Task {}", taskId.getValue());
 	}
 }
diff --git a/...netzwerk_universitaetsmedizin/codex/processes/data_transfer/service/receive/LogError.java b/...netzwerk_universitaetsmedizin/codex/processes/data_transfer/service/receive/LogError.java
@@ -14,26 +14,31 @@
 import org.highmed.dsf.fhir.authorization.read.ReadAccessHelper;
 import org.highmed.dsf.fhir.client.FhirWebserviceClientProvider;
 import org.highmed.dsf.fhir.task.TaskHelper;
+import org.hl7.fhir.r4.model.ResourceType;
 import org.hl7.fhir.r4.model.Task;
 import org.hl7.fhir.r4.model.Task.TaskOutputComponent;
 import org.hl7.fhir.r4.model.Task.TaskStatus;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import de.netzwerk_universitaetsmedizin.codex.processes.data_transfer.error.ErrorOutputParameterGenerator;
+import de.netzwerk_universitaetsmedizin.codex.processes.data_transfer.logging.ErrorLogger;
 
 public class LogError extends AbstractServiceDelegate
 {
 	private static final Logger logger = LoggerFactory.getLogger(LogError.class);
 
 	private final ErrorOutputParameterGenerator errorOutputParameterGenerator;
+	private final ErrorLogger errorLogger;
 
 	public LogError(FhirWebserviceClientProvider clientProvider, TaskHelper taskHelper,
-			ReadAccessHelper readAccessHelper, ErrorOutputParameterGenerator errorOutputParameterGenerator)
+			ReadAccessHelper readAccessHelper, ErrorOutputParameterGenerator errorOutputParameterGenerator,
+			ErrorLogger errorLogger)
 	{
 		super(clientProvider, taskHelper, readAccessHelper);
 
 		this.errorOutputParameterGenerator = errorOutputParameterGenerator;
+		this.errorLogger = errorLogger;
 	}
 
 	@Override
@@ -42,6 +47,7 @@ public void afterPropertiesSet() throws Exception
 		super.afterPropertiesSet();
 
 		Objects.requireNonNull(errorOutputParameterGenerator, "errorOutputParameterGenerator");
+		Objects.requireNonNull(errorLogger, "errorLogger");
 	}
 
 	@Override
@@ -63,6 +69,11 @@ protected void doExecute(DelegateExecution execution) throws BpmnError, Exceptio
 					errorCode, errorMessage);
 
 			task.addOutput(output);
+
+			logger.warn("Error while transfering data to CRR: {} - {}", errorCode, errorMessage);
+
+			errorLogger.logDataReceiveFailed(getLeadingTaskFromExecutionVariables().getIdElement()
+					.withServerBase(getFhirWebserviceClientProvider().getLocalBaseUrl(), ResourceType.Task.name()));
 		}
 	}
 }
diff --git a/...niversitaetsmedizin/codex/processes/data_transfer/service/receive/LogValidationError.java b/...niversitaetsmedizin/codex/processes/data_transfer/service/receive/LogValidationError.java
@@ -13,25 +13,30 @@
 import org.hl7.fhir.r4.model.Bundle;
 import org.hl7.fhir.r4.model.OperationOutcome;
 import org.hl7.fhir.r4.model.OperationOutcome.IssueSeverity;
+import org.hl7.fhir.r4.model.ResourceType;
 import org.hl7.fhir.r4.model.Task;
 import org.hl7.fhir.r4.model.Task.TaskStatus;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import de.netzwerk_universitaetsmedizin.codex.processes.data_transfer.error.ErrorOutputParameterGenerator;
+import de.netzwerk_universitaetsmedizin.codex.processes.data_transfer.logging.ErrorLogger;
 
 public class LogValidationError extends AbstractServiceDelegate
 {
 	private static final Logger logger = LoggerFactory.getLogger(LogValidationError.class);
 
 	private final ErrorOutputParameterGenerator errorOutputParameterGenerator;
+	private final ErrorLogger errorLogger;
 
 	public LogValidationError(FhirWebserviceClientProvider clientProvider, TaskHelper taskHelper,
-			ReadAccessHelper readAccessHelper, ErrorOutputParameterGenerator errorOutputParameterGenerator)
+			ReadAccessHelper readAccessHelper, ErrorOutputParameterGenerator errorOutputParameterGenerator,
+			ErrorLogger errorLogger)
 	{
 		super(clientProvider, taskHelper, readAccessHelper);
 
 		this.errorOutputParameterGenerator = errorOutputParameterGenerator;
+		this.errorLogger = errorLogger;
 	}
 
 	@Override
@@ -40,11 +45,16 @@ public void afterPropertiesSet() throws Exception
 		super.afterPropertiesSet();
 
 		Objects.requireNonNull(errorOutputParameterGenerator, "errorOutputParameterGenerator");
+		Objects.requireNonNull(errorLogger, "errorLogger");
 	}
 
 	@Override
 	protected void doExecute(DelegateExecution execution) throws BpmnError, Exception
 	{
+		logger.info("Validation error while adding resources to CRR FHIR repository");
+		errorLogger.logValidationFailed(getLeadingTaskFromExecutionVariables().getIdElement()
+				.withServerBase(getFhirWebserviceClientProvider().getLocalBaseUrl(), ResourceType.Task.name()));
+
 		logger.debug("Setting Task.status failed, adding validation errors");
 
 		Task task = getLeadingTaskFromExecutionVariables();

diff --git a/...de/netzwerk_universitaetsmedizin/codex/processes/data_transfer/service/send/LogError.java b/...de/netzwerk_universitaetsmedizin/codex/processes/data_transfer/service/send/LogError.java
@@ -14,26 +14,31 @@
 import org.highmed.dsf.fhir.authorization.read.ReadAccessHelper;
 import org.highmed.dsf.fhir.client.FhirWebserviceClientProvider;
 import org.highmed.dsf.fhir.task.TaskHelper;
+import org.hl7.fhir.r4.model.ResourceType;
 import org.hl7.fhir.r4.model.Task;
 import org.hl7.fhir.r4.model.Task.TaskOutputComponent;
 import org.hl7.fhir.r4.model.Task.TaskStatus;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import de.netzwerk_universitaetsmedizin.codex.processes.data_transfer.error.ErrorOutputParameterGenerator;
+import de.netzwerk_universitaetsmedizin.codex.processes.data_transfer.logging.ErrorLogger;
 
 public class LogError extends AbstractServiceDelegate
 {
 	private static final Logger logger = LoggerFactory.getLogger(LogError.class);
 
 	private final ErrorOutputParameterGenerator errorOutputParameterGenerator;
+	private final ErrorLogger errorLogger;
 
 	public LogError(FhirWebserviceClientProvider clientProvider, TaskHelper taskHelper,
-			ReadAccessHelper readAccessHelper, ErrorOutputParameterGenerator errorOutputParameterGenerator)
+			ReadAccessHelper readAccessHelper, ErrorOutputParameterGenerator errorOutputParameterGenerator,
+			ErrorLogger errorLogger)
 	{
 		super(clientProvider, taskHelper, readAccessHelper);
 
 		this.errorOutputParameterGenerator = errorOutputParameterGenerator;
+		this.errorLogger = errorLogger;
 	}
 
 	@Override
@@ -42,6 +47,7 @@ public void afterPropertiesSet() throws Exception
 		super.afterPropertiesSet();
 
 		Objects.requireNonNull(errorOutputParameterGenerator, "errorOutputParameterGenerator");
+		Objects.requireNonNull(errorLogger, "errorLogger");
 	}
 
 	@Override
@@ -63,6 +69,11 @@ protected void doExecute(DelegateExecution execution) throws BpmnError, Exceptio
 					errorCode, errorMessage);
 
 			task.addOutput(output);
+
+			logger.warn("Error while transfering data to CRR: {} - {}", errorCode, errorMessage);
+
+			errorLogger.logDataReceiveFailed(getLeadingTaskFromExecutionVariables().getIdElement()
+					.withServerBase(getFhirWebserviceClientProvider().getLocalBaseUrl(), ResourceType.Task.name()));
 		}
 	}
 }
diff --git a/.../netzwerk_universitaetsmedizin/codex/processes/data_transfer/service/send/LogSuccess.java b/.../netzwerk_universitaetsmedizin/codex/processes/data_transfer/service/send/LogSuccess.java
@@ -22,7 +22,6 @@ public LogSuccess(FhirWebserviceClientProvider clientProvider, TaskHelper taskHe
 	@Override
 	protected void doExecute(DelegateExecution execution) throws BpmnError, Exception
 	{
-		// TODO log success
-		logger.debug("TODO log success");
+		logger.info("All resources successfully added to CRR FHIR repository");
 	}
 }
diff --git a/...k_universitaetsmedizin/codex/processes/data_transfer/service/send/LogValidationError.java b/...k_universitaetsmedizin/codex/processes/data_transfer/service/send/LogValidationError.java
@@ -18,26 +18,31 @@
 import org.hl7.fhir.r4.model.OperationOutcome;
 import org.hl7.fhir.r4.model.OperationOutcome.IssueSeverity;
 import org.hl7.fhir.r4.model.OperationOutcome.OperationOutcomeIssueComponent;
+import org.hl7.fhir.r4.model.ResourceType;
 import org.hl7.fhir.r4.model.StringType;
 import org.hl7.fhir.r4.model.Task;
 import org.hl7.fhir.r4.model.Task.TaskStatus;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import de.netzwerk_universitaetsmedizin.codex.processes.data_transfer.error.ErrorOutputParameterGenerator;
+import de.netzwerk_universitaetsmedizin.codex.processes.data_transfer.logging.ErrorLogger;
 
 public class LogValidationError extends AbstractServiceDelegate
 {
 	private static final Logger logger = LoggerFactory.getLogger(LogValidationError.class);
 
 	private final ErrorOutputParameterGenerator errorOutputParameterGenerator;
+	private final ErrorLogger errorLogger;
 
 	public LogValidationError(FhirWebserviceClientProvider clientProvider, TaskHelper taskHelper,
-			ReadAccessHelper readAccessHelper, ErrorOutputParameterGenerator errorOutputParameterGenerator)
+			ReadAccessHelper readAccessHelper, ErrorOutputParameterGenerator errorOutputParameterGenerator,
+			ErrorLogger errorLogger)
 	{
 		super(clientProvider, taskHelper, readAccessHelper);
 
 		this.errorOutputParameterGenerator = errorOutputParameterGenerator;
+		this.errorLogger = errorLogger;
 	}
 
 	@Override
@@ -46,17 +51,22 @@ public void afterPropertiesSet() throws Exception
 		super.afterPropertiesSet();
 
 		Objects.requireNonNull(errorOutputParameterGenerator, "errorOutputParameterGenerator");
+		Objects.requireNonNull(errorLogger, "errorLogger");
 	}
 
 	@Override
 	protected void doExecute(DelegateExecution execution) throws BpmnError, Exception
 	{
+		logger.info("Validation error while adding resources to CRR FHIR repository");
+
 		Bundle bundle = (Bundle) execution.getVariable(BPMN_EXECUTION_VARIABLE_BUNDLE);
 
 		@SuppressWarnings("unchecked")
 		Map<String, String> sourceIdsByBundleUuid = (Map<String, String>) execution
 				.getVariable(BPMN_EXECUTION_VARIABLE_SOURCE_IDS_BY_BUNDLE_UUID);
 
+		errorLogger.logValidationFailedRemote(getLeadingTaskFromExecutionVariables().getIdElement()
+				.withServerBase(getFhirWebserviceClientProvider().getLocalBaseUrl(), ResourceType.Task.name()));
 		logValidationDetails(bundle, sourceIdsByBundleUuid);
 		addErrorsToTask(bundle, sourceIdsByBundleUuid);
 	}

diff --git a/...etzwerk_universitaetsmedizin/codex/processes/data_transfer/service/send/ValidateData.java b/...etzwerk_universitaetsmedizin/codex/processes/data_transfer/service/send/ValidateData.java
@@ -23,6 +23,7 @@
 import org.hl7.fhir.r4.model.OperationOutcome;
 import org.hl7.fhir.r4.model.OperationOutcome.IssueSeverity;
 import org.hl7.fhir.r4.model.OperationOutcome.OperationOutcomeIssueComponent;
+import org.hl7.fhir.r4.model.ResourceType;
 import org.hl7.fhir.r4.model.StringType;
 import org.hl7.fhir.r4.model.Task;
 import org.slf4j.Logger;
@@ -112,9 +113,9 @@ protected void doExecute(DelegateExecution execution) throws BpmnError, Exceptio
 								resourcesWithErrorCount, resourcesWithErrorCount != 1 ? "s" : "");
 
 						addErrorsToTask(bundle);
-						errorLogger.logValidationFailed(getLeadingTaskFromExecutionVariables().getIdElement()
-								.withServerBase(getFhirWebserviceClientProvider().getLocalBaseUrl(),
-										getLeadingTaskFromExecutionVariables().getIdElement().getResourceType()));
+						errorLogger.logValidationFailedLocal(
+								getLeadingTaskFromExecutionVariables().getIdElement().withServerBase(
+										getFhirWebserviceClientProvider().getLocalBaseUrl(), ResourceType.Task.name()));
 
 						throw new BpmnError(CODESYSTEM_NUM_CODEX_DATA_TRANSFER_ERROR_VALUE_VALIDATION_FAILED,
 								"Validation of transfer bundle failed, " + resourcesWithErrorCount + " resource"

diff --git a/...tzwerk_universitaetsmedizin/codex/processes/data_transfer/service/translate/LogError.java b/...tzwerk_universitaetsmedizin/codex/processes/data_transfer/service/translate/LogError.java
@@ -14,26 +14,31 @@
 import org.highmed.dsf.fhir.authorization.read.ReadAccessHelper;
 import org.highmed.dsf.fhir.client.FhirWebserviceClientProvider;
 import org.highmed.dsf.fhir.task.TaskHelper;
+import org.hl7.fhir.r4.model.ResourceType;
 import org.hl7.fhir.r4.model.Task;
 import org.hl7.fhir.r4.model.Task.TaskOutputComponent;
 import org.hl7.fhir.r4.model.Task.TaskStatus;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import de.netzwerk_universitaetsmedizin.codex.processes.data_transfer.error.ErrorOutputParameterGenerator;
+import de.netzwerk_universitaetsmedizin.codex.processes.data_transfer.logging.ErrorLogger;
 
 public class LogError extends AbstractServiceDelegate
 {
 	private static final Logger logger = LoggerFactory.getLogger(LogError.class);
 
 	private final ErrorOutputParameterGenerator errorOutputParameterGenerator;
+	private final ErrorLogger errorLogger;
 
 	public LogError(FhirWebserviceClientProvider clientProvider, TaskHelper taskHelper,
-			ReadAccessHelper readAccessHelper, ErrorOutputParameterGenerator errorOutputParameterGenerator)
+			ReadAccessHelper readAccessHelper, ErrorOutputParameterGenerator errorOutputParameterGenerator,
+			ErrorLogger errorLogger)
 	{
 		super(clientProvider, taskHelper, readAccessHelper);
 
 		this.errorOutputParameterGenerator = errorOutputParameterGenerator;
+		this.errorLogger = errorLogger;
 	}
 
 	@Override
@@ -42,6 +47,7 @@ public void afterPropertiesSet() throws Exception
 		super.afterPropertiesSet();
 
 		Objects.requireNonNull(errorOutputParameterGenerator, "errorOutputParameterGenerator");
+		Objects.requireNonNull(errorLogger, "errorLogger");
 	}
 
 	@Override
@@ -63,6 +69,11 @@ protected void doExecute(DelegateExecution execution) throws BpmnError, Exceptio
 					errorCode, errorMessage);
 
 			task.addOutput(output);
+
+			logger.warn("Error while transfering data to CRR: {} - {}", errorCode, errorMessage);
+
+			errorLogger.logDataReceiveFailed(getLeadingTaskFromExecutionVariables().getIdElement()
+					.withServerBase(getFhirWebserviceClientProvider().getLocalBaseUrl(), ResourceType.Task.name()));
 		}
 	}
 }
diff --git a/...versitaetsmedizin/codex/processes/data_transfer/service/translate/LogValidationError.java b/...versitaetsmedizin/codex/processes/data_transfer/service/translate/LogValidationError.java
@@ -11,25 +11,30 @@
 import org.highmed.dsf.fhir.authorization.read.ReadAccessHelper;
 import org.highmed.dsf.fhir.client.FhirWebserviceClientProvider;
 import org.highmed.dsf.fhir.task.TaskHelper;
+import org.hl7.fhir.r4.model.ResourceType;
 import org.hl7.fhir.r4.model.Task;
 import org.hl7.fhir.r4.model.Task.TaskOutputComponent;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import de.netzwerk_universitaetsmedizin.codex.processes.data_transfer.error.ErrorOutputParameterGenerator;
+import de.netzwerk_universitaetsmedizin.codex.processes.data_transfer.logging.ErrorLogger;
 
 public class LogValidationError extends AbstractServiceDelegate
 {
 	private static final Logger logger = LoggerFactory.getLogger(LogValidationError.class);
 
 	private final ErrorOutputParameterGenerator errorOutputParameterGenerator;
+	private final ErrorLogger errorLogger;
 
 	public LogValidationError(FhirWebserviceClientProvider clientProvider, TaskHelper taskHelper,
-			ReadAccessHelper readAccessHelper, ErrorOutputParameterGenerator errorOutputParameterGenerator)
+			ReadAccessHelper readAccessHelper, ErrorOutputParameterGenerator errorOutputParameterGenerator,
+			ErrorLogger errorLogger)
 	{
 		super(clientProvider, taskHelper, readAccessHelper);
 
 		this.errorOutputParameterGenerator = errorOutputParameterGenerator;
+		this.errorLogger = errorLogger;
 	}
 
 	@Override
@@ -38,12 +43,15 @@ public void afterPropertiesSet() throws Exception
 		super.afterPropertiesSet();
 
 		Objects.requireNonNull(errorOutputParameterGenerator, "errorOutputParameterGenerator");
+		Objects.requireNonNull(errorLogger, "errorLogger");
 	}
 
 	@Override
 	protected void doExecute(DelegateExecution execution) throws BpmnError, Exception
 	{
 		logger.info("Validation error while adding resources to CRR FHIR repository");
+		errorLogger.logValidationFailedRemote(getLeadingTaskFromExecutionVariables().getIdElement()
+				.withServerBase(getFhirWebserviceClientProvider().getLocalBaseUrl(), ResourceType.Task.name()));
 
 		Task task = getLeadingTaskFromExecutionVariables();
 		TaskOutputComponent output = errorOutputParameterGenerator.createError(

diff --git a/...zwerk_universitaetsmedizin/codex/processes/data_transfer/spring/config/ReceiveConfig.java b/...zwerk_universitaetsmedizin/codex/processes/data_transfer/spring/config/ReceiveConfig.java
@@ -66,7 +66,8 @@ public LogSuccess logSuccess()
 	public LogValidationError logValidationError()
 	{
 		return new LogValidationError(transferDataConfig.fhirClientProvider(), transferDataConfig.taskHelper(),
-				transferDataConfig.readAccessHelper(), transferDataConfig.errorOutputParameterGenerator());
+				transferDataConfig.readAccessHelper(), transferDataConfig.errorOutputParameterGenerator(),
+				transferDataConfig.errorLogger());
 	}
 
 	@Bean
@@ -112,6 +113,7 @@ public ContinueTranslateProcessWithError continueTranslateProcessWithError()
 	public LogError logError()
 	{
 		return new LogError(transferDataConfig.fhirClientProvider(), transferDataConfig.taskHelper(),
-				transferDataConfig.readAccessHelper(), transferDataConfig.errorOutputParameterGenerator());
+				transferDataConfig.readAccessHelper(), transferDataConfig.errorOutputParameterGenerator(),
+				transferDataConfig.errorLogger());
 	}
 }