1495 - fix email sending when data entity doesn't have namespace (#1496)

opendatadiscovery · Nov 1, 2023 · 609c5de · 609c5de
1 parent 9b63094
commit 609c5de
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 13 deletions.
diff --git a/...java/org/opendatadiscovery/oddplatform/notification/config/NotificationConfiguration.java b/...java/org/opendatadiscovery/oddplatform/notification/config/NotificationConfiguration.java
@@ -37,7 +37,7 @@ public HttpClient httpClient() {
     @ConditionalOnProperty(name = "notifications.receivers.email.sender")
     public JavaMailSender mailSender(@Value("${notifications.receivers.email.sender}") final String senderEmail,
                                      @Value("${notifications.receivers.email.password}") final String senderPassword,
-                                     @Value("${notifications.receivers.email.smpt}") final String smptHost,
+                                     @Value("${notifications.receivers.email.smtp}") final String smtpHost,
                                      @Value("${notifications.receivers.email.port}") final int port) {
         if (StringUtils.isBlank(senderEmail)) {
             throw new IllegalArgumentException("senderEmail is empty");
@@ -47,13 +47,13 @@ public JavaMailSender mailSender(@Value("${notifications.receivers.email.sender}
             throw new IllegalArgumentException("senderPassword is empty");
         }
 
-        if (StringUtils.isBlank(smptHost)) {
-            throw new IllegalArgumentException("smptHost is empty");
+        if (StringUtils.isBlank(smtpHost)) {
+            throw new IllegalArgumentException("smtpHost is empty");
         }
 
         final JavaMailSenderImpl mailSender = new JavaMailSenderImpl();
 
-        mailSender.setHost(smptHost);
+        mailSender.setHost(smtpHost);
         mailSender.setPort(port);
         mailSender.setUsername(senderEmail);
         mailSender.setPassword(senderPassword);

diff --git a/...n/java/org/opendatadiscovery/oddplatform/notification/sender/EmailNotificationSender.java b/...n/java/org/opendatadiscovery/oddplatform/notification/sender/EmailNotificationSender.java
@@ -67,17 +67,21 @@ private String getEmailContent(final AlertNotificationMessage message) throws IO
                 String.valueOf(message.getDataEntity().id()));
 
         model.put("dataEntityId", String.valueOf(message.getDataEntity().id()));
-        model.put("dataEntityName", message.getDataEntity().name());
-        model.put("dataEntityDataSourceName", message.getDataEntity().dataSourceName());
-        model.put("dataEntityNamespaceName", message.getDataEntity().namespaceName());
-        model.put("dataEntityType", message.getDataEntity().type().name());
-        model.put("link", alertUrl);
-        model.put("alertType", message.getAlertType().name());
-        model.put("alertDescription", message.getAlertType().getDescription());
-        model.put("eventAtTime", message.getEventAt().toString());
+        model.put("dataEntityName", getStringValue(message.getDataEntity().name()));
+        model.put("dataEntityDataSourceName", getStringValue(message.getDataEntity().dataSourceName()));
+        model.put("dataEntityNamespaceName", getStringValue(message.getDataEntity().namespaceName()));
+        model.put("dataEntityType", getStringValue(message.getDataEntity().type().name()));
+        model.put("link", getStringValue(alertUrl));
+        model.put("alertType", getStringValue(message.getAlertType().name()));
+        model.put("alertDescription", getStringValue(message.getAlertType().getDescription()));
+        model.put("eventAtTime", getStringValue(message.getEventAt().toString()));
 
         configuration.getTemplate("email.ftlh").process(model, stringWriter);
 
         return stringWriter.getBuffer().toString();
     }
+
+    private String getStringValue(final String value) {
+        return StringUtils.isBlank(value) ? StringUtils.EMPTY : value;
+    }
 }
diff --git a/odd-platform-api/src/main/resources/application.yml b/odd-platform-api/src/main/resources/application.yml
@@ -169,7 +169,7 @@ notifications:
 #    email:
 #      sender:
 #      password:
-#      smpt:
+#      smtp:
 #      port:
 #      notification:
 #        emails: "yourFirst@gmail.com,yourSecond@gmail.com"