bugfix(#1253): configure dlq to raise incidents and fix IncidentAdapt…

…er in connector
it-at-m · Feb 1, 2024 · 541ab0b · 541ab0b
1 parent 6179a4a
commit 541ab0b
Showing 1 changed file with 14 additions and 11 deletions.
diff --git a/...e/src/main/java/de/muenchen/oss/digiwf/email/integration/adapter/in/MessageProcessor.java b/...e/src/main/java/de/muenchen/oss/digiwf/email/integration/adapter/in/MessageProcessor.java
@@ -4,6 +4,9 @@
 import de.muenchen.oss.digiwf.email.integration.infrastructure.MonitoringService;
 import de.muenchen.oss.digiwf.email.integration.model.Mail;
 import de.muenchen.oss.digiwf.message.process.api.ErrorApi;
+import de.muenchen.oss.digiwf.message.process.api.error.BpmnError;
+import de.muenchen.oss.digiwf.message.process.api.error.IncidentError;
+import jakarta.validation.ValidationException;
 import lombok.RequiredArgsConstructor;
 import org.springframework.messaging.Message;
 
@@ -20,23 +23,23 @@ public class MessageProcessor {
 
     public Consumer<Message<Mail>> emailIntegration() {
         return message -> {
-//            try {
+            try {
                 this.mailUseCase.sendMail(
                         message.getHeaders().get(DIGIWF_PROCESS_INSTANCE_ID, String.class),
                         message.getHeaders().get(TYPE, String.class),
                         message.getHeaders().get(DIGIWF_INTEGRATION_NAME, String.class),
                         message.getPayload());
                 this.monitoringService.sendMailSucceeded();
-//            } catch (final BpmnError bpmnError) {
-//                this.monitoringService.sendMailFailed();
-//                this.errorApi.handleBpmnError(message.getHeaders(), bpmnError);
-//            } catch (final ValidationException validationException) {
-//                this.monitoringService.sendMailFailed();
-//                this.errorApi.handleBpmnError(message.getHeaders(), new BpmnError("VALIDATION_ERROR", validationException.getMessage()));
-//            } catch (final IncidentError incidentError) {
-//                this.monitoringService.sendMailFailed();
-//                this.errorApi.handleIncident(message.getHeaders(), incidentError);
-//            }
+            } catch (final BpmnError bpmnError) {
+                this.monitoringService.sendMailFailed();
+                this.errorApi.handleBpmnError(message.getHeaders(), bpmnError);
+            } catch (final ValidationException validationException) {
+                this.monitoringService.sendMailFailed();
+                this.errorApi.handleBpmnError(message.getHeaders(), new BpmnError("VALIDATION_ERROR", validationException.getMessage()));
+            } catch (final IncidentError incidentError) {
+                this.monitoringService.sendMailFailed();
+                this.errorApi.handleIncident(message.getHeaders(), incidentError);
+            }
         };
     }