Merge pull request #212 from Kitzanos/email-changes-sviluppumbria-prod
Cherry-pick (Exclude default system reciever email for Sviluppumbria)
This commit is contained in:
@@ -1119,13 +1119,12 @@ public class ApplicationDao {
|
|||||||
// mailUtil.sendByMailGun(subject, body, List.of(defaultSystemReceiverEmail), null);
|
// mailUtil.sendByMailGun(subject, body, List.of(defaultSystemReceiverEmail), null);
|
||||||
// mailUtil.sendByMailGun(subject, body, List.of(gepafinEmail), null);
|
// mailUtil.sendByMailGun(subject, body, List.of(gepafinEmail), null);
|
||||||
// mailUtil.sendByMailGun(subject, body, List.of(rinaldoEmail), null);
|
// mailUtil.sendByMailGun(subject, body, List.of(rinaldoEmail), null);
|
||||||
|
if(Boolean.TRUE.equals(hub.getUniqueUuid().equals(defaultHubUuid))) {
|
||||||
if (validator.isProductionProfileActivated()) {
|
if (validator.isProductionProfileActivated()) {
|
||||||
emailLogRequest.setRecipientEmails(carloEmail);
|
emailLogRequest.setRecipientEmails(carloEmail);
|
||||||
// mailUtil.sendByMailGun(subject, body, List.of(carloEmail), null);
|
// mailUtil.sendByMailGun(subject, body, List.of(carloEmail), null);
|
||||||
emailNotificationDao.sendMail(hub.getId(), subject, body, List.of(carloEmail),emailLogRequest);
|
emailNotificationDao.sendMail(hub.getId(), subject, body, List.of(carloEmail),emailLogRequest);
|
||||||
}
|
}
|
||||||
emailLogRequest.setRecipientEmails(hub.getEmail());
|
|
||||||
emailNotificationDao.sendMail(hub.getId(), subject, body, List.of(hub.getEmail()),emailLogRequest);
|
|
||||||
List<String> listDefaultSystemReceiverEmail = Arrays.stream(defaultSystemReceiverEmail.split(","))
|
List<String> listDefaultSystemReceiverEmail = Arrays.stream(defaultSystemReceiverEmail.split(","))
|
||||||
.map(String::trim)
|
.map(String::trim)
|
||||||
.filter(email -> !email.isEmpty())
|
.filter(email -> !email.isEmpty())
|
||||||
@@ -1133,6 +1132,9 @@ public class ApplicationDao {
|
|||||||
|
|
||||||
emailLogRequest.setRecipientEmails(defaultSystemReceiverEmail);
|
emailLogRequest.setRecipientEmails(defaultSystemReceiverEmail);
|
||||||
emailNotificationDao.sendMail(hub.getId(), subject, body, listDefaultSystemReceiverEmail, emailLogRequest);
|
emailNotificationDao.sendMail(hub.getId(), subject, body, listDefaultSystemReceiverEmail, emailLogRequest);
|
||||||
|
}
|
||||||
|
emailLogRequest.setRecipientEmails(hub.getEmail());
|
||||||
|
emailNotificationDao.sendMail(hub.getId(), subject, body, List.of(hub.getEmail()),emailLogRequest);
|
||||||
emailLogRequest.setRecipientEmails(rinaldoEmail);
|
emailLogRequest.setRecipientEmails(rinaldoEmail);
|
||||||
emailNotificationDao.sendMail(hub.getId(), subject, body, List.of(rinaldoEmail),emailLogRequest);
|
emailNotificationDao.sendMail(hub.getId(), subject, body, List.of(rinaldoEmail),emailLogRequest);
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user