Merge pull request #5 from jozsurf/master

GetUsers needs to support querystrings
jjb3rd · Aug 10, 2015 · f5460f6 · f5460f6
2 parents a58c335 + ebf3dd9
commit f5460f6
Showing 1 changed file with 29 additions and 11 deletions.
diff --git a/Freshdesk/FreshdeskService.cs b/Freshdesk/FreshdeskService.cs
@@ -31,7 +31,6 @@
 using System.Linq;
 using System.Net;
 using System.Text;
-using System.Threading.Tasks;
 
 namespace Freshdesk
 {
@@ -218,12 +217,16 @@ protected virtual string DoMultipartFormRequest(Uri uri, object body, IEnumerabl
             return GetResponseAsString(response);
         }
 
-        protected virtual Uri UriForPath(string path)
-        {
-            UriBuilder uriBuilder = new UriBuilder(this.ApiUri);
-            uriBuilder.Path = path;
-            return uriBuilder.Uri;
-        }
+		protected virtual Uri UriForPath(string path, string query = null)
+		{
+			UriBuilder uriBuilder = new UriBuilder(this.ApiUri);
+			uriBuilder.Path = path;
+			if (!string.IsNullOrEmpty(query))
+			{
+				uriBuilder.Query = query;
+			}
+			return uriBuilder.Uri;
+		}
 
         private static Dictionary<string, string> GetStringsContent(object instance)
         {
@@ -396,10 +399,25 @@ public void UpdateUser(UpdateUserRequest updateUserRequest, long id)
         /// Get users
         /// </summary>
         /// <returns></returns>
-        public IEnumerable<GetUserRequest> GetUsers()
-        {
-            return DoRequest<IEnumerable<GetUserRequest>>(UriForPath("/contacts.json"));
-        }
+		public IEnumerable<GetUserRequest> GetUsers()
+		{
+			var users = new List<GetUserRequest>();
+			var page = 1;
+			while (true)
+			{
+				var paginatedUsers = DoRequest<IEnumerable<GetUserRequest>>(UriForPath("/contacts.json", string.Format("page={0}", page))).ToList();
+				if (paginatedUsers.Any())
+				{
+					users.AddRange(paginatedUsers);
+					page++;
+				}
+				else
+				{
+					break;
+				}
+			}
+			return users;
+		}
 
 
         #endregion