Merge pull request #74 from Simon-Initiative/minized-slack-alerts

Minimized slack alerts

Author: darrensiegel

src/main/java/edu/cmu/oli/content/AppUtils.java

@@ -35,6 +35,7 @@
 import java.security.NoSuchAlgorithmException;
 import java.security.SecureRandom;
 import java.util.*;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.stream.Collectors;
 
 /**
@@ -466,14 +467,46 @@ public static EmbedActivityType inferEmbedActivityType(JsonObject embedActivity)
         return EmbedActivityType.UNKNOWN;
     }
 
+    private static Map<String, Long> delayedSlackMessages;
+    static {
+        delayedSlackMessages = new ConcurrentHashMap<>();
+        long sleepTimeInMilli = 1000L * 60 * 1; // 1 minutes
+        Timer timer = new Timer(true);
+        TimerTask timerTask = new TimerTask() {
+            @Override
+            public void run() {
+                delayedSlackMessagesClear();
+            }
+        };
+        timer.scheduleAtFixedRate(timerTask, sleepTimeInMilli, sleepTimeInMilli);
+    }
+
+    private static void delayedSlackMessagesClear(){
+        Iterator<Map.Entry<String, Long>> it = delayedSlackMessages.entrySet().iterator();
+        while (it.hasNext()){
+            Map.Entry<String, Long> next = it.next();
+            // Remove entry after 15 minutes
+            if((System.currentTimeMillis() - next.getValue()) > (1000L * 60 * 15)){
+                delayedSlackMessages.remove(next.getKey());
+            }
+        }
+    }
+
     public static Response.Status sendSlackAlert(JsonObject message) {
         String slackHook = System.getenv().get("slack_alert_hook");
         if (slackHook == null || slackHook.isEmpty() || slackHook.equalsIgnoreCase("none")) {
             return Response.Status.FORBIDDEN;
         }
+        String messageString = AppUtils.gsonBuilder().create().toJson(message);
+        if(delayedSlackMessages.containsKey(messageString)){
+            // Same message already dispatched less than 15 minutes ago; ignore this one
+            return Response.Status.OK;
+        }
+
+        delayedSlackMessages.put(messageString, System.currentTimeMillis());
         WebTarget target = ClientBuilder.newClient().target(slackHook);
         Response response = target.request(MediaType.APPLICATION_JSON)
-                .post(Entity.json(AppUtils.gsonBuilder().create().toJson(message)));
+                .post(Entity.json(messageString));
         log.info("response code " + response.getStatusInfo() + " code " + response.getStatus());
 
         return Response.Status.fromStatusCode(response.getStatus());

src/main/java/edu/cmu/oli/content/controllers/DeployControllerImpl.java

@@ -348,6 +348,7 @@ private String packageDetails(ContentPackage contentPackage) {
         sb.append("Package Title: " + contentPackage.getTitle() + "\n");
         sb.append("Description: " + contentPackage.getDescription() + "\n");
         sb.append("Last Updated: " + contentPackage.getDateUpdated() + "\n\n");
+        sb.append("Theme choice: " + contentPackage.getTheme()+ "\n\n");
 
         CriteriaBuilder cb = em.getCriteriaBuilder();
         CriteriaQuery<Resource> criteria = cb.createQuery(Resource.class);

src/main/java/edu/cmu/oli/content/resource/builders/Json2Xml.java

@@ -118,9 +118,13 @@ private void doJsonToXml(String key, JsonElement jsonTree, Content xmlParent, Ma
             } else if (key.equalsIgnoreCase("#cdata")) {
                 ((Element) xmlParent).addContent(new CDATA(jsonTree.getAsString()));
             } else {
-
-                String s = StringEscapeUtils.escapeXml10(jsonTree.getAsString());
-                ((Element) xmlParent).addContent(s);
+                // Wraps with cdata any codeblock content not already wrapped in cdata
+                if (((Element)xmlParent).getName().equalsIgnoreCase("codeblock")) {
+                    ((Element) xmlParent).addContent(new CDATA(jsonTree.getAsString()));
+                }else {
+                    String s = StringEscapeUtils.escapeXml10(jsonTree.getAsString());
+                    ((Element) xmlParent).addContent(s);
+                }
 
             }
         } else if (jsonTree.isJsonNull()) {

src/test/java/edu/cmu/oli/content/resource/builders/Xml2JsonTest.java

@@ -27,15 +27,17 @@ public String afterDocToString(final String str) {
         assertTrue(str.contains("<p>1 2 3</p>"));
         assertTrue(str.contains("<p>4 5 6</p>"));
 
+          System.out.println(str);
         // check newlines retained in preformatted codeblocks
         Matcher regex = Pattern.compile(
-          "<codeblock syntax\\=\"xml\">7$\\s+8$\\s+9</codeblock>",
+          "<codeblock syntax\\=\"xml\"><\\!\\[CDATA\\[7$\\s+8$\\s+9\\]\\]></codeblock>",
           Pattern.DOTALL | Pattern.MULTILINE
         ).matcher(str);
         assertTrue("XML contains 7\\n        8\\n        9", regex.find());
 
+
         regex = Pattern.compile(
-          "<codeblock syntax\\=\"xml\">$\\s+10$\\s+11$\\s+12</codeblock>",
+          "<codeblock syntax\\=\"xml\"><\\!\\[CDATA\\[$\\s+10$\\s+11$\\s+12\\]\\]></codeblock>",
           Pattern.DOTALL | Pattern.MULTILINE
         ).matcher(str);
         assertTrue("XML contains \\n        10\\n        11\\n        12", regex.find());