Allow open and close admin replies, and admin assigment

Send open or close admin replies, optionally with a
body and allow conversations to be assigned to pther
admings  with some validation to check combinations of
fields. Also while we're here, validate that a user
reply has a message type of comment.

Author: dehora

README.md

@@ -401,6 +401,12 @@ ConversationCollection openForAdmin = Conversation.list(params);
 Admin admin = new Admin().setId("1");
 AdminReply adminReply = new AdminReply(admin);
 adminReply.setBody("These apples are healthsome");
+Conversation.reply("66", adminReply); 
+
+// admin close
+Admin admin = new Admin().setId("1");
+AdminReply adminReply = new AdminReply(admin);
+adminReply.setMessageType("close");
 Conversation.reply("66", adminReply);
 
 // user reply

intercom-java/src/main/java/io/intercom/api/AdminReply.java

@@ -41,12 +41,34 @@ public String getBody() {
         public String getAdminID() {
             return reply.getFrom().getId();
         }
+
+        @JsonProperty("assignee_id")
+        public String getAssigneeID() {
+            return reply.getAssigneeID();
+        }
     }
 
+    @JsonProperty("assignee_id")
+    private String assigneeID;
+
     public AdminReply(Admin admin) {
         this.from = admin;
     }
 
+    public Reply<Admin> setMessageType(String messageType) {
+        return setMessageReplyType(messageType);
+    }
+
+    public String getAssigneeID() {
+        return assigneeID;
+    }
+
+    public Reply<Admin> setAssigneeID(String assigneeID) {
+        this.assigneeID = assigneeID;
+        this.setMessageType("assign");
+        return this;
+    }
+
     @Override
     public String toString() {
         return "AdminReply{} " + super.toString();

intercom-java/src/main/java/io/intercom/api/Conversation.java

@@ -19,6 +19,7 @@ public class Conversation extends TypedData {
 
     private static final HashMap<String, String> SENTINEL = Maps.newHashMap();
     private static final List<String> DISPLAY_AS_FORMATS = Lists.newArrayList("plaintext", "html");
+    private static final List<String> MESSAGE_TYPES = Lists.newArrayList("note", "comment", "assign", "open", "close");
 
     public static Conversation find(String id) throws InvalidException, AuthorizationException {
         final HttpClient resource = new HttpClient(UriBuilder.newBuilder().path("conversations").path(id).build());
@@ -36,6 +37,8 @@ public static ConversationCollection list(Map<String, String> params) throws Inv
     }
 
     public static Conversation reply(String id, UserReply reply) {
+        validateUserReplyRequest(reply);
+
         final URI uri = UriBuilder.newBuilder()
             .path("conversations")
             .path(id)
@@ -46,6 +49,8 @@ public static Conversation reply(String id, UserReply reply) {
     }
 
     public static Conversation reply(String id, AdminReply reply) {
+        validateAdminReplyRequest(reply);
+
         final URI uri = UriBuilder.newBuilder()
             .path("conversations")
             .path(id)
@@ -89,6 +94,41 @@ public static AdminMessage create(AdminMessage message) throws InvalidException
         return response;
     }
 
+    static void validateAdminReplyRequest(AdminReply reply) {
+
+        validateMessageType(reply);
+
+        if (reply.getAssigneeID() != null
+            && !"assign".equals(reply.getMessageType())) {
+            throw new InvalidException("an assignee id can be set only for a message type of assign");
+        }
+
+        if (("note".equals(reply.getMessageType()) || "comment".equals(reply.getMessageType()))
+            && (isNullOrBlank(reply.getBody()))
+            ) {
+            throw new InvalidException("a comment or note reply must have a body");
+        }
+    }
+
+    static boolean isNullOrBlank(String s) {
+        return s == null || s.trim().length() == 0;
+
+    }
+
+    static void validateUserReplyRequest(UserReply reply) {
+        if (! "comment".equals(reply.getMessageType())) {
+            throw new InvalidException("a user reply must have a message type of comment");
+        }
+    }
+
+    static void validateMessageType(Reply reply) {
+        if(! MESSAGE_TYPES.contains(reply.getMessageType())) {
+            throw new InvalidException(
+                "A reply message type must be one of "
+                + Joiner.on(", ").join(MESSAGE_TYPES));
+        }
+    }
+
     static void validateListRequest(Map<String, String> params) {
         if (!params.containsKey("type")) {
             throw new InvalidException("a user or admin type must be supplied for a conversation query");

intercom-java/src/main/java/io/intercom/api/Reply.java

@@ -5,7 +5,7 @@
 class Reply<T extends Replier> extends TypedData {
 
     @JsonProperty("message_type")
-    private final String messageType = "comment";
+    private String messageType = "comment";
 
     @JsonProperty("body")
     private String body;
@@ -44,6 +44,11 @@ String getMessageType() {
         return messageType;
     }
 
+    Reply<T> setMessageReplyType(String messageType) {
+        this.messageType = messageType;
+        return this;
+    }
+
     @Override
     public boolean equals(Object o) {
         if (this == o) return true;

intercom-java/src/test/java/io/intercom/api/ConversationTest.java

@@ -5,11 +5,61 @@
 
 import java.util.Map;
 
+import static org.junit.Assert.*;
 import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
 
 public class ConversationTest {
 
+    @Test
+    public void testIsNullOrBlank() {
+        assertTrue(Conversation.isNullOrBlank(null));
+        assertTrue(Conversation.isNullOrBlank(""));
+        assertTrue(Conversation.isNullOrBlank(" "));
+        assertTrue(Conversation.isNullOrBlank("\n"));
+        assertTrue(Conversation.isNullOrBlank("\r"));
+        assertFalse(Conversation.isNullOrBlank("reply"));
+    }
+
+    @Test
+    public void testAdminReply() {
+
+        AdminReply adminReply = new AdminReply(null);
+        adminReply.setAssigneeID("1");
+        assertEquals("assign", adminReply.getMessageType());
+
+        try {
+            Conversation.validateAdminReplyRequest(adminReply);
+        } catch (InvalidException e) {
+            fail();
+        }
+
+        adminReply = new AdminReply(null);
+        adminReply.setMessageType("comment");
+        try {
+            Conversation.validateAdminReplyRequest(adminReply);
+            fail();
+        } catch (InvalidException e) {
+            assertTrue(e.getMessage()
+                .contains("a comment or note reply must have a body"));
+        }
+
+        adminReply.setBody(" ");
+        try {
+            Conversation.validateAdminReplyRequest(adminReply);
+            fail();
+        } catch (InvalidException e) {
+            assertTrue(e.getMessage()
+                .contains("a comment or note reply must have a body"));
+        }
+
+        adminReply.setBody("Once, in flight school, I was laconic");
+        try {
+            Conversation.validateAdminReplyRequest(adminReply);
+        } catch (InvalidException e) {
+            fail();
+        }
+    }
+
     @Test
     public void testDisplayAs() {