Merge pull request #168 from intercom/MM/conversation_waiting_since

add conversation waiting_since

Author: mmartinic

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

@@ -196,6 +196,9 @@ private static boolean isAdminQuery(Map<String, String> params) {
     @JsonProperty("updated_at")
     private long updatedAt;
 
+    @JsonProperty("waiting_since")
+    private long waitingSince;
+
     @JsonProperty("conversation_parts")
     private ConversationPartCollection conversationPartCollection;
 
@@ -267,6 +270,10 @@ public long getUpdatedAt() {
         return updatedAt;
     }
 
+    public long getWaitingSince() {
+        return waitingSince;
+    }
+
     public ConversationPartCollection getConversationPartCollection() {
         if (conversationPartCollection == null) {
             conversationPartCollection = find(this.getId()).getConversationPartCollection();
@@ -302,6 +309,7 @@ public boolean equals(Object o) {
         if (open != that.open) return false;
         if (read != that.read) return false;
         if (updatedAt != that.updatedAt) return false;
+        if (waitingSince != that.waitingSince) return false;
         if (assignee != null ? !assignee.equals(that.assignee) : that.assignee != null) return false;
         if (conversationMessage != null ? !conversationMessage.equals(that.conversationMessage) : that.conversationMessage != null)
             return false;
@@ -327,6 +335,7 @@ public int hashCode() {
         result = 31 * result + (assignee != null ? assignee.hashCode() : 0);
         result = 31 * result + (int) (createdAt ^ (createdAt >>> 32));
         result = 31 * result + (int) (updatedAt ^ (updatedAt >>> 32));
+        result = 31 * result + (int) (waitingSince ^ (waitingSince >>> 32));
         result = 31 * result + (conversationPartCollection != null ? conversationPartCollection.hashCode() : 0);
         result = 31 * result + (tagCollection != null ? tagCollection.hashCode() : 0);
         result = 31 * result + (open ? 1 : 0);
@@ -345,6 +354,7 @@ public String toString() {
             ", assignee=" + assignee +
             ", createdAt=" + createdAt +
             ", updatedAt=" + updatedAt +
+            ", waitingSince=" + waitingSince +
             ", conversationPartCollection=" + conversationPartCollection +
             ", tagCollection=" + tagCollection +
             ", open=" + open +

intercom-java/src/test/resources/conversation.json

@@ -3,6 +3,7 @@
   "id": "5143511111",
   "created_at": 1466703132,
   "updated_at": 1468236397,
+  "waiting_since": 1468236397,
   "conversation_message": {
     "type": "conversation_message",
     "id": "33954111",

intercom-java/src/test/resources/conversation_no_parts.json

@@ -3,6 +3,7 @@
   "id": "5143511111",
   "created_at": 1466703132,
   "updated_at": 1468236397,
+  "waiting_since": 1468236397,
   "conversation_message": {
     "type": "conversation_message",
     "id": "33954111",

intercom-java/src/test/resources/conversation_no_tags.json

@@ -3,6 +3,7 @@
   "id": "5143511111",
   "created_at": 1466703132,
   "updated_at": 1468236397,
+  "waiting_since": 1468236397,
   "conversation_message": {
     "type": "conversation_message",
     "id": "33954111",

intercom-java/src/test/resources/conversations.json

@@ -13,6 +13,7 @@
       "id": "5680931777",
       "created_at": 1471438637,
       "updated_at": 1471438637,
+      "waiting_since": 1468236397,
       "user": {
         "type": "user",
         "id": "57b45f16d1aad7e69e011111"
@@ -41,6 +42,7 @@
       "id": "5680912811",
       "created_at": 1471438151,
       "updated_at": 1471438151,
+      "waiting_since": 1468236397,
       "user": {
         "type": "user",
         "id": "57b45bfef436c8d78611111"
@@ -69,6 +71,7 @@
       "id": "5143511111",
       "created_at": 1466703132,
       "updated_at": 1468236397,
+      "waiting_since": 1468236397,
       "user": {
         "type": "lead",
         "id": "576c1a139d0baad101001111"