Merge pull request #194 from DckcDan/master

Added the trackId and ttl fields to conversations request objects.

Author: denizkilic

api/src/main/java/com/messagebird/MessageBirdClient.java

@@ -72,7 +72,7 @@ public class MessageBirdClient {
      * can, however, override this behaviour by providing absolute URLs
      * ourselves.
      */
-    private static final String CONVERSATIONS_BASE_URL = "https://conversations.messagebird.com/v1";
+    static final String CONVERSATIONS_BASE_URL = "https://conversations.messagebird.com/v1";
     static final String VOICE_CALLS_BASE_URL = "https://voice.messagebird.com";
     static final String NUMBERS_CALLS_BASE_URL = "https://numbers.messagebird.com/v1";
     static final String MESSAGING_BASE_URL = "https://messaging.messagebird.com/v1";
@@ -91,10 +91,10 @@ public class MessageBirdClient {
     private static final String VERIFYPATH = "/verify";
     private static final String VERIFYEMAILPATH = "/verify/messages/email";
     private static final String VOICEMESSAGESPATH = "/voicemessages";
-    private static final String CONVERSATION_PATH = "/conversations";
-    private static final String CONVERSATION_SEND_PATH = "/send";
-    private static final String CONVERSATION_MESSAGE_PATH = "/messages";
-    private static final String CONVERSATION_WEBHOOK_PATH = "/webhooks";
+    static final String CONVERSATION_PATH = "/conversations";
+    static final String CONVERSATION_SEND_PATH = "/send";
+    static final String CONVERSATION_MESSAGE_PATH = "/messages";
+    static final String CONVERSATION_WEBHOOK_PATH = "/webhooks";
     static final String INTEGRATIONS_WHATSAPP_PATH = "/platforms/whatsapp";
     static final String VOICECALLSPATH = "/calls";
     static final String LEGSPATH = "/legs";

api/src/main/java/com/messagebird/objects/conversations/ConversationMessage.java

@@ -13,6 +13,7 @@ public class ConversationMessage {
     private String id;
     private String conversationId;
     private String channelId;
+    private String trackId;
     private ConversationMessageDirection direction;
     private ConversationMessageStatus status;
     private ConversationContentType type;
@@ -122,6 +123,14 @@ public void setPlatform(String platform) {
         this.platform = platform;
     }
 
+    public String getTrackId() {
+        return trackId;
+    }
+
+    public void setTrackId(String trackId) {
+        this.trackId = trackId;
+    }
+
     @Override
     public String toString() {
         return "ConversationMessage{" +
@@ -131,6 +140,7 @@ public String toString() {
                 ", direction=" + direction +
                 ", status=" + status +
                 ", type=" + type +
+                ", trackID=" + trackId +
                 ", content=" + content +
                 ", createdDatetime=" + createdDatetime +
                 ", updatedDatetime=" + updatedDatetime +
@@ -139,4 +149,4 @@ public String toString() {
                 ", platform='" + platform + '\'' +
                 '}';
     }
-}
+}

api/src/main/java/com/messagebird/objects/conversations/ConversationMessageRequest.java

@@ -11,6 +11,8 @@ public class ConversationMessageRequest {
     private ConversationContent content;
     private String channelId;
     private String reportUrl;
+    private String trackId;
+    private String ttl;
     private Map<String, Object> source;
 
     public ConversationContentType getType() {
@@ -53,6 +55,21 @@ public void setSource(Map<String, Object> source) {
         this.source = source;
     }
 
+    public String getTrackId() {
+        return trackId;
+    }
+
+    public void setTrackId(String trackId) {
+        this.trackId = trackId;
+    }
+    public String getTtl() {
+        return ttl;
+    }
+
+    public void setTtl(String ttl) {
+        this.ttl = ttl;
+    }
+
     @Override
     public String toString() {
         return "ConversationMessageRequest{" +
@@ -61,6 +78,8 @@ public String toString() {
                 ", channelId='" + channelId + '\'' +
                 ", reportUrl='" + reportUrl + '\'' +
                 ", source=" + source +
+                ", trackID=" + trackId +
+                ", ttl=" + ttl +
                 '}';
     }
-}
+}

api/src/main/java/com/messagebird/objects/conversations/ConversationSendRequest.java

@@ -8,6 +8,8 @@ public class ConversationSendRequest {
     private ConversationContent content;
     private String from;
     private String reportUrl;
+    private String trackId;
+    private String ttl;
     private ConversationFallbackOption fallback;
     private Map<String, Object> source;
     private ConversationMessageTag tag;
@@ -90,6 +92,21 @@ public void setTag(ConversationMessageTag tag) {
         this.tag = tag;
     }
 
+    public void setTrackId(String trackId) {
+        this.trackId = trackId;
+    }
+
+    public String getTrackId() {
+        return trackId;
+    }
+
+    public String getTtl() {
+        return ttl;
+    }
+
+    public void setTtl(String ttl) {
+        this.ttl = ttl;
+    }
     @Override
     public String toString() {
         return "ConversationSendRequest{" +
@@ -98,11 +115,11 @@ public String toString() {
                 ", content=" + content +
                 ", from='" + from + '\'' +
                 ", reportUrl='" + reportUrl + '\'' +
+                ", trackId='" + trackId + '\'' +
+                ", ttl='" + ttl + '\'' +
                 ", fallback=" + fallback + '\'' +
                 ", tags=" + tag +
                 ", source='" + source + '\'' +
                 '}';
     }
-}
-
-
+}

api/src/main/java/com/messagebird/objects/conversations/ConversationStartRequest.java

@@ -14,6 +14,8 @@ public class ConversationStartRequest {
     private ConversationMessageTag tag;
     private String channelId;
     private String reportUrl;
+    private String trackId;
+    private String ttl;
 
     public ConversationStartRequest(
             final String to,
@@ -91,6 +93,14 @@ public void setTag(ConversationMessageTag tag) {
         this.tag = tag;
     }
 
+    public String getTrackId() {
+        return trackId;
+    }
+
+    public void setTrackId(String trackId) {
+        this.trackId = trackId;
+    }
+
     @Override
     public String toString() {
         return "ConversationStartRequest{" +
@@ -101,6 +111,8 @@ public String toString() {
                 ", tag=" + tag +
                 ", channelId='" + channelId + '\'' +
                 ", reportUrl='" + reportUrl + '\'' +
+                ", trackId='" + trackId + '\'' +
+                ", ttl='" + ttl + '\'' +
                 '}';
     }
-}
+}