Merge pull request #56 from egaiter/master

Fix to allow Bulk Activity errors to be serialized
constantcontact · Sep 11, 2015 · b74bdcd · b74bdcd
2 parents 81fe724 + 323ba1a
commit b74bdcd
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 49 deletions.
diff --git a/CTCTWrapper/CTCTWrapper.csproj b/CTCTWrapper/CTCTWrapper.csproj
@@ -70,7 +70,6 @@
     <Compile Include="Components\AccountService\OrganizationAddresses.cs" />
     <Compile Include="Components\AccountService\AccountSummaryInformation.cs" />
     <Compile Include="Components\Activities\Activity.cs" />
-    <Compile Include="Components\Activities\ActivityError.cs" />
     <Compile Include="Components\Activities\AddContacts.cs" />
     <Compile Include="Components\Activities\AddContactsImportData.cs" />
     <Compile Include="Components\Activities\ClearContactList.cs" />

diff --git a/CTCTWrapper/Components/Activities/Activity.cs b/CTCTWrapper/Components/Activities/Activity.cs
@@ -15,10 +15,10 @@ namespace CTCT.Components.Activities
     public class Activity : Component
     {
         [DataMember(Name = "warnings")]
-        private List<ActivityError> _Warnings = new List<ActivityError>();
+        private List<string> _Warnings = new List<string>();
 
         [DataMember(Name = "errors")]
-        private List<ActivityError> _Errors = new List<ActivityError>();
+        private List<string> _Errors = new List<string>();
 
         /// <summary>
         /// Activity id.
@@ -104,7 +104,7 @@ public DateTime? CreatedDate
         /// <summary>
         /// Gets or sets the error list.
         /// </summary>
-        public IList<ActivityError> Errors
+        public IList<string> Errors
         {
             get
             {
@@ -119,7 +119,7 @@ public IList<ActivityError> Errors
         /// <summary>
         /// Gets or sets the warning list.
         /// </summary>
-        public IList<ActivityError> Warnings
+        public IList<string> Warnings
         {
             get
             {

diff --git a/CTCTWrapper/Components/Activities/ActivityError.cs b/CTCTWrapper/Components/Activities/ActivityError.cs
diff --git a/CTCTWrapper/Components/Activities/StatusReport.cs b/CTCTWrapper/Components/Activities/StatusReport.cs
@@ -18,10 +18,10 @@ namespace CTCT.Components.BulkStatus
     public class StatusReport : Component
     {
         [DataMember(Name = "warnings", EmitDefaultValue = false)]
-        private List<ActivityError> _Warnings = new List<ActivityError>();
+        private List<string> _Warnings = new List<string>();
 
         [DataMember(Name = "errors", EmitDefaultValue = false)]
-        private List<ActivityError> _Errors = new List<ActivityError>();
+        private List<string> _Errors = new List<string>();
 
         [DataMember(Name = "created_date", EmitDefaultValue = false)]
         private string CreatedDateString { get; set; }
@@ -155,7 +155,7 @@ public BulkActivityType Type
         /// <summary>
         /// Gets or sets the list of imported data.
         /// </summary>
-        public IList<ActivityError> Warnings
+        public IList<string> Warnings
         {
             get { return _Warnings; }
             set { _Warnings = value == null ? null : value.ToList(); }
@@ -164,7 +164,7 @@ public IList<ActivityError> Warnings
         /// <summary>
         /// Gets or sets a lists errors that occurred (up to the first 100) when the activity ran 
         /// </summary>
-        public IList<ActivityError> Errors
+        public IList<string> Errors
         {
             get { return _Errors; }
             set { _Errors = value == null ? null : value.ToList(); }

diff --git a/CTCTWrapper/Properties/AssemblyInfo.cs b/CTCTWrapper/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.4.0.0")]
-[assembly: AssemblyFileVersion("2.4.0.0")]
+[assembly: AssemblyVersion("2.4.1.0")]
+[assembly: AssemblyFileVersion("2.4.1.0")]
diff --git a/CTCTWrapper/app.config b/CTCTWrapper/app.config
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <configSections>
-    <sectionGroup name="applicationSettings" type="System.Configuration.ApplicationSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" >
+    <sectionGroup name="applicationSettings" type="System.Configuration.ApplicationSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
       <section name="CTCT.Settings.ActivitiesColumns" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
       <section name="CTCT.Settings.Login" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
       <section name="CTCT.Settings.Endpoints" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
     </sectionGroup>
   </configSections>
   <appSettings>
-    <add key="APIKey" value="APIkey"/>
-    <add key="RedirectURL" value="http://www.constantcontact.com/index.jsp"/>
-    <add key="ClientSecret" value="API_key_secret"/>
+    <add key="APIKey" value="APIkey" />
+    <add key="RedirectURL" value="http://www.constantcontact.com/index.jsp" />
+    <add key="ClientSecret" value="API_key_secret" />
   </appSettings>
   <applicationSettings>
     <CTCT.Settings.ActivitiesColumns>
@@ -289,5 +289,5 @@
         <value>emailmarketing/campaigns/{0}/preview</value>
       </setting>
     </CTCT.Settings.Endpoints>
-</applicationSettings>
+  </applicationSettings>
 </configuration>