Adding support for pagination in GetUsersInOrganization in the Users … (

Speedygeek#325) * Adding support for pagination in GetUsersInOrganization in the Users request. * added unit test for GetAllUsersInOrganization as a paginated call
abc516 · Mar 12, 2018 · 469966e · 469966e
1 parent cb8d7d5
commit 469966e
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 7 deletions.
diff --git a/src/ZendeskApi_v2/Requests/Users.cs b/src/ZendeskApi_v2/Requests/Users.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using ZendeskApi_v2.Extensions;
 
@@ -62,7 +62,7 @@ public interface IUsers : ICore
 
         GroupUserResponse GetUsersInGroup(long id);
 
-        GroupUserResponse GetUsersInOrganization(long id);
+        GroupUserResponse GetUsersInOrganization(long id, int? perPage = null, int? page = null, UserSideLoadOptions sideLoadOptions = UserSideLoadOptions.None);
 
         IndividualUserResponse CreateUser(User user);
 
@@ -138,7 +138,7 @@ public interface IUsers : ICore
 
         Task<GroupUserResponse> GetUsersInGroupAsync(long id);
 
-        Task<GroupUserResponse> GetUsersInOrganizationAsync(long id);
+        Task<GroupUserResponse> GetUsersInOrganizationAsync(long id, int? perPage = null, int? page = null, UserSideLoadOptions sideLoadOptions = UserSideLoadOptions.None);
 
         Task<IndividualUserResponse> CreateUserAsync(User user);
 
@@ -310,9 +310,10 @@ public GroupUserResponse GetUsersInGroup(long id)
             return GenericGet<GroupUserResponse>($"groups/{id}/users.json");
         }
 
-        public GroupUserResponse GetUsersInOrganization(long id)
+        public GroupUserResponse GetUsersInOrganization(long id, int? perPage = null, int? page = null, UserSideLoadOptions sideLoadOptions = UserSideLoadOptions.None)
         {
-            return GenericGet<GroupUserResponse>($"organizations/{id}/users.json");
+            var resource = GetResourceStringWithSideLoadOptionsParam($"organizations/{id}/users.json", sideLoadOptions);
+            return GenericPagedGet<GroupUserResponse>(resource, perPage, page);
         }
 
         public IndividualUserResponse CreateUser(User user)
@@ -523,9 +524,10 @@ public async Task<GroupUserResponse> GetUsersInGroupAsync(long id)
             return await GenericGetAsync<GroupUserResponse>($"groups/{id}/users.json");
         }
 
-        public async Task<GroupUserResponse> GetUsersInOrganizationAsync(long id)
+        public async Task<GroupUserResponse> GetUsersInOrganizationAsync(long id, int? perPage = null, int? page = null, UserSideLoadOptions sideLoadOptions = UserSideLoadOptions.None)
         {
-            return await GenericGetAsync<GroupUserResponse>($"organizations/{id}/users.json");
+            var resource = GetResourceStringWithSideLoadOptionsParam($"organizations/{id}/users.json", sideLoadOptions);
+            return await GenericPagedGetAsync<GroupUserResponse>(resource, perPage, page);
         }
 
         public async Task<IndividualUserResponse> CreateUserAsync(User user)

diff --git a/test/ZendeskApi_v2.Test/UserTests.cs b/test/ZendeskApi_v2.Test/UserTests.cs
@@ -93,6 +93,13 @@ public void CanGetUsersInOrg()
             Assert.True(res.Count > 0);
         }
 
+        [Test]
+        public void CanGetUsersInOrgPaginated()
+        {
+            var res = api.Users.GetUsersInOrganization(Settings.OrganizationId, 100, 0);
+            Assert.True(res.Count > 0);
+        }
+
         [Test]
         public void CanCreateUpdateSuspendAndDeleteUser()
         {