Add remaining tests

benzuzu · Aug 9, 2023 · 49159e6 · 49159e6
1 parent 3fc6d65
commit 49159e6
Show file tree

Hide file tree

Showing 6 changed files with 487 additions and 66 deletions.
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
@@ -1,5 +1,7 @@
 package org.mskcc.cbio.oncokb.domain.enumeration;
 
+import org.mskcc.cbio.oncokb.web.rest.slack.DropdownEmailOption;
+
 import java.util.Optional;
 
 /**
@@ -86,7 +88,8 @@ public enum MailType {
     , ACTIVATE_FREE_TRIAL(new MailTypeBuilder()
         .templateName("activateFreeTrial")
         .description("OncoKB Trial Activation Link")
-        .titleKey("email.active.free.trial.title"))
+        .titleKey("email.active.free.trial.title")
+        .stringTemplateName("activateFreeTrialString.txt"))
     , TRIAL_ACCOUNT_IS_ABOUT_TO_EXPIRE(new MailTypeBuilder()
         .templateName("trialAccountIsAboutToExpire")
         .description("Trail account is about to expire"))
@@ -181,4 +184,15 @@ public Optional<String> getStringTemplateName() {
     public Optional<String> getAttachmentFileNames() {
         return attachmentFileNames;
     }
+
+    public static boolean isDropdownEmail(MailType mailType) {
+        if (mailType == null) {
+            return false;
+        }
+        for (DropdownEmailOption mailOption : DropdownEmailOption.values()) {
+            if (mailType.equals(mailOption.getMailType()))
+                return true;
+        }
+        return false;
+    }
 }
diff --git a/src/main/java/org/mskcc/cbio/oncokb/service/SlackService.java b/src/main/java/org/mskcc/cbio/oncokb/service/SlackService.java
@@ -64,7 +64,10 @@ public class SlackService {
 
     private final Logger log = LoggerFactory.getLogger(SlackService.class);
 
-    private final String VALUE_SEPARATOR = "-";
+    public final static String VALUE_SEPARATOR = "-";
+    public final static String APPROVE_USER_EXPANDED_NOTE = "The user has been approved and notified.";
+    public final static String CONVERT_TO_REGULAR_ACCOUNT_EXPANDED_NOTE = "The trial account has been converted to a regular account.";
+
     private final ApplicationProperties applicationProperties;
     private final MailService mailService;
     private final EmailService emailService;
@@ -380,7 +383,7 @@ private LayoutBlock buildAccountStatusBlock(UserDTO userDTO, boolean isTrialAcco
         return SectionBlock.builder().fields(userInfo).blockId(ACCOUNT_STATUS.getId()).build();
     }
 
-    private String getOptionValue(String argument, String login) {
+    public String getOptionValue(String argument, String login) {
         return String.join(VALUE_SEPARATOR, argument, login);
     }
 
@@ -520,9 +523,9 @@ private List<LayoutBlock> buildAdditionalInfoBlocks(UserDTO userDTO, boolean tri
         }
         if (userDTO.isActivated() && !trialAccountActivated) {
             if (!withNote(DropdownEmailOption.GIVE_TRIAL_ACCESS, userDTO, actionId)) {
-                layoutBlocks.add(buildPlainTextBlock("The user has been approved and notified.", APPROVED_NOTE));
+                layoutBlocks.add(buildPlainTextBlock(APPROVE_USER_EXPANDED_NOTE, APPROVED_NOTE));
             } else {
-                layoutBlocks.add(buildPlainTextBlock("The trial account has been converted to a regular account.", CONVERT_TO_REGULAR_ACCOUNT_NOTE));
+                layoutBlocks.add(buildPlainTextBlock(CONVERT_TO_REGULAR_ACCOUNT_EXPANDED_NOTE, CONVERT_TO_REGULAR_ACCOUNT_NOTE));
             }
         } else if (withNote(DropdownEmailOption.GIVE_TRIAL_ACCESS, userDTO, actionId)) {
             layoutBlocks.add(buildPlainTextBlock(DropdownEmailOption.GIVE_TRIAL_ACCESS.getExpandedNote(), TRIAL_ACCOUNT_NOTE));
@@ -738,7 +741,7 @@ private LayoutBlock buildPlainTextBlock(String text, BlockId blockId) {
         return null;
     }
 
-    private String getStringFromResourceTemplateMailTextFile(String fileName) {
+    public String getStringFromResourceTemplateMailTextFile(String fileName) {
         StringBuilder sb = new StringBuilder();
 
         URL targetFileUrl = getClass().getClassLoader().getResource("templates/mail/" + fileName);

diff --git a/src/main/java/org/mskcc/cbio/oncokb/web/rest/slack/ActionId.java b/src/main/java/org/mskcc/cbio/oncokb/web/rest/slack/ActionId.java
@@ -65,6 +65,17 @@ public static boolean isModalEmailAction(ActionId actionId) {
         return false;
     }
 
+    public static boolean isConfirmEmailAction(ActionId actionId) {
+        if (actionId == null) {
+            return false;
+        }
+        for (DropdownEmailOption mailOption : DropdownEmailOption.values()) {
+            if (actionId.equals(mailOption.getConfirmActionId().orElse(null)))
+                return true;
+        }
+        return false;
+    }
+
     public static boolean isDropdownAction(ActionId actionId) {
         if (actionId == null) {
             return false;

diff --git a/src/main/java/org/mskcc/cbio/oncokb/web/rest/slack/DropdownEmailOption.java b/src/main/java/org/mskcc/cbio/oncokb/web/rest/slack/DropdownEmailOption.java
@@ -14,7 +14,9 @@
  * options in the Slack dropdown menu that the team can select.
  * Approval is not included as the logic is complex and unique.
  *
- * To add a new email option, add the following fields:
+ * To add a new email option, add the following fields (you will
+ * need to create some of these in their respective classes as
+ * well, namely ActionId, BlockId, and MailType):
  *
  * REQUIRED:
  * - Block blockId (the corresponding BlockId enum constant