From d29e9cbcd1952b741c2ca816cedf014758be9abe Mon Sep 17 00:00:00 2001
From: Hongxin <jackson.zhang.828@gmail.com>
Date: Mon, 23 Oct 2023 18:21:05 -0400
Subject: [PATCH] Rename sanction and license options txt email templates to
 include postfix (#1038)

---
 .../org/mskcc/cbio/oncokb/domain/enumeration/MailType.java    | 2 +-
 src/main/java/org/mskcc/cbio/oncokb/service/MailService.java  | 4 ++--
 .../mail/{licenseOptions.txt => licenseOptionsString.txt}     | 0
 ...UsSanctionEmail.txt => rejectionUsSanctionEmailString.txt} | 0
 4 files changed, 3 insertions(+), 3 deletions(-)
 rename src/main/resources/templates/mail/{licenseOptions.txt => licenseOptionsString.txt} (100%)
 rename src/main/resources/templates/mail/{rejectionUsSanctionEmail.txt => rejectionUsSanctionEmailString.txt} (100%)

diff --git a/src/main/java/org/mskcc/cbio/oncokb/domain/enumeration/MailType.java b/src/main/java/org/mskcc/cbio/oncokb/domain/enumeration/MailType.java
index 9b7bf8124..213f3abfc 100644
--- a/src/main/java/org/mskcc/cbio/oncokb/domain/enumeration/MailType.java
+++ b/src/main/java/org/mskcc/cbio/oncokb/domain/enumeration/MailType.java
@@ -33,7 +33,7 @@ public enum MailType {
         .templateName("rejectionUsSanctionEmail")
         .description("User Rejection - US Sanction")
         .titleKey("email.reject.title")
-        .stringTemplateName("rejectionUsSanctionEmail.txt"))
+        .stringTemplateName("rejectionUsSanctionEmailString.txt"))
     , REJECT_ALUMNI_ADDRESS(new MailTypeBuilder()
         .templateName("alumniEmailAddress")
         .description("Reject - Registered under alumni email address")
diff --git a/src/main/java/org/mskcc/cbio/oncokb/service/MailService.java b/src/main/java/org/mskcc/cbio/oncokb/service/MailService.java
index 76295d5f0..6b614a238 100644
--- a/src/main/java/org/mskcc/cbio/oncokb/service/MailService.java
+++ b/src/main/java/org/mskcc/cbio/oncokb/service/MailService.java
@@ -94,7 +94,7 @@ public void sendEmail(String to, String from, String cc, String subject, String
         MimeMessage mimeMessage = javaMailSender.createMimeMessage();
         MimeMessageHelper message = new MimeMessageHelper(mimeMessage, isMultipart, StandardCharsets.UTF_8.name());
         message.setTo(to);
-        if (cc != null) {
+        if (StringUtils.isNotEmpty(cc)) {
             message.setCc(cc);
         }
         message.setFrom(from);
@@ -190,7 +190,7 @@ public void sendEmailFromSlack(UserDTO user, String subject, String body, MailTy
                 ccAddress = defaultEmailSendFrom;
             }
             sendEmail(user.getEmail(), defaultEmailSendFrom, ccAddress, subject, body, null, false, false);
-            addUserMailsRecord(user, mailType, defaultEmailSendFrom, sendBy != null ? sendBy : "Through slack, unknown sender");
+            addUserMailsRecord(user, mailType, defaultEmailSendFrom, StringUtils.isNotEmpty(sendBy) ? sendBy : "Through slack, unknown sender");
             log.info("Sent email to User '{}'", user.getEmail());
         } catch (MailException | MessagingException e) {
             log.warn("Email could not be sent to user '{}'", user.getEmail(), e);
diff --git a/src/main/resources/templates/mail/licenseOptions.txt b/src/main/resources/templates/mail/licenseOptionsString.txt
similarity index 100%
rename from src/main/resources/templates/mail/licenseOptions.txt
rename to src/main/resources/templates/mail/licenseOptionsString.txt
diff --git a/src/main/resources/templates/mail/rejectionUsSanctionEmail.txt b/src/main/resources/templates/mail/rejectionUsSanctionEmailString.txt
similarity index 100%
rename from src/main/resources/templates/mail/rejectionUsSanctionEmail.txt
rename to src/main/resources/templates/mail/rejectionUsSanctionEmailString.txt