Merge branch 'feature/standardize_identifier_data_type' into develop

Jericho · Jan 17, 2018 · 1a8fdf3 · 1a8fdf3
2 parents c10af36 + 28f874f
commit 1a8fdf3
Show file tree

Hide file tree

Showing 24 changed files with 38 additions and 38 deletions.
diff --git a/Source/StrongGrid/Models/CustomFieldMetadata.cs b/Source/StrongGrid/Models/CustomFieldMetadata.cs
@@ -15,6 +15,6 @@ public class CustomFieldMetadata : FieldMetadata
 		/// The identifier.
 		/// </value>
 		[JsonProperty("id", NullValueHandling = NullValueHandling.Ignore)]
-		public int Id { get; set; }
+		public long Id { get; set; }
 	}
 }
diff --git a/Source/StrongGrid/Models/Field.cs b/Source/StrongGrid/Models/Field.cs
@@ -14,7 +14,7 @@ public class Field
 		/// The identifier.
 		/// </value>
 		[JsonProperty("id", NullValueHandling = NullValueHandling.Ignore)]
-		public int Id { get; set; }
+		public long Id { get; set; }
 
 		/// <summary>
 		/// Gets or sets the name.

diff --git a/Source/StrongGrid/Models/Subuser.cs b/Source/StrongGrid/Models/Subuser.cs
@@ -14,7 +14,7 @@ public class Subuser
 		/// The id.
 		/// </value>
 		[JsonProperty("id", NullValueHandling = NullValueHandling.Ignore)]
-		public int Id { get; set; }
+		public long Id { get; set; }
 
 		/// <summary>
 		/// Gets or sets the username.

diff --git a/Source/StrongGrid/Models/Suppression.cs b/Source/StrongGrid/Models/Suppression.cs
@@ -25,7 +25,7 @@ public class Suppression
 		/// The group id.
 		/// </value>
 		[JsonProperty("group_id", NullValueHandling = NullValueHandling.Ignore)]
-		public int GroupId { get; set; }
+		public long GroupId { get; set; }
 
 		/// <summary>
 		/// Gets or sets the name of the suppression group.

diff --git a/Source/StrongGrid/Models/SuppressionGroup.cs b/Source/StrongGrid/Models/SuppressionGroup.cs
@@ -15,7 +15,7 @@ public class SuppressionGroup
 		/// The identifier.
 		/// </value>
 		[JsonProperty("id", NullValueHandling = NullValueHandling.Ignore)]
-		public int Id { get; set; }
+		public long Id { get; set; }
 
 		/// <summary>
 		/// Gets or sets the name.

diff --git a/Source/StrongGrid/Models/UnsubscribeOptions.cs b/Source/StrongGrid/Models/UnsubscribeOptions.cs
@@ -14,7 +14,7 @@ public class UnsubscribeOptions
 		/// The group identifier.
 		/// </value>
 		[JsonProperty("group_id", NullValueHandling = NullValueHandling.Ignore)]
-		public int GroupId { get; set; }
+		public long GroupId { get; set; }
 
 		/// <summary>
 		/// Gets or sets the groups to display.

diff --git a/Source/StrongGrid/Models/Webhooks/ClickEvent.cs b/Source/StrongGrid/Models/Webhooks/ClickEvent.cs
@@ -34,7 +34,7 @@ public class ClickEvent : EngagementEvent
 		/// The asm group identifier.
 		/// </value>
 		[JsonProperty("asm_group_id", NullValueHandling = NullValueHandling.Ignore)]
-		public int AsmGroupId { get; set; }
+		public long AsmGroupId { get; set; }
 
 		/// <summary>
 		/// Gets or sets the newsletter.

diff --git a/Source/StrongGrid/Models/Webhooks/DeferredEvent.cs b/Source/StrongGrid/Models/Webhooks/DeferredEvent.cs
@@ -33,7 +33,7 @@ public class DeferredEvent : DeliveryEvent
 		/// The asm group identifier.
 		/// </value>
 		[JsonProperty("asm_group_id", NullValueHandling = NullValueHandling.Ignore)]
