Merge pull request #2721 from objectcomputing/release/0.8

Release v0.8.3

Author: mkimberlin

.github/workflows/gradle-build-production.yml

@@ -82,9 +82,9 @@ jobs:
             --set-env-vars "MJ_APIKEY_PRIVATE=${{ secrets.MJ_APIKEY_PRIVATE }}" \
             --set-env-vars "GIT_HUB_TOKEN=${{ secrets.GIT_HUB_TOKEN }}" \
             --set-env-vars "WEB_ADDRESS=${{ env.TARGET_URL }}" \
-            --set-env-vars "FROM_ADDRESS=kimberlinm@objectcomputing.com" \
+            --set-env-vars "FROM_ADDRESS=no-reply@objectcomputing.com" \
             --set-env-vars "FROM_NAME=Check-Ins" \
             --set-env-vars "^@^MICRONAUT_ENVIRONMENTS=cloud,google,gcp" \
             --platform "managed" \
-            --max-instances 5 \
+            --max-instances 8 \
             --allow-unauthenticated

.github/workflows/gradle-deploy-develop.yml

@@ -107,7 +107,7 @@ jobs:
             --set-env-vars "MJ_APIKEY_PRIVATE=${{ secrets.MJ_APIKEY_PRIVATE }}" \
             --set-env-vars "GIT_HUB_TOKEN=${{ secrets.GIT_HUB_TOKEN }}" \
             --set-env-vars "WEB_ADDRESS=${{ env.TARGET_URL }}" \
-            --set-env-vars "FROM_ADDRESS=kimberlinm@objectcomputing.com" \
+            --set-env-vars "FROM_ADDRESS=no-reply@objectcomputing.com" \
             --set-env-vars "FROM_NAME=Check-Ins - DEVELOP" \
             --set-env-vars "^@^MICRONAUT_ENVIRONMENTS=dev,cloud,google,gcp" \
             --platform "managed" \

server/build.gradle

@@ -7,7 +7,7 @@ plugins {
     id "jacoco"
 }
 
-version "0.8.2"
+version "0.8.3"
 group "com.objectcomputing.checkins"
 
 repositories {

server/src/main/java/com/objectcomputing/checkins/notifications/email/MailJetSender.java

@@ -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);
@@ -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);
         }
     }
 
@@ -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());
+    }
 }

web-ui/package.json

@@ -1,6 +1,6 @@
 {
   "name": "web-ui",
-  "version": "0.8.2",
+  "version": "0.8.3",
   "private": true,
   "type": "module",
   "dependencies": {