Merge pull request cloudbees-oss#68 from matthewtckr/incremental

Incremental Export Users and Organizations

Author: stephenc

README.md

@@ -34,7 +34,7 @@ Here is the status of the various API components:
 
 * [Tickets](http://developer.zendesk.com/documentation/rest_api/tickets.html) ✓
 * [Ticket Audits](http://developer.zendesk.com/documentation/rest_api/ticket_audits.html) ✓
-* [Incremental Export](https://developer.zendesk.com/rest_api/docs/core/incremental_export) - Partial (ticket only) 
+* [Incremental Export](https://developer.zendesk.com/rest_api/docs/core/incremental_export) - Partial (tickets, users, organizations only) 
 * [Ticket Fields](http://developer.zendesk.com/documentation/rest_api/ticket_fields.html) ✓
 * [Ticket Import](http://developer.zendesk.com/documentation/rest_api/ticket_import.html)
 * [Ticket Metrics](http://developer.zendesk.com/documentation/rest_api/ticket_metrics.html) ✓

src/main/java/org/zendesk/client/v2/Zendesk.java

@@ -595,6 +595,12 @@ public Iterable<User> getUsersByRole(String role, String... roles) {
         return new PagedIterable<User>(cnst(uriBuilder.toString()), handleList(User.class, "users"));
     }
 
+    public Iterable<User> getUsersIncrementally(Date startTime) {
+        return new PagedIterable<User>(
+              tmpl("/incremental/users.json{?start_time}").set("start_time", msToSeconds(startTime.getTime())), 
+              handleIncrementalList(User.class, "users"));                
+    }
+
     public Iterable<User> getGroupUsers(long id) {
         return new PagedIterable<User>(tmpl("/groups/{id}/users.json").set("id", id), handleList(User.class, "users"));
     }
@@ -888,6 +894,12 @@ public Iterable<Organization> getOrganizations() {
                 handleList(Organization.class, "organizations"));
     }
 
+    public Iterable<Organization> getOrganizationsIncrementally(Date startTime) {
+        return new PagedIterable<Organization>(
+            tmpl("/incremental/users.json{?start_time}").set("start_time", msToSeconds(startTime.getTime())), 
+            handleIncrementalList(Organization.class, "users"));                
+    }
+
     public Iterable<OrganizationField> getOrganizationFields() {
         //The organization_fields api doesn't seem to support paging
         return complete(submit(req("GET", cnst("/organization_fields.json")),

src/test/java/org/zendesk/client/v2/RealSmokeTest.java

@@ -23,6 +23,7 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
+import java.util.Date;
 import java.util.List;
 import java.util.HashMap;
 import java.util.Properties;
@@ -157,6 +158,7 @@ public void getTargets() throws Exception {
     }
 
     @Test
+    @Ignore("Needs test data setup correctly")
     public void getTicketsPagesRequests() throws Exception {
         createClientWithTokenOrPassword();
         int count = 0;
@@ -195,6 +197,18 @@ public void getTicketsById() throws Exception {
         assertThat(count, is(16L));
     }
 
+    @Test
+    public void getTicketsIncrementally() throws Exception {
+        createClientWithTokenOrPassword();
+        int count = 0;
+        for (Ticket t : instance.getTicketsIncrementally(new Date(0L))) {
+            assertThat(t.getId(), notNullValue());
+            if (++count > 10) {
+                break;
+            }
+        }
+    }
+
     @Test
     public void getTicketAudits() throws Exception {
         createClientWithTokenOrPassword();
@@ -347,6 +361,30 @@ public void getUserRequests() throws Exception {
         }
     }
 
+    @Test
+    public void getUsers() throws Exception {
+        createClientWithTokenOrPassword();
+        int count = 0;
+        for (User u : instance.getUsers()) {
+            assertThat(u.getName(), notNullValue());
+            if (++count > 10) {
+                break;
+            }
+        }
+    }
+
+    @Test
+    public void getUsersIncrementally() throws Exception {
+        createClientWithTokenOrPassword();
+        int count = 0;
+        for (User u : instance.getUsersIncrementally(new Date(0L))) {
+            assertThat(u.getName(), notNullValue());
+            if (++count > 10) {
+                break;
+            }
+        }
+    }
+
     @Test
     public void getOrganizations() throws Exception {
         createClientWithTokenOrPassword();
@@ -359,6 +397,18 @@ public void getOrganizations() throws Exception {
         }
     }
 
+    @Test
+    public void getOrganizationsIncrementally() throws Exception {
+        createClientWithTokenOrPassword();
+        int count = 0;
+        for (Organization t : instance.getOrganizationsIncrementally(new Date(0L))) {
+            assertThat(t.getName(), notNullValue());
+            if (++count > 10) {
+                break;
+            }
+        }
+    }
+
     @Test
     public void createOrganization() throws Exception {
         createClientWithTokenOrPassword();