-		public int AsmGroupId { get; set; }
+		public long AsmGroupId { get; set; }
 
 		/// <summary>
 		/// Gets or sets the newsletter.

diff --git a/Source/StrongGrid/Models/Webhooks/DeliveredEvent.cs b/Source/StrongGrid/Models/Webhooks/DeliveredEvent.cs
@@ -24,7 +24,7 @@ public class DeliveredEvent : DeliveryEvent
 		/// The asm group identifier.
 		/// </value>
 		[JsonProperty("asm_group_id", NullValueHandling = NullValueHandling.Ignore)]
-		public int AsmGroupId { get; set; }
+		public long AsmGroupId { get; set; }
 
 		/// <summary>
 		/// Gets or sets the newsletter.

diff --git a/Source/StrongGrid/Models/Webhooks/Event.cs b/Source/StrongGrid/Models/Webhooks/Event.cs
@@ -115,7 +115,7 @@ public class Event
 		/// Gets or sets the user identifier.
 		/// </summary>
 		/// <value>
-		/// Theuser identifier.
+		/// The user identifier.
 		/// </value>
 		[JsonProperty("sg_user_id", NullValueHandling = NullValueHandling.Ignore)]
 		public long? UserId { get; set; }

diff --git a/Source/StrongGrid/Models/Webhooks/GroupResubscribeEvent.cs b/Source/StrongGrid/Models/Webhooks/GroupResubscribeEvent.cs
@@ -16,6 +16,6 @@ public class GroupResubscribeEvent : EngagementEvent
 		/// The asm group identifier.
 		/// </value>
 		[JsonProperty("asm_group_id", NullValueHandling = NullValueHandling.Ignore)]
-		public int AsmGroupId { get; set; }
+		public long AsmGroupId { get; set; }
 	}
 }
diff --git a/Source/StrongGrid/Models/Webhooks/GroupUnsubscribeEvent.cs b/Source/StrongGrid/Models/Webhooks/GroupUnsubscribeEvent.cs
@@ -16,6 +16,6 @@ public class GroupUnsubscribeEvent : EngagementEvent
 		/// The asm group identifier.
 		/// </value>
 		[JsonProperty("asm_group_id", NullValueHandling = NullValueHandling.Ignore)]
-		public int AsmGroupId { get; set; }
+		public long AsmGroupId { get; set; }
 	}
 }
diff --git a/Source/StrongGrid/Models/Webhooks/OpenEvent.cs b/Source/StrongGrid/Models/Webhooks/OpenEvent.cs
@@ -16,7 +16,7 @@ public class OpenEvent : EngagementEvent
 		/// The asm group identifier.
 		/// </value>
 		[JsonProperty("asm_group_id", NullValueHandling = NullValueHandling.Ignore)]
-		public int AsmGroupId { get; set; }
+		public long AsmGroupId { get; set; }
 
 		/// <summary>
 		/// Gets or sets the newsletter.

diff --git a/Source/StrongGrid/Models/Webhooks/ProcessedEvent.cs b/Source/StrongGrid/Models/Webhooks/ProcessedEvent.cs
@@ -17,7 +17,7 @@ public class ProcessedEvent : DeliveryEvent
 		/// The asm group identifier.
 		/// </value>
 		[JsonProperty("asm_group_id", NullValueHandling = NullValueHandling.Ignore)]
-		public int AsmGroupId { get; set; }
+		public long AsmGroupId { get; set; }
 
 		/// <summary>
 		/// Gets or sets the newsletter.

