Bug/fix html mail (#146)

Set mail to html and include only articles of type web and note

Author: rowe42

ticketing-eventing/README.md

@@ -12,3 +12,35 @@ flowchart LR
 ## Components
 
 - [eventing-service]: Takes Zammad webhook event via REST and forwards it to Apache Kafka
+
+## Local development
+
+For local testing:
+
+- Run DbsTicketingEventingService
+- Run DbsTicketingEventingMailHandlerService
+
+Open **Event-Service** via Swagger (http://localhost:8080/swagger-ui/index.html):
+- User: zammad
+- Password: password
+- Method: POST `/api/event`
+- X-Zammad-Trigger: `Trigger Name`
+- X-Zammad-Delivery: `myID`
+- Request Body:
+```json
+{
+    "ticket": "3702",
+    "status": "closed",
+    "status_id": "1",
+    "anliegenart": "technischer Bürgersupport",
+    "lhmExtId": "33caabe6-317c-4c2d-8bf7-6c36230599db"
+}
+```
+
+Open **Kafka** (http://localhost:8089/):\
+- Inspect: `Topics --> dbs-ticketing-event --> Messages`
+- Should see a new corresponding event 
+
+
+Open **Mailpit** (http://localhost:8025/):
+- Should see a mail with the public articles of the ticket

ticketing-eventing/eventing-service/src/main/resources/application-local.yml

@@ -38,4 +38,4 @@ dbs:
   eventing:
     trigger-mapping:
       - trigger-name: "Trigger Name"
-        action: "ticket_create"
+        action: "state_changed"

ticketing-eventing/mail-handler-service/src/main/java/de/muenchen/oss/dbs/ticketing/eventing/mailhandler/adapter/out/mail/MailAdapter.java

@@ -1,9 +1,11 @@
 package de.muenchen.oss.dbs.ticketing.eventing.mailhandler.adapter.out.mail;
 
 import de.muenchen.oss.dbs.ticketing.eventing.mailhandler.application.port.out.SendMailOutPort;
+import jakarta.mail.MessagingException;
+import jakarta.mail.internet.MimeMessage;
 import lombok.RequiredArgsConstructor;
-import org.springframework.mail.SimpleMailMessage;
 import org.springframework.mail.javamail.JavaMailSender;
+import org.springframework.mail.javamail.MimeMessageHelper;
 import org.springframework.stereotype.Service;
 
 @Service
@@ -14,11 +16,16 @@ public class MailAdapter implements SendMailOutPort {
 
     @Override
     public void sendMail(final String recipient, final String subject, final String body) {
-        final SimpleMailMessage mail = new SimpleMailMessage();
-        mail.setFrom(mailProperties.getFromAddress());
-        mail.setTo(recipient);
-        mail.setSubject(subject);
-        mail.setText(body);
-        mailSender.send(mail);
+        final MimeMessage mimeMessage = mailSender.createMimeMessage();
+        final MimeMessageHelper helper = new MimeMessageHelper(mimeMessage, "utf-8");
+        try {
+            helper.setFrom(mailProperties.getFromAddress());
+            helper.setTo(recipient);
+            helper.setSubject(subject);
+            helper.setText(body, true);
+            mailSender.send(mimeMessage);
+        } catch (MessagingException e) {
+            throw new RuntimeException(e);
+        }
     }
 }

ticketing-eventing/mail-handler-service/src/main/java/de/muenchen/oss/dbs/ticketing/eventing/mailhandler/application/usecase/EventHandlingUseCase.java

@@ -49,21 +49,23 @@ public void handleEvent(final Event event) {
     }
 
     private boolean isRelevantEvent(final Event event) {
+        log.debug("checking event: " + event);
         return
         // state was changed
         mailHandlerProperties.getStateChangeAction().equals(event.action()) &&
         // new state is closed
                 mailHandlerProperties.getClosedState().equals(event.status()) &&
                 // is relevant anliegen
-                mailHandlerProperties.getRelevantTicketTypes().contains(event.anliegenart());
+                mailHandlerProperties.getRelevantTicketTypes().contains(event.anliegenart()) &&
+                // user does have an lhmExtId (i.e. BayernID or BundID user)
+                event.lhmExtId() != null && !event.lhmExtId().isEmpty();
     }
 
     private String buildSubject(final TicketInternal ticket, final Map<String, Object> form) {
         return "[%s;%s;%s;%s] Ihr Anliegen '%s' wurde abschließend bearbeitet"
                 .formatted(
-                        // TODO
-                        "",
-                        "",
+                        form.get("legacyPostkorbHandle"),
+                        form.get("accountSource"),
                         form.get("ticketingVertrauensniveau"),
                         "Dummy",
                         ticket.getTitle());
@@ -72,12 +74,13 @@ private String buildSubject(final TicketInternal ticket, final Map<String, Objec
     private String buildBody(final TicketInternal ticket) {
         assert ticket.getArticles() != null;
         return ticket.getArticles().stream()
-                // only public articles
-                .filter(i -> Boolean.FALSE.equals(i.getInternal()))
+                // only public articles of type "web" or "note"
+                .filter(i -> Boolean.FALSE.equals(i.getInternal()) &&
+                        (ArticleInternal.TypeEnum.WEB.equals(i.getType()) || ArticleInternal.TypeEnum.NOTE.equals(i.getType())))
                 // format single article
-                .map(i -> "Titel: %s%nBody: %s".formatted(i.getSubject(), i.getBody()))
+                .map(i -> "Titel: %s<br>Body: %s".formatted(i.getSubject(), i.getBody()))
                 // build body
-                .collect(Collectors.joining("\n\n"));
+                .collect(Collectors.joining("<hr>"));
 
     }