fix some minor issues

lvermeulen · Apr 27, 2019 · bfcf039 · bfcf039
1 parent 9121ba3
commit bfcf039
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 38 deletions.
diff --git a/src/JiraServiceDesk.Net/Customer/JiraServiceDeskClient.cs b/src/JiraServiceDesk.Net/Customer/JiraServiceDeskClient.cs
@@ -1,6 +1,6 @@
 using System.Threading.Tasks;
 using Flurl.Http;
-using JiraServiceDesk.Net.Models.Customer;
+using JiraServiceDesk.Net.Models.Common;
 
 namespace JiraServiceDesk.Net
 {
@@ -9,7 +9,7 @@ public partial class JiraServiceDeskClient
         private IFlurlRequest GetCustomerUrl() => GetBaseUrl()
             .AppendPathSegment("/customer");
 
-        public async Task<Customer> CreateCustomerAsync(string email, string fullName)
+        public async Task<User> CreateCustomerAsync(string email, string fullName)
         {
             var data = new
             {
@@ -21,7 +21,7 @@ public async Task<Customer> CreateCustomerAsync(string email, string fullName)
                 .PostJsonAsync(data)
                 .ConfigureAwait(false);
 
-            return await HandleResponseAsync<Customer>(response).ConfigureAwait(false);
+            return await HandleResponseAsync<User>(response).ConfigureAwait(false);
         }
     }
 }
diff --git a/src/JiraServiceDesk.Net/Models/Common/PagedResults.cs b/src/JiraServiceDesk.Net/Models/Common/PagedResults.cs
@@ -1,11 +1,16 @@
 using System.Collections.Generic;
+using Newtonsoft.Json;
 
 namespace JiraServiceDesk.Net.Models.Common
 {
-    public class PagedResults<T> : PagedResultsBase
+    public class PagedResults<T>
     {
+        [JsonProperty("_expands")]
+        public List<string> Expands { get; set; }
+        public int Start { get; set; }
         public int Limit { get; set; }
+        public int Size { get; set; }
+        public bool IsLastPage { get; set; }
         public List<T> Values { get; set; }
-        public int? NextPageStart { get; set; }
     }
 }
diff --git a/src/JiraServiceDesk.Net/Models/Common/PagedResultsBase.cs b/src/JiraServiceDesk.Net/Models/Common/PagedResultsBase.cs
diff --git a/src/JiraServiceDesk.Net/Models/Customer/Customer.cs b/src/JiraServiceDesk.Net/Models/Customer/Customer.cs
diff --git a/src/JiraServiceDesk.Net/Organization/JiraServiceDeskClient.cs b/src/JiraServiceDesk.Net/Organization/JiraServiceDeskClient.cs
@@ -85,7 +85,7 @@ public async Task<PagedResults<User>> AddUsersToOrganizationAsync(string id, IEn
         {
             var data = new
             {
-                usernames = userNames
+                usernames = string.Join(",", userNames)
             };
 
             var response = await GetOrganizationUrl($"/{id}/user")

diff --git a/src/JiraServiceDesk.Net/ServiceDesk/JiraServiceDeskClient.cs b/src/JiraServiceDesk.Net/ServiceDesk/JiraServiceDeskClient.cs
@@ -87,11 +87,11 @@ await GetServiceDeskUrl(serviceDeskId)
                 .ConfigureAwait(false);
         }
 
-        public async Task<bool> AddServiceDeskOrganizationAsync(string serviceDeskId, int organizationId)
+        public async Task<bool> AddServiceDeskOrganizationAsync(string serviceDeskId, string organizationId)
         {
             var data = new
             {
-                organizationId
+                organizationId = int.Parse(organizationId)
             };
 
             var response = await GetServiceDeskUrl(serviceDeskId)
@@ -102,11 +102,11 @@ public async Task<bool> AddServiceDeskOrganizationAsync(string serviceDeskId, in
             return await HandleResponseAsync(response).ConfigureAwait(false);
         }
 
-        public async Task<bool> RemoveServiceDeskOrganizationAsync(string serviceDeskId, int organizationId)
+        public async Task<bool> RemoveServiceDeskOrganizationAsync(string serviceDeskId, string organizationId)
         {
             var data = new
             {
-                organizationId
+                organizationId = int.Parse(organizationId)
             };
 
             var response = await GetServiceDeskUrl(serviceDeskId)