diff --git a/Source/StrongGrid/Models/Webhooks/SpamReportEvent.cs b/Source/StrongGrid/Models/Webhooks/SpamReportEvent.cs
@@ -15,6 +15,6 @@ public class SpamReportEvent : EngagementEvent
 		/// The asm group identifier.
 		/// </value>
 		[JsonProperty("asm_group_id", NullValueHandling = NullValueHandling.Ignore)]
-		public int AsmGroupId { get; set; }
+		public long AsmGroupId { get; set; }
 	}
 }
diff --git a/Source/StrongGrid/Models/Webhooks/UnsubscribeEvent.cs b/Source/StrongGrid/Models/Webhooks/UnsubscribeEvent.cs
@@ -16,6 +16,6 @@ public class UnsubscribeEvent : EngagementEvent
 		/// The asm group identifier.
 		/// </value>
 		[JsonProperty("asm_group_id", NullValueHandling = NullValueHandling.Ignore)]
-		public int AsmGroupId { get; set; }
+		public long AsmGroupId { get; set; }
 	}
 }
diff --git a/Source/StrongGrid/Resources/Contacts.cs b/Source/StrongGrid/Resources/Contacts.cs
@@ -256,7 +256,7 @@ public Task<long> GetTotalCountAsync(string onBehalfOf = null, CancellationToken
 		/// <returns>
 		/// An array of <see cref="Contact" />.
 		/// </returns>
-		public Task<Contact[]> SearchAsync(IEnumerable<SearchCondition> conditions, int? listId = null, string onBehalfOf = null, CancellationToken cancellationToken = default(CancellationToken))
+		public Task<Contact[]> SearchAsync(IEnumerable<SearchCondition> conditions, long? listId = null, string onBehalfOf = null, CancellationToken cancellationToken = default(CancellationToken))
 		{
 			var data = new JObject();
 			if (listId.HasValue) data.Add("list_id", listId.Value);

diff --git a/Source/StrongGrid/Resources/CustomFields.cs b/Source/StrongGrid/Resources/CustomFields.cs
@@ -78,7 +78,7 @@ public Task<CustomFieldMetadata[]> GetAllAsync(string onBehalfOf = null, Cancell
 		/// <returns>
 		/// The <see cref="CustomFieldMetadata">metadata</see> about the field.
 		/// </returns>
-		public Task<CustomFieldMetadata> GetAsync(int fieldId, string onBehalfOf = null, CancellationToken cancellationToken = default(CancellationToken))
+		public Task<CustomFieldMetadata> GetAsync(long fieldId, string onBehalfOf = null, CancellationToken cancellationToken = default(CancellationToken))
 		{
 			return _client
 				.GetAsync($"{_endpoint}/{fieldId}")
@@ -96,7 +96,7 @@ public Task<CustomFieldMetadata> GetAsync(int fieldId, string onBehalfOf = null,
 		/// <returns>
 		/// The async task.
 		/// </returns>
-		public Task DeleteAsync(int fieldId, string onBehalfOf = null, CancellationToken cancellationToken = default(CancellationToken))
+		public Task DeleteAsync(long fieldId, string onBehalfOf = null, CancellationToken cancellationToken = default(CancellationToken))
 		{
 			return _client
 				.DeleteAsync($"{_endpoint}/{fieldId}")

diff --git a/Source/StrongGrid/Resources/IContacts.cs b/Source/StrongGrid/Resources/IContacts.cs
@@ -142,7 +142,7 @@ public interface IContacts
 		/// <returns>
 		/// An array of <see cref="Contact" />.
 		/// </returns>
-		Task<Contact[]> SearchAsync(IEnumerable<SearchCondition> conditions, int? listId = null, string onBehalfOf = null, CancellationToken cancellationToken = default(CancellationToken));
+		Task<Contact[]> SearchAsync(IEnumerable<SearchCondition> conditions, long? listId = null, string onBehalfOf = null, CancellationToken cancellationToken = default(CancellationToken));
 
 		/// <summary>
 		/// Retrieve the lists that a recipient is on.

diff --git a/Source/StrongGrid/Resources/ICustomFields.cs b/Source/StrongGrid/Resources/ICustomFields.cs
@@ -41,7 +41,7 @@ public interface ICustomFields
 		/// <returns>
 		/// The <see cref="CustomFieldMetadata">metadata</see> about the field.
 		/// </returns>
-		Task<CustomFieldMetadata> GetAsync(int fieldId, string onBehalfOf = null, CancellationToken cancellationToken = default(CancellationToken));
+		Task<CustomFieldMetadata> GetAsync(long fieldId, string onBehalfOf = null, CancellationToken cancellationToken = default(CancellationToken));
 
 		/// <summary>
 		/// Delete a custom field.
@@ -52,7 +52,7 @@ public interface ICustomFields
 		/// <returns>
 		/// The async task.
 		/// </returns>
-		Task DeleteAsync(int fieldId, string onBehalfOf = null, CancellationToken cancellationToken = default(CancellationToken));
+		Task DeleteAsync(long fieldId, string onBehalfOf = null, CancellationToken cancellationToken = default(CancellationToken));
 
 		/// <summary>
 		/// Retrieve the reserved fields.

diff --git a/Source/StrongGrid/Resources/ISuppressions.cs b/Source/StrongGrid/Resources/ISuppressions.cs
@@ -44,7 +44,7 @@ public interface ISuppressions
 		/// <returns>
 		/// An array of string representing the email addresses
 		/// </returns>
-		Task<string[]> GetUnsubscribedAddressesAsync(int groupId, string onBehalfOf = null, CancellationToken cancellationToken = default(CancellationToken));
+		Task<string[]> GetUnsubscribedAddressesAsync(long groupId, string onBehalfOf = null, CancellationToken cancellationToken = default(CancellationToken));
 
 		/// <summary>
 		/// Add recipient address to the suppressions list for a given group.
@@ -57,7 +57,7 @@ public interface ISuppressions
 		/// <returns>
 		/// The async task.
 		/// </returns>
-		Task AddAddressToUnsubscribeGroupAsync(int groupId, string email, string onBehalfOf = null, CancellationToken cancellationToken = default(CancellationToken));
+		Task AddAddressToUnsubscribeGroupAsync(long groupId, string email, string onBehalfOf = null, CancellationToken cancellationToken = default(CancellationToken));
 
 		/// <summary>
 		/// Add recipient addresses to the suppressions list for a given group.
@@ -70,7 +70,7 @@ public interface ISuppressions
 		/// <returns>
 		/// The async task.
 		/// </returns>
-		Task AddAddressToUnsubscribeGroupAsync(int groupId, IEnumerable<string> emails, string onBehalfOf = null, CancellationToken cancellationToken = default(CancellationToken));
+		Task AddAddressToUnsubscribeGroupAsync(long groupId, IEnumerable<string> emails, string onBehalfOf = null, CancellationToken cancellationToken = default(CancellationToken));
 
 		/// <summary>
 		/// Delete a recipient email from the suppressions list for a group.
@@ -82,7 +82,7 @@ public interface ISuppressions
 		/// <returns>
 		/// The async task.
 		/// </returns>
-		Task RemoveAddressFromSuppressionGroupAsync(int groupId, string email, string onBehalfOf = null, CancellationToken cancellationToken = default(CancellationToken));
+		Task RemoveAddressFromSuppressionGroupAsync(long groupId, string email, string onBehalfOf = null, CancellationToken cancellationToken = default(CancellationToken));
 
 		/// <summary>
 		/// Check if a recipient address is in the given suppression group.
@@ -94,6 +94,6 @@ public interface ISuppressions
 		/// <returns>
 		///   <c>true</c> if the email address is in the global suppression group; otherwise, <c>false</c>.
 		/// </returns>
-		Task<bool> IsSuppressedAsync(int groupId, string email, string onBehalfOf = null, CancellationToken cancellationToken = default(CancellationToken));
+		Task<bool> IsSuppressedAsync(long groupId, string email, string onBehalfOf = null, CancellationToken cancellationToken = default(CancellationToken));
 	}
 }
diff --git a/Source/StrongGrid/Resources/IUnsubscribeGroups.cs b/Source/StrongGrid/Resources/IUnsubscribeGroups.cs
@@ -44,7 +44,7 @@ public interface IUnsubscribeGroups
 		/// <returns>
 		/// The <see cref="SuppressionGroup" />.
 		/// </returns>
-		Task<SuppressionGroup> GetAsync(int groupId, string onBehalfOf = null, CancellationToken cancellationToken = default(CancellationToken));
+		Task<SuppressionGroup> GetAsync(long groupId, string onBehalfOf = null, CancellationToken cancellationToken = default(CancellationToken));
 
 		/// <summary>
 		/// Create a new suppression group.
@@ -70,7 +70,7 @@ public interface IUnsubscribeGroups
 		/// <returns>
 		/// The <see cref="SuppressionGroup" />.
 		/// </returns>
-		Task<SuppressionGroup> UpdateAsync(int groupId, Parameter<string> name = default(Parameter<string>), Parameter<string> description = default(Parameter<string>), string onBehalfOf = null, CancellationToken cancellationToken = default(CancellationToken));
+		Task<SuppressionGroup> UpdateAsync(long groupId, Parameter<string> name = default(Parameter<string>), Parameter<string> description = default(Parameter<string>), string onBehalfOf = null, CancellationToken cancellationToken = default(CancellationToken));
 
 		/// <summary>
 		/// Delete a suppression group.
@@ -81,6 +81,6 @@ public interface IUnsubscribeGroups
 		/// <returns>
 		/// The async task.
 		/// </returns>
-		Task DeleteAsync(int groupId, string onBehalfOf = null, CancellationToken cancellationToken = default(CancellationToken));
+		Task DeleteAsync(long groupId, string onBehalfOf = null, CancellationToken cancellationToken = default(CancellationToken));
 	}
 }
diff --git a/Source/StrongGrid/Resources/Suppressions.cs b/Source/StrongGrid/Resources/Suppressions.cs
@@ -86,7 +86,7 @@ public async Task<SuppressionGroup[]> GetUnsubscribedGroupsAsync(string email, s
 		/// <returns>
 		/// An array of string representing the email addresses
 		/// </returns>
-		public Task<string[]> GetUnsubscribedAddressesAsync(int groupId, string onBehalfOf = null, CancellationToken cancellationToken = default(CancellationToken))
+		public Task<string[]> GetUnsubscribedAddressesAsync(long groupId, string onBehalfOf = null, CancellationToken cancellationToken = default(CancellationToken))
 		{
 			return _client
 				.GetAsync($"{_endpoint}/groups/{groupId}/suppressions")
@@ -106,7 +106,7 @@ public Task<string[]> GetUnsubscribedAddressesAsync(int groupId, string onBehalf
 		/// <returns>
 		/// The async task.
 		/// </returns>
-		public Task AddAddressToUnsubscribeGroupAsync(int groupId, string email, string onBehalfOf = null, CancellationToken cancellationToken = default(CancellationToken))
+		public Task AddAddressToUnsubscribeGroupAsync(long groupId, string email, string onBehalfOf = null, CancellationToken cancellationToken = default(CancellationToken))
 		{
 			return AddAddressToUnsubscribeGroupAsync(groupId, new[] { email }, onBehalfOf, cancellationToken);
 		}
@@ -122,7 +122,7 @@ public Task AddAddressToUnsubscribeGroupAsync(int groupId, string email, string
 		/// <returns>
 		/// The async task.
 		/// </returns>
-		public Task AddAddressToUnsubscribeGroupAsync(int groupId, IEnumerable<string> emails, string onBehalfOf = null, CancellationToken cancellationToken = default(CancellationToken))
+		public Task AddAddressToUnsubscribeGroupAsync(long groupId, IEnumerable<string> emails, string onBehalfOf = null, CancellationToken cancellationToken = default(CancellationToken))
 		{
 			var data = new JObject(new JProperty("recipient_emails", JArray.FromObject(emails.ToArray())));
 			return _client
@@ -143,7 +143,7 @@ public Task AddAddressToUnsubscribeGroupAsync(int groupId, IEnumerable<string> e
 		/// <returns>
 		/// The async task.
 		/// </returns>
-		public Task RemoveAddressFromSuppressionGroupAsync(int groupId, string email, string onBehalfOf = null, CancellationToken cancellationToken = default(CancellationToken))
+		public Task RemoveAddressFromSuppressionGroupAsync(long groupId, string email, string onBehalfOf = null, CancellationToken cancellationToken = default(CancellationToken))
 		{
 			return _client
 				.DeleteAsync($"{_endpoint}/groups/{groupId}/suppressions/{email}")
@@ -162,7 +162,7 @@ public Task RemoveAddressFromSuppressionGroupAsync(int groupId, string email, st
 		/// <returns>
 		///   <c>true</c> if the email address is in the global suppression group; otherwise, <c>false</c>.
 		/// </returns>
-		public async Task<bool> IsSuppressedAsync(int groupId, string email, string onBehalfOf = null, CancellationToken cancellationToken = default(CancellationToken))
+		public async Task<bool> IsSuppressedAsync(long groupId, string email, string onBehalfOf = null, CancellationToken cancellationToken = default(CancellationToken))
 		{
 			var data = new JObject
 			{

diff --git a/Source/StrongGrid/Resources/UnsubscribeGroups.cs b/Source/StrongGrid/Resources/UnsubscribeGroups.cs
@@ -84,7 +84,7 @@ public Task<SuppressionGroup[]> GetMultipleAsync(IEnumerable<int> groupIds, stri
 		/// <returns>
 		/// The <see cref="SuppressionGroup" />.
 		/// </returns>
-		public Task<SuppressionGroup> GetAsync(int groupId, string onBehalfOf = null, CancellationToken cancellationToken = default(CancellationToken))
+		public Task<SuppressionGroup> GetAsync(long groupId, string onBehalfOf = null, CancellationToken cancellationToken = default(CancellationToken))
 		{
 			return _client
 				.GetAsync($"{_endpoint}/{groupId}")
@@ -131,7 +131,7 @@ public Task<SuppressionGroup> CreateAsync(string name, string description, bool
 		/// <returns>
 		/// The <see cref="SuppressionGroup" />.
 		/// </returns>
-		public Task<SuppressionGroup> UpdateAsync(int groupId, Parameter<string> name = default(Parameter<string>), Parameter<string> description = default(Parameter<string>), string onBehalfOf = null, CancellationToken cancellationToken = default(CancellationToken))
+		public Task<SuppressionGroup> UpdateAsync(long groupId, Parameter<string> name = default(Parameter<string>), Parameter<string> description = default(Parameter<string>), string onBehalfOf = null, CancellationToken cancellationToken = default(CancellationToken))
 		{
 			var data = new JObject();
 			if (name.HasValue) data.Add("name", name.Value);
@@ -154,7 +154,7 @@ public Task<SuppressionGroup> UpdateAsync(int groupId, Parameter<string> name =
 		/// <returns>
 		/// The async task.
 		/// </returns>
-		public Task DeleteAsync(int groupId, string onBehalfOf = null, CancellationToken cancellationToken = default(CancellationToken))
+		public Task DeleteAsync(long groupId, string onBehalfOf = null, CancellationToken cancellationToken = default(CancellationToken))
 		{
 			return _client
 				.DeleteAsync($"{_endpoint}/{groupId}")