#1547: refactor logo path

it-at-m · Apr 9, 2024 · 6abddca · 6abddca
1 parent 328d321
commit 6abddca
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 14 deletions.
diff --git a/...-core/src/main/java/de/muenchen/oss/digiwf/email/integration/adapter/out/MailAdapter.java b/...-core/src/main/java/de/muenchen/oss/digiwf/email/integration/adapter/out/MailAdapter.java
@@ -16,8 +16,8 @@ public class MailAdapter implements MailOutPort {
     private final DigiwfEmailApi digiwfEmailApi;
 
     @Override
-    public void sendMail(Mail mail) throws MessagingException {
-        this.digiwfEmailApi.sendMail(mail);
+    public void sendMail(Mail mail, String logoPath) throws MessagingException {
+        this.digiwfEmailApi.sendMail(mail, logoPath);
     }
 
     @Override

diff --git a/.../main/java/de/muenchen/oss/digiwf/email/integration/application/port/out/MailOutPort.java b/.../main/java/de/muenchen/oss/digiwf/email/integration/application/port/out/MailOutPort.java
@@ -9,7 +9,7 @@
 
 public interface MailOutPort {
 
-    void sendMail(Mail mail) throws MessagingException;
+    void sendMail(Mail mail, String logoPath) throws MessagingException;
 
     String getBodyFromTemplate(String templateName, Map<String, Object> content) throws TemplateException, IOException;
 

diff --git a/...in/java/de/muenchen/oss/digiwf/email/integration/application/usecase/SendMailUseCase.java b/...in/java/de/muenchen/oss/digiwf/email/integration/application/usecase/SendMailUseCase.java
@@ -43,7 +43,7 @@ public void sendMailWithText(final String processInstanceIde, final String type,
         de.muenchen.oss.digiwf.email.model.Mail mailModel = createMail(mail);
         mailModel.setBody(mail.getBody());
 
-        this.sendMail(processInstanceIde, type, integrationName, mailModel);
+        this.sendMail(processInstanceIde, type, integrationName, mailModel, null);
     }
 
     @Override
@@ -58,7 +58,7 @@ public void sendMailWithTemplate(final String processInstanceIde, final String t
             mailModel.setBody(body);
             mailModel.setHtmlBody(true);
 
-            this.sendMail(processInstanceIde, type, integrationName, mailModel);
+            this.sendMail(processInstanceIde, type, integrationName, mailModel, "templates/email-logo.png");
 
         } catch (IOException ioException) {
             throw new BpmnError("LOAD_TEMPLATE_FAILED", "The template " + mail.getTemplate() + " could not be loaded");
@@ -86,9 +86,9 @@ private de.muenchen.oss.digiwf.email.model.Mail createMail(BasicMail mail) {
                 .build();
     }
 
-    private void sendMail(final String processInstanceIde, final String type, final String integrationName, de.muenchen.oss.digiwf.email.model.Mail mailModel) throws BpmnError {
+    private void sendMail(final String processInstanceIde, final String type, final String integrationName, de.muenchen.oss.digiwf.email.model.Mail mailModel, String logoPath) throws BpmnError {
         try {
-            this.mailOutPort.sendMail(mailModel);
+            this.mailOutPort.sendMail(mailModel, logoPath);
             // correlate message
             final Map<String, Object> correlatePayload = new HashMap<>();
             correlatePayload.put("mailSentStatus", true);

diff --git a/...e/src/test/java/de/muenchen/oss/digiwf/email/integration/adapter/out/MailAdapterTest.java b/...e/src/test/java/de/muenchen/oss/digiwf/email/integration/adapter/out/MailAdapterTest.java
@@ -27,8 +27,8 @@ void sendMail() throws MessagingException {
                 .receiversCc("receiversCc")
                 .receiversBcc("receiversBcc")
                 .build();
-        mailAdapter.sendMail(mail);
-        verify(digiwfEmailApi).sendMail(mail);
+        mailAdapter.sendMail(mail,"logoPath");
+        verify(digiwfEmailApi).sendMail(mail, "logoPath");
     }
 
     @Test

diff --git a/...ava/de/muenchen/oss/digiwf/email/integration/application/usecase/SendMailUseCaseTest.java b/...ava/de/muenchen/oss/digiwf/email/integration/application/usecase/SendMailUseCaseTest.java
@@ -88,7 +88,7 @@ void sendMail() throws MessagingException {
                 .receiversBcc(mail.getReceiversBcc())
                 .attachments(List.of())
                 .build();
-        verify(mailOutPort).sendMail(mailOutModel);
+        verify(mailOutPort).sendMail(mailOutModel, null);
         verify(correlateMessageOutPort).correlateMessage(processInstanceId, type, integrationName, Map.of("mailSentStatus", true));
     }
 
@@ -110,13 +110,13 @@ void sendMailWithAttachments() throws MessagingException {
                 .receiversBcc(mail.getReceiversBcc())
                 .attachments(List.of(fileAttachment))
                 .build();
-        verify(mailOutPort).sendMail(mailOutModel);
+        verify(mailOutPort).sendMail(mailOutModel, null);
         verify(correlateMessageOutPort).correlateMessage(processInstanceId, type, integrationName, Map.of("mailSentStatus", true));
     }
 
     @Test
     void sendMailThrowsBpmnError() throws MessagingException {
-        doThrow(new MessagingException("Test Exception")).when(mailOutPort).sendMail(any());
+        doThrow(new MessagingException("Test Exception")).when(mailOutPort).sendMail(any(), any());
         assertThatThrownBy(() -> sendMailInPort.sendMailWithText(processInstanceId, type, integrationName, mail)).isInstanceOf(BpmnError.class);
     }
 
@@ -134,7 +134,7 @@ void sendMailWithTemplate() throws MessagingException, TemplateException, IOExce
                 .receiversBcc(mail.getReceiversBcc())
                 .attachments(List.of())
                 .build();
-        verify(mailOutPort).sendMail(mailOutModel);
+        verify(mailOutPort).sendMail(mailOutModel, "templates/email-logo.png");
         verify(correlateMessageOutPort).correlateMessage(processInstanceId, type, integrationName, Map.of("mailSentStatus", true));
     }
 

diff --git a/...on/digiwf-email-integration-service/src/main/resources/templates/email-logo.png b/...on/digiwf-email-integration-service/src/main/resources/templates/email-logo.png
diff --git a/...tegration/digiwf-email-integration-service/src/main/resources/templates/mail-template.ftl b/...tegration/digiwf-email-integration-service/src/main/resources/templates/mail-template.ftl
@@ -154,7 +154,7 @@
     <table cellspacing="0" cellpadding="0" border="0" align="center" width="600" style="margin: auto;" class="email-container">
         <tr>
             <td style="padding: 20px 0; text-align: center">
-                <img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMgAAABeCAYAAABmZ1vAAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAA4gSURBVHgB7d0JUFT3HQfwryIqUUExgko8UEEUUUAEROoVr5hEbIwxidomdqLTaI6e1mqnNlabZJI0xmkOrUkTa5I6UeOFgiKsyimoeOKBVxBFAS/kFOz/t8+VZYBd3nu77Hvw+8w4PNi3iS773f/9/7fo0cPrARhjdWoJxli9OCCMWcABYcwCDghjFrQCq9P0sRXwdnD/xfHsVohO4s8wR+KA1OPZEbcxOrgMjrQxoaMISDswx+GPJ8Ys4BLEDkpEwXMuB7hwBSgtB1zaAr49gD5PAM5OYDrCAbGRykpg+wFgdxqwIxG4f7/2PZ1cRdtmHDD7KaB3NzAd4IDYQPIxYPmXQObZmj9vJUoLJ1GJLauQvr95B1i9CfhmO/DHXwCvTQXTOA6ICtTHRW/4FV8BVQ+kQEweAYwNAUIGAr26SvddvwmknQD2HxEN7zip2vXOv4H8W8CiV8A0jAOiwsffAR+tl66H+IigzAcG96t9n0cn4JlI6c9rUcDvPwEyTgGf/gD0FW2TF54E0yjuxVJo417gn99K1+PCgO9X1AzHfdEmyboI3LlX83n9RCC+WQoMHSh9/8E6UQUrB9MoDogChaItsUy0OR6IapWPeMOv/C3Q3kV6rFS0N97/BgieDYxfAATOFNWofwHfxQJhrwKvvw+4iqGNd+ZK91/NBzYbwDSKA6LA2q1AwS3peuEvpTc8uVcKzF0OrNoAtBDfvyB6rLy7A//dCbz7NZB7Q5QgT0j3UmkzJkS6PpQFplHcBpGJSo0Nu6XrQeJNPiGs+rH3RMkRnw54dRH3vAv09JTGRGb+BTh4Uron1L/6/r5e0v3nfgLTKC5BZEoXjetrBdL1+FBRUrSQro+cBv6zTbpeNEcKB3FpIzXOCVXDwswC0vLhq1/i2BktzAJVJUirVq0QFBQENfLz83HhwgXoxQmzv2q3ztXXP8RLpYtvT2BKZM3nOD0MAnUBO5u94sWl0tf2j0GWqClRcHVzQ2O4efMmtm/fBltpKT4VZs6chcayYcMGlJWVQilVAenYsRM2btwMNb5dvx5/WrQQelFq9mnfzUP6WlUFRB+QriMDq0sVk+Pnpa/+fap/Rr1csWnS9eC+kOWNN9+Er29/NIaioiJER+8Q/8Yq2EJAwGAsX74CjWXnzp2qAsJVLJlamr35Cx821AvvAjceXlP7w1x2juilSpCux5u1V6KTxADiw6rak2HQrPbt22P48AjYSmBgIPSEAyKTW/vq69z82o+fzam+LioBFn8mjXNQqWIKT15h9RjKxOFARAA0zZZv6iFDhkBPuBdLJioFnJykyYmGDGDBdKCzq1R9OiGqUt/HAOUV0uj5nrTqHipqn7zxgaiWPS5Kj0Tgpzygq7heMgeaFxBguwQHBw+FnnAJIpO7a3XXbuoJaeYulQ70RjeNh2wSo+yfbwRy8qRJifNfkH6+dR/wxSYpHAO9gfXv6GNWr62qWL17e6NPnz7QEy5BFPhVFBCTIjXOl4gqlLeX1DiPXikF5rwoNbqK6lTUSGmknYT7SyUMjbQP6CWqVuFSSaQHnTp1Ep/8wTh06BDUCA5W1+PpCM02IL1790ZU1FRRJw7EnDmvyHmqcSzjNy8BH66XZuROF51wb70IzJkCvD6t7ueMHioNEj7WFro0dGiI6oDQa603zSogLi4umCLGECZPnoyRI0eJT3AnXLx4EUpQIMrvA6v+J01IXLYW+HqHVDIM9hFd4B2kKhcFiBrlh8VA4p5UYNcqoPvj0B1/f3+oRV28etMsAhIREYGJE5/C1KlRorrgDlugdscfZktVKJryfvEqcPkasOZHy8/bJtoh856D7kREjIAapmqa3jTZgHTv3h3Tpj2PZ5+dAj8/P9gDDYn8fDQwSbRhfzQASZnSktt7xTXva+cCjB0m6uDirzHdwWs/8vLy4OnpKft59Bw/vwHIyjoFJYKCgo2j6HJVVFTA2dkZjtKkAkJVpueem4YJEyZg7NgnG+2FdWkNvDRe+lNZJVWrzKeRUM+Xk0b6C+Pi9uDll2dCrhaiyAwLC1MckJCQYVAiLi4OkyZNgqOoCsi9e0X4x4rlUOOUwhfcHBXdTz/9jCgxpsHdvTMciYLgaZtanF1kZ2fj8uXL6NmzJ+RS0w7x9fWFEocPH9JvQEpKSvDZ55/BkRYvXoK5c+cZP+FYw+zbZ8CsWbMhV3j4cCjRtm1bjBo1CnLdvFkIg8GARYv+DEfRfRWLSgx7hOOTTT2wbnfDBirWLjwNpaoetMCqjd1xNLt9rcfyCmmCYDFsLTMzU1FAevXqZfxz6dIlWc8bNCgAbdq0gVwJCQY8eODY7V95oLAe6SdKYG+VVS2w9Kuu+Ho7fVeExpKYeABK0AfR8OHDZQdkWEgIlDhy5DAcjaea2MCt4q5yn2IMx+I1HiIcjf8ryMnJwfHjx6FEQID8yYY+CtofNL1+9+5YOBoHxAaqIK+KJ4XDE9/uclwBnpaWBiVCQ+X1RrVs6YRx48ZBrjNnzhiD7GgckEZmDMdqDxEOx07EOnhQWUB8fHzRrVvDZ1j27dPHuLBOrvj4vdAC1R9hAwYMUDQAZFJYWIirV6/W+RhNDbE2+9PNzRVq0FhJQ7ovc3NzjctP1aiocsbCT7vhh7hKOFpKSoqxGiP3d0f3DxsWiq1btzTo/ogRymYCHzt2DFqgOiCbN2/BY4/JXFRtZs2aNVi27G91PjZo0CDVS3qt8fLyws6dMVbvW7r0r/jyy7V1PlZWYf1lrBTh+N0qT/yY4PhwkIKCfKSmphob3XLRuFNDA9K3bz/IVVx8D7t27YQWcBXLBopKLI/YUzje/oTCoa0Ttw8fVtZLJGfRE00KlWvfvv24X9f2+A7AAbGzsoq2eHOlB7YYtHccfVpaCpSgFYYNmfTp4eEBb29vyHXoUAa0ggNiRxSO+R95GGfwahH1ZJWVyd+Ui+a8hYaGWr0vMvJnsgdxaWBw715tNNAJB8ROSkU4Xv/QA7Ep2mhz1IW29ElNVVaKDB1qvZrl5yd/ayLq2j179gy0ggNiAwW3ataXSyvaYMFHntidqt1wmKSkpEKJwEDry2eHDJG/xDY2Ntbh00vMcUBsoMrsF1pU2ga//qCbKDm00ci0Rml9n0oQ2jOrPtSzOWyY/Cnux49ro3vXhANiQ0WlrTH3/e6IS6uAXqSnH8SdO7chF40f0XhIfWjtCG1NK8f9igpRgljvcm9MHBAbkcLhhQOH9XUaTnl5uXHQUAlLS2iVbDaXmJSIu3fvQks4IDZwLf8BXnvvCd2Fw0TpvKzBg+ufuOjrK3+Zc3p6OrRG09Pdz53Lxttvv2XxnhkzZqja2Oz69etY0YBVkUeOHKn3sSWft0RRsX7PMMjIUPbGpFF4WgxVWlpzc2iqWo0cORJy0UIurdF0QGhF2aZNGy3eM2JEJNQoLi62+v+wpqhY+71VlmRkZCjazIHCQdWspKSkGj8fOHAgOnToADloTp5W5l+Z4yoWM0pOToISdU07CQsLh1zR0dGamV5ijgPCjDIylO2aWNfG1j4+PpBLa927JhwQZpQkepCUoOkkrVu3fvQ9TS0ZNWo05KLtfbSIA8KMaHqHkm1Yqa3h7z/o0fe0YV/XrvKWIB88eFC0ga5Bizgg7BGlmzmYT1wcM2as7AmKycnJ0CoOCHskM/MolKBVpSZKprcnJyur3jUGDgh7xGCIV3RY5+jRY4xT4ElkpLxud+pm1+IAoQkHhD1CewPQbiJyubu7o39/P7Rr1w79+snrwaKltUrWpDQWDgirYf9+Zau7wsPDMWHCRNkbhtMuj1rGOyuyGk6dUraZeP/+/XHjxg3IZTAkQMu4BGE1xMTsMp7JIddY0Xsl94iDrKwsnD9/HlrGAWE10HRzJaPanmLsg07ykmP//v3QOg4Iq+XAAWXjIXIpnf/VmDggrJYsGxxqZA31XKWkaHeA0IQDwmqJiYmttcbD1qi3jHZV0ToOCKulvLxM8SrDhqJtT/Wg2QeERnJZbTSB0J4SE7U7vcSc7gPSurW6k2y1uEhHC5Quw20ImjV84oSyA3wam+4D4ubWEWp06dIFrDaaYWuvNgKVHlraHM4S3Qekg4XNyxqic+fOqo5vaKoqK+8jISEe9qB0Wr0jNPs2CK2Ge/756WC1KT3H0BKq0iYnaX/8w0T3Abl1+xbUWrDgDYt7zdKpSnJ3CWwKlE5ctIR6xwoKC6AXuv+t075WatES0S1btho/Me/cufPo5x07usG9kzs8PD1FiOZjx47taE5o4mJBQYGxGmoreqpeEd0HJC9PfUAILROta4eO5oyqQ3v27MaMGS/CVpQeHuoouq9i5eRcBrMfpdPf60KlvV4GCE10H5CYmBjjBszMPuLjbdeTRW0avXTvmug+ILdv38a2bVvB7OPSpYu4cuUKbCEtTV+lB2kS3bzr1q1TtNkAs45eVzr1yRb/HYNBe5tTW9MkAkKnJK1c+TGYfZw+nQW1aBFWbm4u9KbJDBRSQFav/gLM9mwxoq7H0oM0mYBQEb58+d+N54lcvsw9W7ZEn/xqe7Msna+iZS169PBS1a0wc+YsODsrH045efKkzdce0LkVUVFTjWukaSsa2q9JDVo8NG/eXNGjo43zu+nIARcXFyhx/ny2cf8ruXx8fOHh4QGlaPVgZaX8c1RonlxQUP1HvVlDx1yrmbGtOiBaR3OtevXshcCgIDEi7A5XVzdjgOjnpt0ATegXSF3G1DNWVHRXjLFcwdGjmcbtbHhafPPU5APCmBq85JYxCzggjFnAAWHMAg4IYxZwQBizgAPCmAUcEMYs4IAwZgEHhDELWlVV4VUwxur0f6NRgX4EUZsxAAAAAElFTkSuQmCC" width="200" height="94" alt="itm_logo" border="0">
+                <img src="cid:logo" width="200" alt="itm_logo" border="0">
             </td>
         </tr>
     </table>