Include Intercom ID in user updates

Author: bobjflong

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

@@ -91,7 +91,7 @@ static UserUpdate buildFrom(User user) {
             final UserUpdate userUpdate = new UserUpdate();
             userUpdate.userId = user.getUserId();
             userUpdate.email = user.getEmail();
-            // userUpdate.id = user.id; // bug: id is treated as custom attribute
+            userUpdate.id = user.getId();
             userUpdate.remoteCreatedAt = user.getRemoteCreatedAt();
             userUpdate.name = user.getName();
             userUpdate.lastSeenIp = user.getLastSeenIp();
@@ -108,6 +108,9 @@ static UserUpdate buildFrom(User user) {
         @JsonProperty("type")
         private final String type = "user";
 
+        @JsonProperty("id")
+        private String id;
+
         @JsonProperty("user_id")
         private String userId;
 
@@ -167,6 +170,10 @@ public String getType() {
             return type;
         }
 
+        public String getId() {
+            return id;
+        }
+
         public String getUserId() {
             return userId;
         }

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

@@ -26,6 +26,7 @@ public void TestUserUpdate() throws Exception {
         final long now = System.currentTimeMillis() / 1000;
         final User user = new User()
             .setEmail("wash@serenity.io")
+            .setId("54321")
             .setUserId("22")
             .setRemoteCreatedAt(now)
             .setName("Wash")
@@ -36,6 +37,7 @@ public void TestUserUpdate() throws Exception {
 
         final User.UserUpdate userUpdate = User.UserUpdate.buildFrom(user);
 
+        assertEquals("54321", userUpdate.getId());
         assertEquals("wash@serenity.io", userUpdate.getEmail());
         assertEquals("22", userUpdate.getUserId());
         assertEquals(now, userUpdate.getRemoteCreatedAt());
@@ -46,6 +48,20 @@ public void TestUserUpdate() throws Exception {
         assertEquals("user-agent", userUpdate.getLastSeenUserAgent());
     }
 
+    @Test
+    public void TestUserIncludesId() throws Exception {
+        final User user = new User();
+        user.setEmail("a@b.com");
+        user.setUserId("1");
+        user.setId("5432");
+        final String json = mapper.writeValueAsString(user);
+        final Map map = mapper.readValue(json, Map.class);
+        assertTrue(map.size() == 3);
+        assertTrue(map.containsKey("email"));
+        assertTrue(map.containsKey("user_id"));
+        assertTrue(map.containsKey("id"));
+    }
+
     @Test
     public void TestUserSerdesNullAndNotEmpty() throws Exception {
         final User user = new User();