Merge pull request #185 from it-at-m/fix/adapt-mail-for-postkorb

Fix/adapt mail for postkorb

Author: rowe42

ticketing-eventing/mail-handler-service/pom.xml

@@ -45,6 +45,9 @@
         <spring-cloud-dependencies.version>2025.0.0</spring-cloud-dependencies.version> <!-- Must match the chosen Spring Boot version -->
         <dbs-handler-core.version>0.2.0</dbs-handler-core.version>
 
+        <!-- Apache Libs -->
+        <tika.version>2.9.2</tika.version>
+
         <!-- Logging -->
         <logstash-logback-encoder.version>8.1</logstash-logback-encoder.version>
 
@@ -120,6 +123,14 @@
             <artifactId>spring-boot-starter-oauth2-client</artifactId>
         </dependency>
 
+        <!-- Apache Libs-->
+        <dependency>
+            <groupId>org.apache.tika</groupId>
+            <artifactId>tika-core</artifactId>
+            <version>${tika.version}</version>
+        </dependency>
+
+
         <!-- DBS -->
         <dependency>
             <groupId>de.muenchen.oss.dbs.ticketing.eventing</groupId>

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

@@ -5,11 +5,14 @@
 import jakarta.mail.MessagingException;
 import jakarta.mail.internet.MimeMessage;
 import jakarta.mail.util.ByteArrayDataSource;
+
+import java.io.BufferedInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.Map;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.tika.Tika;
 import org.springframework.mail.javamail.JavaMailSender;
 import org.springframework.mail.javamail.MimeMessageHelper;
 import org.springframework.stereotype.Service;
@@ -20,19 +23,23 @@
 public class MailAdapter implements SendMailOutPort {
     private final JavaMailSender mailSender;
     private final MailProperties mailProperties;
+    private final Tika tika = new Tika();
 
     @Override
     public void sendMail(final MailMessage mailMessage) {
         final MimeMessage mimeMessage = mailSender.createMimeMessage();
         try {
-            final MimeMessageHelper helper = new MimeMessageHelper(mimeMessage, true, "utf-8");
+            final MimeMessageHelper helper = new MimeMessageHelper(mimeMessage, MimeMessageHelper.MULTIPART_MODE_MIXED);
             helper.setFrom(mailProperties.getFromAddress());
             helper.setTo(mailMessage.getRecipient());
             helper.setSubject(mailMessage.getSubject());
             helper.setText(mailMessage.getBody(), true);
             for (final Map.Entry<String, InputStream> entry : mailMessage.getAttachments().entrySet()) {
                 //TODO is there a way to do this with streaming? The following line loads the attachment into RAM...
-                final DataSource dataSource = new ByteArrayDataSource(entry.getValue(), "application/octet-stream");
+                InputStream bis = new BufferedInputStream(entry.getValue());
+                String mime = detectMimeType(bis);
+                log.debug("Mime-Type for " + entry.getKey() + " found " + mime);
+                final DataSource dataSource = new ByteArrayDataSource(bis, mime);
                 helper.addAttachment(entry.getKey(), dataSource);
                 //maybe like this?
                 //helper.addAttachment(e.getKey(), new InputStreamSourceImpl(e.getValue()));
@@ -43,6 +50,10 @@ public void sendMail(final MailMessage mailMessage) {
         }
     }
 
+    public String detectMimeType(InputStream inputStream) throws IOException {
+        return tika.detect(inputStream);
+    }
+
     //    private class InputStreamSourceImpl implements InputStreamSource {
     //        private final InputStream inputStream;
     //