Skip to content

When sending email, send directly to a single recipient… #2717

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 5, 2024
Merged

When sending email, send directly to a single recipient… #2717

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
62 changes: 42 additions & 20 deletions server/src/main/java/com/objectcomputing/checkins/notifications/email/MailJetSender.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,8 +90,6 @@ public void sendEmail(String fromName, String fromAddress, String subject, Strin
return;
}

List<JSONArray> emailBatches = getEmailBatches(recipients);
List<JSONArray> failedBatches = new ArrayList<>();
JSONObject sender = new JSONObject()
.put("Email", fromAddress)
.put("Name", fromName);
Expand All @@ -106,27 +104,33 @@ public void sendEmail(String fromName, String fromAddress, String subject, Strin
final String localEmailFormat = modifiedEmailFormat;
final String localContent = content;

emailBatches.forEach((recipientList) -> {
MailjetRequest request = new MailjetRequest(Emailv31.resource)
.property(Emailv31.MESSAGES, new JSONArray()
.put(new JSONObject()
.put(Emailv31.Message.FROM, sender)
.put(Emailv31.Message.TO, new JSONArray().put(sender))
.put(Emailv31.Message.BCC, recipientList)
.put(Emailv31.Message.SUBJECT, subject)
.put(localEmailFormat, localContent)));
if (recipients.length == 1) {
final JSONArray to = new JSONArray()
.put(new JSONObject().put("Email", recipients[0]));
try {
MailjetResponse response = client.post(request);
LOG.info("Mailjet response status: {}", response.getStatus());
LOG.info("Mailjet response data: {}", response.getData());
send(sender, to, null, subject, localEmailFormat, localContent);
} catch (MailjetException e) {
LOG.error("An unexpected error occurred while sending the upload notification: {}", e.getLocalizedMessage(), e);
failedBatches.add(recipientList);
throw new BadArgException("Failed to send email for " + to);
}
} else {
List<JSONArray> emailBatches = getEmailBatches(recipients);
List<JSONArray> failedBatches = new ArrayList<>();
final JSONArray to =
new JSONArray()
.put(new JSONObject().put("Email", this.fromAddress));
emailBatches.forEach((recipientList) -> {
try {
send(sender, to, recipientList,
subject, localEmailFormat, localContent);
} catch (MailjetException e) {
LOG.error("An unexpected error occurred while sending the upload notification: {}", e.getLocalizedMessage(), e);
failedBatches.add(recipientList);
}
});

if (!failedBatches.isEmpty()) {
throw new BadArgException("Failed to send emails for " + failedBatches);
}
});

if (!failedBatches.isEmpty()) {
throw new BadArgException("Failed to send emails for " + failedBatches);
}
}

Expand Down Expand Up @@ -154,4 +158,22 @@ public void setEmailFormat(String format) {
throw new BadArgException(String.format("Email format must be either HTMLPART, MJMLPART or TEXTPART, got %s", format));
}
}

private void send(JSONObject from, JSONArray to, JSONArray bcc,
String subject, String emailFormat, String content) throws MailjetException {
JSONObject values = new JSONObject()
.put(Emailv31.Message.FROM, from)
.put(Emailv31.Message.TO, to)
.put(Emailv31.Message.SUBJECT, subject)
.put(emailFormat, content);
if (bcc != null) {
values.put(Emailv31.Message.BCC, bcc);
}

MailjetRequest request = new MailjetRequest(Emailv31.resource)
.property(Emailv31.MESSAGES, new JSONArray().put(values));
MailjetResponse response = client.post(request);
LOG.info("Mailjet response status: {}", response.getStatus());
LOG.info("Mailjet response data: {}", response.getData());
}
}
Loading