Enhance email functionality by adding support for input stream attachments and custom headers

Author: marioserrano09

extensions/email-sms/sources/core/src/main/java/tools/dynamia/modules/email/EmailAttachment.java

@@ -17,34 +17,46 @@
 
 package tools.dynamia.modules.email;
 
+import org.springframework.core.io.InputStreamSource;
+
 import java.io.File;
 
 /**
  * Represents an attachment in an email.
  */
 public class EmailAttachment {
 
-	private String name;
-	private File file;
+    private final String name;
+    private File file;
+
+    private InputStreamSource inputStreamSource;
+
+    public EmailAttachment(File file) {
+        super();
+        this.file = file;
+        this.name = file.getName();
+    }
 
-	public EmailAttachment(File file) {
-		super();
-		this.file = file;
-		this.name = file.getName();
-	}
+    public EmailAttachment(String name, File file) {
+        super();
+        this.name = name;
+        this.file = file;
+    }
 
-	public EmailAttachment(String name, File file) {
-		super();
-		this.name = name;
-		this.file = file;
-	}
+    public EmailAttachment(String name, InputStreamSource inputStreamSource) {
+        this.name = name;
+        this.inputStreamSource = inputStreamSource;
+    }
 
-	public File getFile() {
-		return file;
-	}
+    public File getFile() {
+        return file;
+    }
 
-	public String getName() {
-		return name;
-	}
+    public String getName() {
+        return name;
+    }
 
+    public InputStreamSource getInputStreamSource() {
+        return inputStreamSource;
+    }
 }

extensions/email-sms/sources/core/src/main/java/tools/dynamia/modules/email/EmailMessage.java

@@ -73,6 +73,8 @@ public static boolean isEmailAddress(String email) {
     private boolean notification;
     private String notificationUuid;
 
+    private Map<String, String> headers = new HashMap<>();
+
     /**
      * Represents an email message that can be sent.
      */
@@ -320,4 +322,16 @@ public Set<String> loadAllAddresses() {
         all.addAll(getBccs());
         return all;
     }
+
+    public void addHeader(String name, String value) {
+        headers.put(name, value);
+    }
+
+    public String getHeader(String name) {
+        return headers.get(name);
+    }
+
+    public Map<String, String> getHeaders() {
+        return headers;
+    }
 }

extensions/email-sms/sources/core/src/main/java/tools/dynamia/modules/email/services/impl/EmailServiceImpl.java

@@ -18,6 +18,7 @@
 
 package tools.dynamia.modules.email.services.impl;
 
+import jakarta.mail.MessagingException;
 import jakarta.mail.internet.MimeMessage;
 import org.springframework.mail.MailSender;
 import org.springframework.mail.javamail.JavaMailSenderImpl;
@@ -34,7 +35,6 @@
 import tools.dynamia.domain.query.QueryConditions;
 import tools.dynamia.domain.query.QueryParameters;
 import tools.dynamia.domain.services.CrudService;
-import tools.dynamia.domain.util.CrudServiceListenerAdapter;
 import tools.dynamia.integration.Containers;
 import tools.dynamia.integration.scheduling.SchedulerUtil;
 import tools.dynamia.integration.scheduling.TaskException;
@@ -62,7 +62,6 @@
 import java.util.Properties;
 import java.util.Set;
 import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.Future;
 
 /**
  * @author Mario Serrano Leones
@@ -191,7 +190,7 @@ private EmailSendResult processAndSendEmail(EmailMessage mailMessage, EmailAccou
                 helper.setTo(mailMessage.getTo().split(","));
             } else {
                 if (!mailMessage.getTos().isEmpty())
-                    helper.setTo(tosAsArray[0].toString());
+                    helper.setTo(tosAsArray[0]);
             }
 
             if (!mailMessage.getTos().isEmpty()) {
@@ -222,8 +221,24 @@ private EmailSendResult processAndSendEmail(EmailMessage mailMessage, EmailAccou
                 helper.setReplyTo(mailMessage.getReplyTo());
             }
 
-            for (EmailAttachment archivo : mailMessage.getAttachments()) {
-                helper.addAttachment(archivo.getName(), archivo.getFile());
+            if (mailMessage.getAttachments() != null) {
+                for (EmailAttachment attachment : mailMessage.getAttachments()) {
+                    if (attachment.getFile() != null && attachment.getFile().exists()) {
+                        helper.addAttachment(attachment.getName(), attachment.getFile());
+                    } else if (attachment.getInputStreamSource() != null) {
+                        helper.addAttachment(attachment.getName(), attachment.getInputStreamSource());
+                    }
+                }
+            }
+
+            if (mailMessage.getHeaders() != null && !mailMessage.getHeaders().isEmpty()) {
+                mailMessage.getHeaders().forEach((k, v) -> {
+                    try {
+                        mimeMessage.addHeader(k, v);
+                    } catch (MessagingException e) {
+                        logger.warn("Error adding header " + k + " to email message " + mailMessage, e);
+                    }
+                });
             }
 
             fireOnMailSending(mailMessage);
@@ -346,7 +361,7 @@ public EmailTemplate getTemplateByName(String name) {
         return getTemplateByName(name, true);
     }
 
-    private MailSender createMailSender(EmailAccount account) {
+    protected MailSender createMailSender(EmailAccount account) {
         JavaMailSenderImpl mailSender = (JavaMailSenderImpl) MAIL_SENDERS.get(account.getId());
         if (mailSender == null) {
             logger.info("Creating Mail Sender for: " + account);
@@ -508,7 +523,6 @@ private void fireOnMailSendFail(EmailMessage message, Throwable cause) {
     }
 
 
-
     @Override
     public void logEmailAddress(EmailAccount emailAccount, EmailMessage message) {
         try {