Skip to content
This repository was archived by the owner on Oct 6, 2025. It is now read-only.

Commit 0e9b00d

Browse files
hhundhhund
committed
Merge remote-tracking branch 'origin/issues/96_dsf_upgrade' into develop
2 parents a5a13dc + 818ba36 commit 0e9b00d

34 files changed

Lines changed: 132 additions & 80 deletions

‎.gitignore‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ codex-processes-ap1-test-data-generator/rsa/*.pem
2828
###
2929
codex-processes-ap1-docker-test-setup/**/bpe/log/*.log
3030
codex-processes-ap1-docker-test-setup/**/bpe/log/*.log.gz
31-
codex-processes-ap1-docker-test-setup/**/bpe/last_event/time.file
3231
codex-processes-ap1-docker-test-setup/**/bpe/plugin/*.jar
3332
codex-processes-ap1-docker-test-setup/**/bpe/process/*.jar
3433

‎codex-process-data-transfer/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>de.netzwerk-universitaetsmedizin.codex</groupId>
88
<artifactId>codex-processes-ap1</artifactId>
9-
<version>0.6.0-SNAPSHOT</version>
9+
<version>0.7.0-SNAPSHOT</version>
1010
</parent>
1111

1212
<properties>

‎codex-process-data-transfer/src/main/java/de/netzwerk_universitaetsmedizin/codex/processes/data_transfer/DataTransferProcessPluginDefinition.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@ public class DataTransferProcessPluginDefinition implements ProcessPluginDefinit
3636
{
3737
private static final Logger logger = LoggerFactory.getLogger(DataTransferProcessPluginDefinition.class);
3838

39-
public static final String VERSION = "0.6.0";
40-
public static final LocalDate DATE = LocalDate.of(2022, 7, 12);
39+
public static final String VERSION = "0.7.0";
40+
public static final LocalDate DATE = LocalDate.of(2022, 10, 13);
4141

4242
@Override
4343
public String getName()

‎codex-process-data-transfer/src/main/java/de/netzwerk_universitaetsmedizin/codex/processes/data_transfer/logging/ErrorLogger.java‎

Lines changed: 56 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,90 @@
11
package de.netzwerk_universitaetsmedizin.codex.processes.data_transfer.logging;
22

3+
import java.util.Objects;
4+
5+
import org.highmed.dsf.bpe.service.MailService;
36
import org.hl7.fhir.r4.model.IdType;
47
import org.slf4j.Logger;
58
import org.slf4j.LoggerFactory;
9+
import org.springframework.beans.factory.InitializingBean;
610

7-
public class ErrorLogger
11+
public class ErrorLogger implements InitializingBean
812
{
913
private static final Logger validationLogger = LoggerFactory.getLogger("validation-error-logger");
1014
private static final Logger errorLogger = LoggerFactory.getLogger("error-logger");
1115

16+
private final MailService mailService;
17+
18+
private final boolean sendValidationFailedMail;
19+
private final boolean sendProcessFailedMail;
20+
21+
public ErrorLogger(MailService mailService, boolean sendValidationFailedMail, boolean sendProcessFailedMail)
22+
{
23+
this.mailService = mailService;
24+
25+
this.sendValidationFailedMail = sendValidationFailedMail;
26+
this.sendProcessFailedMail = sendProcessFailedMail;
27+
}
28+
29+
@Override
30+
public void afterPropertiesSet() throws Exception
31+
{
32+
Objects.requireNonNull(mailService, "mailService");
33+
}
34+
1235
public void logValidationFailed(IdType taskId)
1336
{
14-
validationLogger.debug("Validation of FHIR resources failed, started by Task {}", taskId.getValue());
37+
validationLogger.debug("Validation of FHIR resources failed in process started by {}",
38+
taskId.toVersionless().getValue());
39+
40+
if (sendValidationFailedMail)
41+
mailService.send("Validation Error",
42+
"Validation of FHIR resources failed in process started by " + taskId.toVersionless().getValue());
1543
}
1644

1745
public void logValidationFailedLocal(IdType taskId)
1846
{
19-
validationLogger.debug("Local validation of FHIR resources failed, started by Task {}", taskId.getValue());
47+
validationLogger.debug("Local validation of FHIR resources failed in process started by {}",
48+
taskId.toVersionless().getValue());
49+
50+
if (sendValidationFailedMail)
51+
mailService.send("Validation Error", "Local validation of FHIR resources failed in process started by "
52+
+ taskId.toVersionless().getValue());
2053
}
2154

2255
public void logValidationFailedRemote(IdType taskId)
2356
{
24-
validationLogger.debug("Remote validation of FHIR resources failed, started by Task {}", taskId.getValue());
57+
validationLogger.debug("Remote validation of FHIR resources failed in process started by {}",
58+
taskId.toVersionless().getValue());
59+
60+
if (sendValidationFailedMail)
61+
mailService.send("Validation Error", "Remote validation of FHIR resources failed in process started by "
62+
+ taskId.toVersionless().getValue());
2563
}
2664

2765
public void logDataSendFailed(IdType taskId)
2866
{
29-
errorLogger.debug("Send process failed, started by Task {}", taskId.getValue());
67+
errorLogger.debug("Send process failed started by {}", taskId.toVersionless().getValue());
68+
69+
if (sendProcessFailedMail)
70+
mailService.send("Proccess Failed", "Send process failed started by " + taskId.toVersionless().getValue());
3071
}
3172

3273
public void logDataTranslateFailed(IdType taskId)
3374
{
34-
errorLogger.debug("Translate process failed, started by Task {}", taskId.getValue());
75+
errorLogger.debug("Translate process failed started by {}", taskId.toVersionless().getValue());
76+
77+
if (sendProcessFailedMail)
78+
mailService.send("Proccess Failed",
79+
"Translate process failed started by " + taskId.toVersionless().getValue());
3580
}
3681

3782
public void logDataReceiveFailed(IdType taskId)
3883
{
39-
errorLogger.debug("Receive process failed, started by Task {}", taskId.getValue());
84+
errorLogger.debug("Receive process failed started by {}", taskId.toVersionless().getValue());
85+
86+
if (sendProcessFailedMail)
87+
mailService.send("Proccess Failed",
88+
"Receive process failed started by " + taskId.toVersionless().getValue());
4089
}
4190
}

‎codex-process-data-transfer/src/main/java/de/netzwerk_universitaetsmedizin/codex/processes/data_transfer/message/ContinueSendProcess.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ public ContinueSendProcess(FhirWebserviceClientProvider clientProvider, TaskHelp
2929
@Override
3030
protected Target getTarget()
3131
{
32-
return (Target) execution.getVariable(BPMN_EXECUTION_VARIABLE_RETURN_TARGET);
32+
return (Target) getExecution().getVariable(BPMN_EXECUTION_VARIABLE_RETURN_TARGET);
3333
}
3434

3535
@Override

‎codex-process-data-transfer/src/main/java/de/netzwerk_universitaetsmedizin/codex/processes/data_transfer/message/ContinueSendProcessWithError.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ public void afterPropertiesSet() throws Exception
4545
@Override
4646
protected Target getTarget()
4747
{
48-
return (Target) execution.getVariable(BPMN_EXECUTION_VARIABLE_RETURN_TARGET);
48+
return (Target) getExecution().getVariable(BPMN_EXECUTION_VARIABLE_RETURN_TARGET);
4949
}
5050

5151
@Override

‎codex-process-data-transfer/src/main/java/de/netzwerk_universitaetsmedizin/codex/processes/data_transfer/message/ContinueSendProcessWithValidationError.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ public ContinueSendProcessWithValidationError(FhirWebserviceClientProvider clien
3131
@Override
3232
protected Target getTarget()
3333
{
34-
return (Target) execution.getVariable(BPMN_EXECUTION_VARIABLE_RETURN_TARGET);
34+
return (Target) getExecution().getVariable(BPMN_EXECUTION_VARIABLE_RETURN_TARGET);
3535
}
3636

3737
@Override

‎codex-process-data-transfer/src/main/java/de/netzwerk_universitaetsmedizin/codex/processes/data_transfer/message/ContinueTranslateProcess.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ public ContinueTranslateProcess(FhirWebserviceClientProvider clientProvider, Tas
2929
@Override
3030
protected Target getTarget()
3131
{
32-
return (Target) execution.getVariable(BPMN_EXECUTION_VARIABLE_RETURN_TARGET);
32+
return (Target) getExecution().getVariable(BPMN_EXECUTION_VARIABLE_RETURN_TARGET);
3333
}
3434

3535
@Override

‎codex-process-data-transfer/src/main/java/de/netzwerk_universitaetsmedizin/codex/processes/data_transfer/message/ContinueTranslateProcessWithError.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ public void afterPropertiesSet() throws Exception
4545
@Override
4646
protected Target getTarget()
4747
{
48-
return (Target) execution.getVariable(BPMN_EXECUTION_VARIABLE_RETURN_TARGET);
48+
return (Target) getExecution().getVariable(BPMN_EXECUTION_VARIABLE_RETURN_TARGET);
4949
}
5050

5151
@Override

‎codex-process-data-transfer/src/main/java/de/netzwerk_universitaetsmedizin/codex/processes/data_transfer/message/ContinueTranslateProcessWithValidationError.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ public ContinueTranslateProcessWithValidationError(FhirWebserviceClientProvider
3232
@Override
3333
protected Target getTarget()
3434
{
35-
return (Target) execution.getVariable(BPMN_EXECUTION_VARIABLE_RETURN_TARGET);
35+
return (Target) getExecution().getVariable(BPMN_EXECUTION_VARIABLE_RETURN_TARGET);
3636
}
3737

3838
@Override

0 commit comments

Comments
 (0)