From b573fb82494ac1a7fd883e06702147fc02edddd2 Mon Sep 17 00:00:00 2001
From: John Doyle <john.doyle@dovetail.ie>
Date: Tue, 16 Feb 2016 08:22:09 +0000
Subject: [PATCH 1/6] Added Groups functionality. Add/Delete Groups. Get
 Contacts from within a certain group. Add a contact to a group

---
 samples/Program.cs                        |  90 ++++++++++++-
 source/Constants.cs                       |   2 -
 source/EsendexCredentials.cs              |   6 -
 source/Properties/AssemblyInfo.cs         |   4 +-
 source/com.esendex.sdk.csproj             |  28 +---
 source/contacts/ContactCollection.cs      |  17 +++
 source/groups/Group.cs                    |  83 ++++++++++++
 source/groups/GroupCollection.cs          |  79 +++++++++++
 source/groups/GroupResponse.cs            |  11 ++
 source/groups/GroupService.cs             | 153 ++++++++++++++++++++++
 source/groups/IGroupService.cs            |  54 ++++++++
 source/groups/PagedGroupCollection.cs     |  30 +++++
 source/rest/resources/ContactsResource.cs |  16 +++
 source/rest/resources/GroupsResource.cs   |  64 +++++++++
 source/sent/SentMessage.cs                |   6 -
 test/com.esendex.sdk.test.csproj          |  13 --
 test/packages.config                      |   9 +-
 test/sent/SentServiceTests.cs             |  81 ------------
 18 files changed, 603 insertions(+), 143 deletions(-)
 create mode 100644 source/groups/Group.cs
 create mode 100644 source/groups/GroupCollection.cs
 create mode 100644 source/groups/GroupResponse.cs
 create mode 100644 source/groups/GroupService.cs
 create mode 100644 source/groups/IGroupService.cs
 create mode 100644 source/groups/PagedGroupCollection.cs
 create mode 100644 source/rest/resources/GroupsResource.cs

diff --git a/samples/Program.cs b/samples/Program.cs
index 3a1f457..9afb15d 100644
--- a/samples/Program.cs
+++ b/samples/Program.cs
@@ -1,6 +1,8 @@
 using System;
+using System.Linq;
 using System.Net;
 using com.esendex.sdk.contacts;
+using com.esendex.sdk.groups;
 using com.esendex.sdk.inbox;
 using com.esendex.sdk.messaging;
 using com.esendex.sdk.sent;
@@ -99,6 +101,16 @@ static void Main(string[] args)
             Console.WriteLine("Contacts Example\r\n");
             GetContactsExample(credentials);
 
+            Console.WriteLine();
+            Console.WriteLine("Groups Example\r\n");
+            GetGroupsExample(credentials);
+
+            Console.WriteLine();
+            Console.WriteLine("Contacts in Group Example\r\n");
+            GetContactsByGroupExample(credentials);
+
+            AddContacttoGroup(credentials);
+
             Console.WriteLine();
             Console.WriteLine("Press enter to continue ... ");
             Console.ReadLine();
@@ -106,16 +118,11 @@ static void Main(string[] args)
 
         private static void ShowUsage(OptionSet optionSet)
         {
-            Console.WriteLine(
-                @"
-Esendex .Net SDK Samples
-");
+            Console.WriteLine(@"Esendex .Net SDK Samples");
 
             optionSet.WriteOptionDescriptions(Console.Out);
 
-            Console.WriteLine(@"
-Enjoy...
-");
+            Console.WriteLine(@"Enjoy...");
         }
 
         private static void SendMessageExample(EsendexCredentials credentials)
@@ -223,5 +230,74 @@ private static void GetContactsExample(EsendexCredentials credentials)
                 Console.Write(ex.Message);
             }
         }
+
+        private static void GetGroupsExample(EsendexCredentials credentials)
+        {
+            var groupService = new GroupService(credentials);
+
+            try
+            {
+                var collection = groupService.GetGroups(_accountReference, PageIndex, PageSize);
+
+                foreach (var item in collection.Groups)
+                {
+                    Console.WriteLine("\tGroup Id:{0}\tName:{1}", item.Id, item.Name);
+                }
+            }
+            catch (WebException ex)
+            {
+                Console.Write(ex.Message);
+            }
+        }
+
+        private static void GetContactsByGroupExample(EsendexCredentials credentials)
+        {
+            var groupService = new GroupService(credentials);
+
+            try
+            {
+                var collection = groupService.GetGroups(_accountReference, PageIndex, PageSize);
+                var contacts = new PagedContactCollection();
+
+                var groupId = "";
+
+                foreach (var item in collection.Groups.Where(item => item.Name == "Test group"))
+                {
+                    groupId = item.Id.ToString();
+                    break;
+                }
+
+                if (groupId == "") return;
+
+                contacts = groupService.GetContactsFromGroup(_accountReference, groupId, 1, 15);
+
+                foreach (var item in contacts.Contacts)
+                {
+                    Console.WriteLine("\tContact Id:{0}\tNumber:{1}", item.Id, item.PhoneNumber);
+                }
+            }
+            catch (WebException ex)
+            {
+                Console.Write(ex.Message);
+            }
+        }
+
+        private static void AddContacttoGroup(EsendexCredentials credentials)
+        {
+            var groupService = new GroupService(credentials);
+            var contactService = new ContactService(credentials);
+
+            try
+            {
+                var guid = new Guid("6c5e0669-af2e-4682-85c1-bd97a45c590d");
+                var contact = contactService.GetContact(guid);
+                groupService.AddContactToGroup(_accountReference, "1c259623-00bf-4629-af38-b1f770b12634", contact);
+
+            }
+            catch (WebException ex)
+            {
+                Console.Write(ex.Message);
+            }
+        }
     }
 }
\ No newline at end of file
diff --git a/source/Constants.cs b/source/Constants.cs
index 1640987..5f633a4 100644
--- a/source/Constants.cs
+++ b/source/Constants.cs
@@ -12,7 +12,5 @@ internal static Uri API_URI
         {
             get { return api_uri ?? (api_uri = new UriBuilder("https", "api.esendex.com").Uri); }
         }
-
-        internal static string JSON_MEDIA_TYPE = "application/json; charset=utf-8";
     }
 }
\ No newline at end of file
diff --git a/source/EsendexCredentials.cs b/source/EsendexCredentials.cs
index c4bb109..e56c2ae 100644
--- a/source/EsendexCredentials.cs
+++ b/source/EsendexCredentials.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Net;
-using System.Text;
 
 namespace com.esendex.sdk
 {
@@ -105,10 +104,5 @@ private void SetProxy(IWebProxy proxy)
 
             WebProxy = proxy;
         }
-
-        internal string EncodedValue()
-        {
-            return Convert.ToBase64String(Encoding.UTF8.GetBytes(UseSessionAuthentication ? SessionId.Value.ToString() : Username + ":" + Password));
-        }
     }
 }
\ No newline at end of file
diff --git a/source/Properties/AssemblyInfo.cs b/source/Properties/AssemblyInfo.cs
index e542875..b70e176 100644
--- a/source/Properties/AssemblyInfo.cs
+++ b/source/Properties/AssemblyInfo.cs
@@ -36,7 +36,7 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 
-[assembly: AssemblyVersion("2.2.0")]
-[assembly: AssemblyFileVersion("2.2.0")]
+[assembly: AssemblyVersion("2.0.1")]
+[assembly: AssemblyFileVersion("2.0.1")]
 [assembly: InternalsVisibleTo("com.esendex.sdk.test")]
 [assembly: InternalsVisibleTo("DynamicProxyGenAssembly2")]
\ No newline at end of file
diff --git a/source/com.esendex.sdk.csproj b/source/com.esendex.sdk.csproj
index 76bc6fc..86e8dc5 100644
--- a/source/com.esendex.sdk.csproj
+++ b/source/com.esendex.sdk.csproj
@@ -25,8 +25,6 @@
     <UpgradeBackupLocation>
     </UpgradeBackupLocation>
     <OldToolsVersion>3.5</OldToolsVersion>
-    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -48,9 +46,6 @@
     <DocumentationFile>bin\Release\com.esendex.sdk.XML</DocumentationFile>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Newtonsoft.Json">
-      <HintPath>..\packages\Newtonsoft.Json.8.0.2\lib\net35\Newtonsoft.Json.dll</HintPath>
-    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core">
       <RequiredTargetFramework>3.5</RequiredTargetFramework>
@@ -67,8 +62,12 @@
     <Compile Include="core\CharacterSet.cs" />
     <Compile Include="core\MessageCollection.cs" />
     <Compile Include="core\PagedCollection.cs" />
-    <Compile Include="exceptions\BadRequestException.cs" />
-    <Compile Include="extensions\HttpWebResponseExtensions.cs" />
+    <Compile Include="groups\Group.cs" />
+    <Compile Include="groups\GroupCollection.cs" />
+    <Compile Include="groups\GroupResponse.cs" />
+    <Compile Include="groups\GroupService.cs" />
+    <Compile Include="groups\IGroupService.cs" />
+    <Compile Include="groups\PagedGroupCollection.cs" />
     <Compile Include="http\HttpClient.cs" />
     <Compile Include="http\HttpRequest.cs" />
     <Compile Include="http\HttpRequestHelper.cs" />
@@ -97,10 +96,8 @@
     <Compile Include="inbox\InboxService.cs" />
     <Compile Include="messaging\MessageBodyService.cs" />
     <Compile Include="messaging\VoiceMessageLanguage.cs" />
-    <Compile Include="models\requests\SurveysAddRecipientRequest.cs" />
-    <Compile Include="models\requests\SurveysAddRecipientsRequest.cs" />
-    <Compile Include="Request.cs" />
     <Compile Include="rest\resources\ContactsResource.cs" />
+    <Compile Include="rest\resources\GroupsResource.cs" />
     <Compile Include="rest\resources\InboxMessagesResource.cs" />
     <Compile Include="rest\resources\MessageHeadersResource.cs" />
     <Compile Include="core\IPagedCollection.cs" />
@@ -109,9 +106,6 @@
     <Compile Include="messaging\MessageCollection.cs" />
     <Compile Include="rest\resources\ResourceLinkResource.cs" />
     <Compile Include="rest\resources\SessionResource.cs" />
-    <Compile Include="sent\FailureReason.cs" />
-    <Compile Include="results\Error.cs" />
-    <Compile Include="results\SurveyResult.cs" />
     <Compile Include="sent\SentMessage.cs" />
     <Compile Include="messaging\SmsMessage.cs" />
     <Compile Include="messaging\SmsMessageCollection.cs" />
@@ -125,7 +119,6 @@
     <Compile Include="session\ISessionService.cs" />
     <Compile Include="session\EsendexSession.cs" />
     <Compile Include="session\SessionService.cs" />
-    <Compile Include="surveys\SurveysService.cs" />
     <Compile Include="utilities\ISerialiser.cs" />
     <Compile Include="rest\resources\MessageDispatcherResource.cs" />
     <Compile Include="rest\RestClient.cs" />
@@ -136,12 +129,6 @@
     <Compile Include="messaging\MessagingService.cs" />
     <Compile Include="ServiceBase.cs" />
   </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <Folder Include="builders\" />
-  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
@@ -154,5 +141,4 @@
     <PostBuildEvent>
     </PostBuildEvent>
   </PropertyGroup>
-  <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
 </Project>
\ No newline at end of file
diff --git a/source/contacts/ContactCollection.cs b/source/contacts/ContactCollection.cs
index e360e97..7983d12 100644
--- a/source/contacts/ContactCollection.cs
+++ b/source/contacts/ContactCollection.cs
@@ -30,6 +30,17 @@ public ContactCollection(Contact contact)
             Items.Add(contact);
         }
 
+        /// <summary>
+        /// Initialises a new instance of the com.esendex.sdk.contacts.ContactCollection
+        /// </summary>
+        /// <param name="id">A com.esendex.sdk.contacts.Contact.Id instance that contains a contacts guid.</param>
+        public ContactCollection(string id)
+        {
+            if (id == null) throw new ArgumentNullException("contact");
+
+            ItemsId.Add(id);
+        }
+
         /// <summary>
         /// Initialises a new instance of the com.esendex.sdk.contacts.ContactCollection
         /// </summary>
@@ -46,6 +57,12 @@ public ContactCollection(IEnumerable<Contact> contacts)
         /// </summary>
         [XmlElement("contact")] public List<Contact> Items = new List<Contact>();
 
+        /// <summary>
+        /// <![CDATA[A System.Collections.Generic.List<com.esendex.sdk.contacts.Contact.Id> instance that contains the contacts guid.]]>
+        /// </summary>
+        [XmlElement("contactid")]
+        public List<string> ItemsId = new List<string>();
+
         /// <summary>
         /// Determines whether the specified System.Object are considered equal.
         /// </summary>
diff --git a/source/groups/Group.cs b/source/groups/Group.cs
new file mode 100644
index 0000000..89084dc
--- /dev/null
+++ b/source/groups/Group.cs
@@ -0,0 +1,83 @@
+using System;
+using System.Xml.Serialization;
+
+namespace com.esendex.sdk.groups
+{
+    /// <summary>
+    /// Represents a contact.
+    /// </summary>
+    [Serializable]
+    [XmlRoot("contactgroup", Namespace = Constants.API_NAMESPACE)]
+    public class Group
+    {
+        /// <summary>
+        /// Initialises a new instance of the com.esendex.sdk.groups.group
+        /// </summary>
+        /// <param name="name">A System.String instance that contains the quick name.</param>
+        /// <exception cref="System.ArgumentNullException"></exception>
+        public Group(string accountReference, string name)
+            : this()
+        {
+            if (string.IsNullOrEmpty(name)) throw new ArgumentNullException("name");
+
+            AccountReference = accountReference;
+            Name = name;
+        }
+
+        /// <summary>
+        /// Initialises a new instance of the com.esendex.sdk.groups.group
+        /// </summary>
+        public Group()
+        {
+        }
+
+        /// <summary>
+        /// Gets or sets a the Id.
+        /// </summary>
+        [XmlAttribute("id")]
+        public Guid Id { get; set; }
+
+        public bool ShouldSerializeId()
+        {
+            return Id != Guid.Empty;
+        }
+
+        /// <summary>
+        /// Gets or sets the name.
+        /// </summary>
+        [XmlElement("name")]
+        public string Name { get; set; }
+
+        /// <summary>
+        /// Gets or sets the account reference.
+        /// </summary>
+        [XmlElement("accountreference")]
+        public string AccountReference { get; set; }
+
+        public override bool Equals(object obj)
+        {
+            if (ReferenceEquals(null, obj)) return false;
+            if (ReferenceEquals(this, obj)) return true;
+            if (obj.GetType() != GetType()) return false;
+            return Equals((Group) obj);
+        }
+
+        protected bool Equals(Group other)
+        {
+            return Id.Equals(other.Id)
+                   && string.Equals(Name, other.Name)
+                   && string.Equals(AccountReference, other.AccountReference);
+        }
+
+        public override int GetHashCode()
+        {
+            unchecked
+            {
+                var hashCode = Id.GetHashCode();
+                hashCode = (hashCode*397) ^ (Name != null ? Name.GetHashCode() : 0);
+                hashCode = (hashCode*397) ^ (AccountReference != null ? AccountReference.GetHashCode() : 0);
+                return hashCode;
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/source/groups/GroupCollection.cs b/source/groups/GroupCollection.cs
new file mode 100644
index 0000000..46221c8
--- /dev/null
+++ b/source/groups/GroupCollection.cs
@@ -0,0 +1,79 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Xml.Serialization;
+
+namespace com.esendex.sdk.groups
+{
+    /// <summary>
+    /// Represents a collecion of groups.
+    /// </summary>
+    [Serializable]
+    [XmlRoot("contactgroups", Namespace = Constants.API_NAMESPACE)]
+    public class GroupCollection
+    {
+        /// <summary>
+        /// Initialises a new instance of the com.esendex.sdk.groups.GroupCollection
+        /// </summary>
+        public GroupCollection()
+        {
+        }
+
+        /// <summary>
+        /// Initialises a new instance of the com.esendex.sdk.groups.GroupCollection
+        /// </summary>
+        /// <param name="group">A com.esendex.sdk.groups.Group instance that contains a contact.</param>
+        public GroupCollection(Group group)
+        {
+            if (group == null) throw new ArgumentNullException("contactgroup");
+
+            Items.Add(group);
+        }
+
+        /// <summary>
+        /// Initialises a new instance of the com.esendex.sdk.groups.GroupCollection
+        /// </summary>
+        /// <param name="groups"><![CDATA[A System.Collections.Generic.IEnumerable<com.esendex.sdk.groups.Group> instance that contains the groups.]]></param>
+        public GroupCollection(IEnumerable<Group> groups)
+        {
+            if (groups == null) throw new ArgumentNullException("contactgroups");
+
+            Items.AddRange(groups);
+        }
+
+        /// <summary>
+        /// <![CDATA[A System.Collections.Generic.List<com.esendex.sdk.groups.Group> instance that contains the groups.]]>
+        /// </summary>
+        [XmlElement("contact")] public List<Group> Items = new List<Group>();
+
+        /// <summary>
+        /// Determines whether the specified System.Object are considered equal.
+        /// </summary>
+        /// <param name="obj">The System.Object to compare with the current System.Object</param>
+        /// <returns>true if the specified System.Object is equal to the current System.Object; otherwise, false.</returns>
+        public override bool Equals(object obj)
+        {
+            var other = obj as GroupCollection;
+
+            if (other == null) return false;
+
+            if (Items.Count != other.Items.Count) return false;
+
+            for (var i = 0; i < Items.Count; i++)
+            {
+                if (Items.ElementAt(i) != other.Items.ElementAt(i)) return false;
+            }
+
+            return true;
+        }
+
+        /// <summary>
+        /// Serves as a hash function for a particular type.
+        /// </summary>
+        /// <returns>A hash code for the current System.Object</returns>
+        public override int GetHashCode()
+        {
+            return base.GetHashCode();
+        }
+    }
+}
\ No newline at end of file
diff --git a/source/groups/GroupResponse.cs b/source/groups/GroupResponse.cs
new file mode 100644
index 0000000..de823f4
--- /dev/null
+++ b/source/groups/GroupResponse.cs
@@ -0,0 +1,11 @@
+using System.Xml.Serialization;
+
+namespace com.esendex.sdk.groups
+{
+    [XmlRoot("response", Namespace = Constants.API_NAMESPACE)]
+    public class GroupResponse
+    {
+        [XmlElement("contactgroup")]
+        public Group Group { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/source/groups/GroupService.cs b/source/groups/GroupService.cs
new file mode 100644
index 0000000..3599752
--- /dev/null
+++ b/source/groups/GroupService.cs
@@ -0,0 +1,153 @@
+using System;
+using com.esendex.sdk.contacts;
+using com.esendex.sdk.http;
+using com.esendex.sdk.rest;
+using com.esendex.sdk.rest.resources;
+using com.esendex.sdk.utilities;
+
+namespace com.esendex.sdk.groups
+{
+    /// <summary>
+    /// Defines methods to manage groups.
+    /// </summary>
+    public class GroupService : ServiceBase, IGroupService
+    {
+        /// <summary>
+        /// Initialises a new instance of the GroupService
+        /// </summary>
+        /// <param name="username">Your Esendex username.</param>
+        /// <param name="password">Your Esendex password.</param>
+        public GroupService(string username, string password)
+            : this(new EsendexCredentials(username, password))
+        {
+        }
+
+        /// <summary>
+        /// Initialises a new instance of the com.esendex.sdk.groups.GroupService
+        /// </summary>
+        /// <param name="credentials">A com.esendex.sdk.EsendexCredentials instance that contains access credentials.</param>
+        public GroupService(EsendexCredentials credentials)
+            : base(credentials)
+        {
+        }
+
+        internal GroupService(IRestClient restClient, ISerialiser serialiser)
+            : base(restClient, serialiser)
+        {
+        }
+
+        /// <summary>
+        /// Creates a com.esendex.sdk.groups.Group instance and returns the new com.esendex.sdk.groups.Group instance.
+        /// </summary>
+        /// <param name="group">A com.esendex.sdk.groups.Group instance that contains the group.</param>
+        /// <returns>A com.esendex.sdk.groups.Group instance that contains the group with an Id assigned.</returns>        
+        /// <exception cref="System.ArgumentException"></exception>
+        /// <exception cref="System.Net.WebException"></exception>        
+        public Group CreateGroup(Group group)
+        {
+            var requestXml = Serialiser.Serialise(group);
+
+            RestResource resource = new GroupsResource(requestXml);
+
+            return MakeRequest<GroupResponse>(HttpMethod.POST, resource)
+                .Group;
+        }
+
+        /// <summary>
+        /// Returns true if the group was successfully deleted; otherwise, false.
+        /// </summary>
+        /// <param name="id">A System.Guid instance that contains the Id of a group.</param>
+        /// <returns>true, if the group was successfully deleted; otherwise, false.</returns>        
+        /// <exception cref="System.Net.WebException"></exception>
+        public bool DeleteGroup(Guid id)
+        {
+            RestResource resource = new GroupsResource(id);
+
+            var response = MakeRequest(HttpMethod.DELETE, resource);
+
+            return (response != null);
+        }
+
+        /// <summary>
+        /// Returns true if the group was successfully updated; otherwise, false.
+        /// </summary>
+        /// <param name="group">A com.esendex.sdk.groups.Group instance that contains the group.</param>
+        /// <returns>true, if the group was successfully updated; otherwise, false.</returns>        
+        /// <exception cref="System.ArgumentException"></exception>
+        /// <exception cref="System.Net.WebException"></exception>      
+        public bool UpdateGroup(Group group)
+        {
+            var requestXml = Serialiser.Serialise(group);
+
+            RestResource resource = new GroupsResource(group.Id, requestXml);
+
+            var response = MakeRequest(HttpMethod.PUT, resource);
+
+            return (response != null);
+        }
+
+        /// <summary>
+        /// Gets a com.esendex.sdk.group.Group instance containing a group.
+        /// </summary>
+        /// <param name="id">A System.Guid instance that contains the Id of a group.</param>
+        /// <returns>A com.esendex.sdk.groups.Group instance that contains the group.</returns>        
+        /// <exception cref="System.Net.WebException"></exception>
+        public Group GetGroup(Guid id)
+        {
+            RestResource resource = new GroupsResource(id);
+
+            return MakeRequest<Group>(HttpMethod.GET, resource);
+        }
+
+        /// <summary>
+        /// Gets a com.esendex.sdk.group.PagedGroupCollection instance containing groups.
+        /// </summary>
+        /// <param name="pageNumber">The number of the page.</param>
+        /// <param name="pageSize">The number of items in the page.</param>
+        /// <returns>A com.esendex.sdk.groups.PagedGroupCollection instance that contains the groups.</returns>        
+        /// <exception cref="System.ArgumentException"></exception>
+        /// <exception cref="System.Net.WebException"></exception>
+        public PagedGroupCollection GetGroups(string accountReference, int pageNumber, int pageSize)
+        {
+            RestResource resource = new GroupsResource(accountReference, pageNumber, pageSize);
+
+            return MakeRequest<PagedGroupCollection>(HttpMethod.GET, resource);
+        }
+
+        /// <summary>
+        /// Gets a com.esendex.sdk.group.PagedGroupCollection instance containing groups.
+        /// </summary>
+        /// <param name="accountReference">The number of the page.</param>
+        /// <param name="pageNumber">The number of the page.</param>
+        /// <param name="pageSize">The number of items in the page.</param>
+        /// <param name="groupId">The number of items in the page.</param>
+        /// <returns>A com.esendex.sdk.groups.PagedGroupCollection instance that contains the groups.</returns>        
+        /// <exception cref="System.ArgumentException"></exception>
+        /// <exception cref="System.Net.WebException"></exception>
+        public PagedContactCollection GetContactsFromGroup(string accountReference, string groupId, int pageNumber, int pageSize)
+        {
+            RestResource resource = new GroupsResource(accountReference, groupId, pageNumber, pageSize);
+
+            return MakeRequest<PagedContactCollection>(HttpMethod.GET, resource);
+        }
+
+        /// <summary>
+        /// Posts a com.esendex.sdk.contacts.Contact to a com.esendex.sdk.groups.Group.
+        /// </summary>
+        /// <param name="accountReference">The number of the page.</param>
+        /// <param name="groupId">The number of items in the page.</param>
+        /// <param name="contact"></param>
+        /// <returns>A com.esendex.sdk.groups.PagedGroupCollection instance that contains the groups.</returns>        
+        /// <exception cref="System.ArgumentException"></exception>
+        /// <exception cref="System.Net.WebException"></exception>
+        public bool AddContactToGroup(string accountReference, string groupId, Contact contact)
+        {
+            var contactColletion = new ContactCollection();
+            contactColletion.ItemsId.Add(contact.Id.ToString());
+
+            RestResource resource = new GroupsResource(accountReference, groupId, Serialiser.Serialise(contactColletion));
+            var response = MakeRequest(HttpMethod.POST, resource);
+            return response != null;
+        }
+    }
+}
\ No newline at end of file
diff --git a/source/groups/IGroupService.cs b/source/groups/IGroupService.cs
new file mode 100644
index 0000000..e9907b8
--- /dev/null
+++ b/source/groups/IGroupService.cs
@@ -0,0 +1,54 @@
+using System;
+
+namespace com.esendex.sdk.groups
+{
+    /// <summary>
+    /// Defines methods to manage contacts.
+    /// </summary>
+    public interface IGroupService
+    {
+        /// <summary>
+        /// Creates a com.esendex.sdk.contacts.Contact instance and returns the new com.esendex.sdk.contacts.Contact instance.        
+        /// </summary>
+        /// <param name="group">A com.esendex.sdk.contacts.Contact instance that contains the contact.</param>
+        /// <returns>A com.esendex.sdk.contacts.Contact instance that contains the contact with an Id assigned.</returns>        
+        /// <exception cref="System.ArgumentException"></exception>
+        /// <exception cref="System.Net.WebException"></exception>        
+        Group CreateGroup(Group group);
+
+        /// <summary>
+        /// Returns true if the contact was successfully deleted; otherwise, false.
+        /// </summary>
+        /// <param name="id">A System.Guid instance that contains the Id of a contact.</param>
+        /// <returns>true, if the contact was successfully deleted; otherwise, false.</returns>        
+        /// <exception cref="System.Net.WebException"></exception>
+        bool DeleteGroup(Guid id);
+
+        /// <summary>
+        /// Returns true if the contact was successfully updated; otherwise, false.
+        /// </summary>
+        /// <param name="contact">A com.esendex.sdk.contacts.Contact instance that contains the contact.</param>
+        /// <returns>true, if the contact was successfully updated; otherwise, false.</returns>        
+        /// <exception cref="System.ArgumentException"></exception>
+        /// <exception cref="System.Net.WebException"></exception>       
+        bool UpdateGroup(Group group);
+
+        /// <summary>
+        /// Gets a com.esendex.sdk.contact.Contact instance containing a contact.
+        /// </summary>
+        /// <param name="id">A System.Guid instance that contains the Id of a contact.</param>
+        /// <returns>A com.esendex.sdk.contacts.Contact instance that contains the contact.</returns>        
+        /// <exception cref="System.Net.WebException"></exception>
+        Group GetGroup(Guid id);
+
+        /// <summary>
+        /// Gets a com.esendex.sdk.contact.PagedContactCollection instance containing contacts.
+        /// </summary>
+        /// <param name="pageNumber">The number of the page.</param>
+        /// <param name="pageSize">The number of items in the page.</param>
+        /// <returns>A com.esendex.sdk.contacts.PagedContactCollection instance that contains the contacts.</returns>        
+        /// <exception cref="System.ArgumentException"></exception>
+        /// <exception cref="System.Net.WebException"></exception>
+        PagedGroupCollection GetGroups(string accountReference, int pageNumber, int pageSize);
+    }
+}
\ No newline at end of file
diff --git a/source/groups/PagedGroupCollection.cs b/source/groups/PagedGroupCollection.cs
new file mode 100644
index 0000000..356b335
--- /dev/null
+++ b/source/groups/PagedGroupCollection.cs
@@ -0,0 +1,30 @@
+using System;
+using System.Collections.Generic;
+using System.Xml.Serialization;
+using com.esendex.sdk.core;
+
+namespace com.esendex.sdk.groups
+{
+    /// <summary>
+    /// Represents a paged collection of contacts.
+    /// </summary>    
+    [Serializable]
+    [XmlRoot("contactgroups", Namespace = Constants.API_NAMESPACE)]
+    public class PagedGroupCollection : PagedCollection<Group>
+    {
+        public PagedGroupCollection()
+        {
+            Items = new List<Group>();
+        }
+
+        /// <summary>
+        /// <![CDATA[A System.Collections.Generic.List<com.esendex.sdk.groups.Group> instance that contains the groups.]]>
+        /// </summary>
+        [XmlElement("contactgroup")]
+        public List<Group> Groups
+        {
+            get { return Items; }
+            set { Items = value; }
+        }
+    }
+}
\ No newline at end of file
diff --git a/source/rest/resources/ContactsResource.cs b/source/rest/resources/ContactsResource.cs
index b0029ef..ef826f8 100644
--- a/source/rest/resources/ContactsResource.cs
+++ b/source/rest/resources/ContactsResource.cs
@@ -40,6 +40,22 @@ public ContactsResource(string accountReference, int pageNumber, int pageSize)
             ResourcePath += string.Format("?accountReference={0}&startIndex={1}&count={2}", accountReference, startIndex, pageSize);
         }
 
+        public ContactsResource(string accountReference, int pageNumber, int pageSize, string groupName)
+        {
+            if (pageNumber < 1) throw new ArgumentException("Page number must be greater than zero.", "pageNumber");
+            if (pageSize < 1) throw new ArgumentException("Page size must be greater than zero.", "pageSize");
+
+            var startIndex = ((--pageNumber) * pageSize);
+
+            ResourcePath += string.Format("?accountReference={0}&startIndex={1}&count={2}", accountReference, startIndex, pageSize);
+        }
+
+        public ContactsResource(string accountReference, string groupId, string content)
+            :base(content)
+        {
+            ResourcePath += string.Format("/{0}/contacts?accountReference={1}", groupId, accountReference);
+        }
+
         private void AppendWithId(Guid id)
         {
             ResourcePath += string.Format("/{0}", id);
diff --git a/source/rest/resources/GroupsResource.cs b/source/rest/resources/GroupsResource.cs
new file mode 100644
index 0000000..7d701eb
--- /dev/null
+++ b/source/rest/resources/GroupsResource.cs
@@ -0,0 +1,64 @@
+using System;
+using com.esendex.sdk.contacts;
+
+namespace com.esendex.sdk.rest.resources
+{
+    internal class GroupsResource : RestResource
+    {
+        public override string ResourceName
+        {
+            get { return "contactgroups"; }
+        }
+
+        public override string ResourceVersion
+        {
+            get { return "v2.0"; }
+        }
+
+        public GroupsResource(Guid id)
+        {
+            AppendWithId(id);
+        }
+
+        public GroupsResource(string content)
+            : base(content)
+        {
+        }
+
+        public GroupsResource(Guid id, string content)
+            : base(content)
+        {
+            AppendWithId(id);
+        }
+
+        public GroupsResource(string accountReference, int pageNumber, int pageSize)
+        {
+            if (pageNumber < 1) throw new ArgumentException("Page number must be greater than zero.", "pageNumber");
+            if (pageSize < 1) throw new ArgumentException("Page size must be greater than zero.", "pageSize");
+
+            var startIndex = ((--pageNumber)*pageSize);
+
+            ResourcePath += string.Format("?accountReference={0}&startIndex={1}&count={2}", accountReference, startIndex, pageSize);
+        }
+
+        public GroupsResource(string accountReference, string groupId, int pageNumber, int pageSize)
+        {
+            if (pageNumber < 1) throw new ArgumentException("Page number must be greater than zero.", "pageNumber");
+            if (pageSize < 1) throw new ArgumentException("Page size must be greater than zero.", "pageSize");
+            var startIndex = ((--pageNumber) * pageSize);
+
+            ResourcePath += string.Format("/{0}/contacts?accountReference={1}&startIndex={2}&count={3}", groupId, accountReference, startIndex, pageSize);
+        }
+
+        public GroupsResource(string accountReference, string groupId, string content)
+            :base(content)
+        {
+            ResourcePath += string.Format("/{0}/contacts?accountReference={1}", groupId, accountReference);
+        }
+
+        private void AppendWithId(Guid id)
+        {
+            ResourcePath += string.Format("/{0}", id);
+        }
+    }
+}
\ No newline at end of file
diff --git a/source/sent/SentMessage.cs b/source/sent/SentMessage.cs
index 72ba036..8fa7e72 100644
--- a/source/sent/SentMessage.cs
+++ b/source/sent/SentMessage.cs
@@ -51,12 +51,6 @@ public bool ShouldSerializeDeliveredAt()
         [XmlElement("username")]
         public string Username { get; set; }
 
-        /// <summary>
-        /// Gets or sets the FailureReason which contains failure reason information of the message.
-        /// </summary>
-        [XmlElement("failurereason")]
-        public FailureReason FailureReason { get; set; }
-
         internal SentMessage()
         {
         }
diff --git a/test/com.esendex.sdk.test.csproj b/test/com.esendex.sdk.test.csproj
index d77434c..9434f5b 100644
--- a/test/com.esendex.sdk.test.csproj
+++ b/test/com.esendex.sdk.test.csproj
@@ -65,10 +65,6 @@
     <Reference Include="Moq">
       <HintPath>..\packages\Moq.4.0.10827\lib\NET40\Moq.dll</HintPath>
     </Reference>
-    <Reference Include="Newtonsoft.Json, Version=8.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\Newtonsoft.Json.8.0.2\lib\net40\Newtonsoft.Json.dll</HintPath>
-    </Reference>
     <Reference Include="nunit.framework">
       <HintPath>..\packages\NUnit.2.6.2\lib\nunit.framework.dll</HintPath>
     </Reference>
@@ -96,10 +92,6 @@
     <Compile Include="messaging\MessageSerialisationTests.cs" />
     <Compile Include="messaging\MessageTests.cs" />
     <Compile Include="messaging\SmsMessageSerializationTests.cs" />
-    <Compile Include="mockapi\MockApi.cs" />
-    <Compile Include="mockapi\MockEndpoint.cs" />
-    <Compile Include="models\requests\SurveyAddRecipientRequest.cs" />
-    <Compile Include="models\requests\SurveyAddRecipientsRequest.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="rest\resources\ContactsResourceTests.cs" />
     <Compile Include="rest\resources\InboxMessagesResourceTests.cs" />
@@ -110,11 +102,6 @@
     <Compile Include="sent\SentServiceTests.cs" />
     <Compile Include="sent\SentMessageTests.cs" />
     <Compile Include="session\SessionServiceTests.cs" />
-    <Compile Include="surveys\SurveysServiceTests.cs" />
-    <Compile Include="surveys\SurveysServiceWithBadRequestTests.cs" />
-    <Compile Include="surveys\SurveysServiceWithErrorResponseTests.cs" />
-    <Compile Include="surveys\SurveysServiceWithTemplateFieldsTests.cs" />
-    <Compile Include="SetUpFixture.cs" />
     <Compile Include="utilities\XmlSerialiserTests.cs" />
     <Compile Include="messaging\MessagingServiceTests.cs" />
   </ItemGroup>
diff --git a/test/packages.config b/test/packages.config
index a95dd29..34874ff 100644
--- a/test/packages.config
+++ b/test/packages.config
@@ -1,6 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="Moq" version="4.0.10827" targetFramework="net40" />
-  <package id="Newtonsoft.Json" version="8.0.2" targetFramework="net40" />
-  <package id="NUnit" version="2.6.2" targetFramework="net40" />
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="Moq" version="4.0.10827" targetFramework="net40" />
+  <package id="NUnit" version="2.6.2" targetFramework="net40" />
 </packages>
\ No newline at end of file
diff --git a/test/sent/SentServiceTests.cs b/test/sent/SentServiceTests.cs
index 8ca9e15..a4aef54 100644
--- a/test/sent/SentServiceTests.cs
+++ b/test/sent/SentServiceTests.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Collections.Generic;
 using System.Net;
 using com.esendex.sdk.http;
 using com.esendex.sdk.rest;
@@ -167,86 +166,6 @@ public void GetMessages_WithPageNumberAndPageSizeAndAccountReference_ReturnsSent
             // Assert
             Assert.AreEqual(pageNumber, actualResult.PageNumber);
             Assert.AreEqual(pageSize, actualResult.PageSize);
-        }
-
-        [Test]
-        public void GetMessages_WithFailedMessage_ReturnsSentMessagesWithFailureReason()
-        {
-            // Arrange
-            var pageNumber = 1;
-            var pageSize = 15;
-            var accountReference = "accountReference";
-
-            RestResource resource = new MessageHeadersResource(accountReference, pageNumber, pageSize);
-
-            var response = new RestResponse
-            {
-                StatusCode = HttpStatusCode.OK,
-                Content = "serialisedItem"
-            };
-
-            var sentMessage = new SentMessage {FailureReason = new FailureReason {Code = 80, Description = "yolo", PermanentFailure = true}};
-
-            var expectedResult = new SentMessageCollection
-            {
-                PageNumber = pageNumber,
-                PageSize = pageSize,
-                Messages = new List<SentMessage> {sentMessage}
-            };
-
-            mockRestClient
-                .Setup(rc => rc.Get(resource))
-                .Returns(response);
-
-            mockSerialiser
-                .Setup(s => s.Deserialise<SentMessageCollection>(response.Content))
-                .Returns(expectedResult);
-
-            // Act
-            var actualResult = service.GetMessages(accountReference, pageNumber, pageSize);
-
-            // Assert
-            Assert.AreEqual(pageNumber, actualResult.PageNumber);
-            Assert.AreEqual(pageSize, actualResult.PageSize);
-
-            Assert.That(actualResult.Messages[0].FailureReason.Code, Is.EqualTo(sentMessage.FailureReason.Code));
-            Assert.That(actualResult.Messages[0].FailureReason.Description, Is.EqualTo(sentMessage.FailureReason.Description));
-            Assert.That(actualResult.Messages[0].FailureReason.PermanentFailure, Is.EqualTo(sentMessage.FailureReason.PermanentFailure));
-        }
-
-        [Test]
-        public void GetMessage_WithFailedMessage_ReturnsSentMessagesWithFailureReason()
-        {
-
-            var messageId = Guid.NewGuid();
-
-            RestResource resource = new MessageHeadersResource(messageId);
-
-            var response = new RestResponse
-            {
-                StatusCode = HttpStatusCode.OK,
-                Content = "serialisedItem"
-            };
-
-            var sentMessage = new SentMessage { Id = messageId, FailureReason = new FailureReason { Code = 80, Description = "yolo", PermanentFailure = true } };
-
-
-            mockRestClient
-                .Setup(rc => rc.Get(resource))
-                .Returns(response);
-
-            mockSerialiser
-                .Setup(s => s.Deserialise<SentMessage>(response.Content))
-                .Returns(sentMessage);
-
-
-            // Act
-            var result = service.GetMessage(sentMessage.Id);
-
-            // Assert
-            Assert.That(result.FailureReason.Code, Is.EqualTo(sentMessage.FailureReason.Code));
-            Assert.That(result.FailureReason.Description, Is.EqualTo(sentMessage.FailureReason.Description));
-            Assert.That(result.FailureReason.PermanentFailure, Is.EqualTo(sentMessage.FailureReason.PermanentFailure));
         }
     }
 }
\ No newline at end of file

From 98361362e51005da5fb6769edb6c0084e4dea1df Mon Sep 17 00:00:00 2001
From: John Doyle <john.doyle@dovetail.ie>
Date: Tue, 16 Feb 2016 08:30:13 +0000
Subject: [PATCH 2/6] Remove GUIDs from Test AddContactToGroup

---
 samples/Program.cs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/samples/Program.cs b/samples/Program.cs
index 9afb15d..e80c014 100644
--- a/samples/Program.cs
+++ b/samples/Program.cs
@@ -109,7 +109,7 @@ static void Main(string[] args)
             Console.WriteLine("Contacts in Group Example\r\n");
             GetContactsByGroupExample(credentials);
 
-            AddContacttoGroup(credentials);
+            AddContactToGroup(credentials);
 
             Console.WriteLine();
             Console.WriteLine("Press enter to continue ... ");
@@ -282,16 +282,16 @@ private static void GetContactsByGroupExample(EsendexCredentials credentials)
             }
         }
 
-        private static void AddContacttoGroup(EsendexCredentials credentials)
+        private static void AddContactToGroup(EsendexCredentials credentials)
         {
             var groupService = new GroupService(credentials);
             var contactService = new ContactService(credentials);
 
             try
             {
-                var guid = new Guid("6c5e0669-af2e-4682-85c1-bd97a45c590d");
+                var guid = new Guid("{YOUR Contact GUID}");
                 var contact = contactService.GetContact(guid);
-                groupService.AddContactToGroup(_accountReference, "1c259623-00bf-4629-af38-b1f770b12634", contact);
+                groupService.AddContactToGroup(_accountReference, "{YOUR Group GUID}", contact);
 
             }
             catch (WebException ex)

From ec01517131978935a072b0a83fdeb3ba1ef19550 Mon Sep 17 00:00:00 2001
From: John Doyle <john.doyle@dovetail.ie>
Date: Tue, 8 Nov 2016 15:07:16 +0000
Subject: [PATCH 3/6] Updated the csproj file from the master

---
 source/com.esendex.sdk.csproj | 22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/source/com.esendex.sdk.csproj b/source/com.esendex.sdk.csproj
index 14770fd..991fa79 100644
--- a/source/com.esendex.sdk.csproj
+++ b/source/com.esendex.sdk.csproj
@@ -25,6 +25,8 @@
     <UpgradeBackupLocation>
     </UpgradeBackupLocation>
     <OldToolsVersion>3.5</OldToolsVersion>
+    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
+    <RestorePackages>true</RestorePackages>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -55,6 +57,9 @@
     <AssemblyOriginatorKeyFile>..\.solution\KeyFile.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="Newtonsoft.Json">
+      <HintPath>..\packages\Newtonsoft.Json.8.0.2\lib\net35\Newtonsoft.Json.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core">
       <RequiredTargetFramework>3.5</RequiredTargetFramework>
@@ -72,12 +77,7 @@
     <Compile Include="core\CharacterSet.cs" />
     <Compile Include="core\MessageCollection.cs" />
     <Compile Include="core\PagedCollection.cs" />
-    <Compile Include="groups\Group.cs" />
-    <Compile Include="groups\GroupCollection.cs" />
-    <Compile Include="groups\GroupResponse.cs" />
-    <Compile Include="groups\GroupService.cs" />
-    <Compile Include="groups\IGroupService.cs" />
-    <Compile Include="groups\PagedGroupCollection.cs" />
+    <Compile Include="extensions\HttpWebResponseExtensions.cs" />
     <Compile Include="http\HttpClient.cs" />
     <Compile Include="http\HttpRequest.cs" />
     <Compile Include="http\HttpRequestHelper.cs" />
@@ -107,6 +107,8 @@
     <Compile Include="inbox\InboxService.cs" />
     <Compile Include="messaging\MessageBodyService.cs" />
     <Compile Include="messaging\VoiceMessageLanguage.cs" />
+    <Compile Include="models\requests\SurveysAddRecipientRequest.cs" />
+    <Compile Include="models\requests\SurveysAddRecipientsRequest.cs" />
     <Compile Include="optouts\models\response\FromAddress.cs" />
     <Compile Include="optouts\models\response\OptOut.cs" />
     <Compile Include="optouts\models\response\OptOutCollection.cs" />
@@ -114,8 +116,8 @@
     <Compile Include="optouts\models\response\OptOutCreateResult.cs" />
     <Compile Include="optouts\OptOutsService.cs" />
     <Compile Include="Properties\BuildInfo.cs" />
+    <Compile Include="Request.cs" />
     <Compile Include="rest\resources\ContactsResource.cs" />
-    <Compile Include="rest\resources\GroupsResource.cs" />
     <Compile Include="rest\resources\InboxMessagesResource.cs" />
     <Compile Include="rest\resources\MessageHeadersResource.cs" />
     <Compile Include="core\IPagedCollection.cs" />
@@ -124,6 +126,7 @@
     <Compile Include="messaging\MessageCollection.cs" />
     <Compile Include="rest\resources\ResourceLinkResource.cs" />
     <Compile Include="rest\resources\SessionResource.cs" />
+    <Compile Include="sent\FailureReason.cs" />
     <Compile Include="optouts\models\response\OptOutCreateError.cs" />
     <Compile Include="surveys\models\SurveyResult.cs" />
     <Compile Include="sent\SentMessage.cs" />
@@ -140,6 +143,7 @@
     <Compile Include="session\EsendexSession.cs" />
     <Compile Include="session\SessionService.cs" />
     <Compile Include="surveys\models\SurveysAddRecipientError.cs" />
+    <Compile Include="surveys\SurveysService.cs" />
     <Compile Include="utilities\ISerialiser.cs" />
     <Compile Include="rest\resources\MessageDispatcherResource.cs" />
     <Compile Include="rest\RestClient.cs" />
@@ -150,9 +154,12 @@
     <Compile Include="messaging\MessagingService.cs" />
     <Compile Include="ServiceBase.cs" />
   </ItemGroup>
+  <ItemGroup>
     <None Include="..\.solution\KeyFile.snk">
       <Link>KeyFile.snk</Link>
     </None>
+    <None Include="packages.config" />
+  </ItemGroup>
   <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
@@ -166,4 +173,5 @@
     <PostBuildEvent>
     </PostBuildEvent>
   </PropertyGroup>
+  <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
 </Project>
\ No newline at end of file

From 91abb7d8b101d6520a25acc88f91e993831d04d9 Mon Sep 17 00:00:00 2001
From: John Doyle <john.doyle@dovetail.ie>
Date: Tue, 8 Nov 2016 15:12:35 +0000
Subject: [PATCH 4/6] Rebase/Merge Hell added back in groups

---
 source/com.esendex.sdk.csproj | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/source/com.esendex.sdk.csproj b/source/com.esendex.sdk.csproj
index 991fa79..051da26 100644
--- a/source/com.esendex.sdk.csproj
+++ b/source/com.esendex.sdk.csproj
@@ -78,6 +78,12 @@
     <Compile Include="core\MessageCollection.cs" />
     <Compile Include="core\PagedCollection.cs" />
     <Compile Include="extensions\HttpWebResponseExtensions.cs" />
+    <Compile Include="groups\Group.cs" />
+    <Compile Include="groups\GroupCollection.cs" />
+    <Compile Include="groups\GroupResponse.cs" />
+    <Compile Include="groups\GroupService.cs" />
+    <Compile Include="groups\IGroupService.cs" />
+    <Compile Include="groups\PagedGroupCollection.cs" />
     <Compile Include="http\HttpClient.cs" />
     <Compile Include="http\HttpRequest.cs" />
     <Compile Include="http\HttpRequestHelper.cs" />

From 2ddde03786998e8272fb4624741f13394d0ebaa0 Mon Sep 17 00:00:00 2001
From: John Doyle <john.doyle@dovetail.ie>
Date: Tue, 8 Nov 2016 15:33:32 +0000
Subject: [PATCH 5/6] Added back in missing CS files after rebase/merge and
 updated the missing stuff from files.

---
 samples/Program.cs                            |   9 +-
 source/Constants.cs                           |  32 +--
 source/EsendexCredentials.cs                  | 220 +++++++++---------
 source/Properties/AssemblyInfo.cs             |   4 +-
 source/com.esendex.sdk.csproj                 |  23 +-
 .../messaging/IMessagingService.cs            |   0
 source/{ => models}/messaging/Message.cs      |   0
 .../messaging/MessageBodyService.cs           |   0
 .../messaging/MessageCollection.cs            |   0
 .../{ => models}/messaging/MessagingResult.cs |   0
 .../messaging/MessagingService.cs             |   0
 source/{ => models}/messaging/SmsMessage.cs   |   0
 .../messaging/SmsMessageCollection.cs         |   0
 source/{ => models}/messaging/VoiceMessage.cs |   0
 .../messaging/VoiceMessageCollection.cs       |   0
 .../messaging/VoiceMessageLanguage.cs         |   0
 test/com.esendex.sdk.test.csproj              |   6 +
 test/packages.config                          |   1 +
 18 files changed, 155 insertions(+), 140 deletions(-)
 rename source/{ => models}/messaging/IMessagingService.cs (100%)
 rename source/{ => models}/messaging/Message.cs (100%)
 rename source/{ => models}/messaging/MessageBodyService.cs (100%)
 rename source/{ => models}/messaging/MessageCollection.cs (100%)
 rename source/{ => models}/messaging/MessagingResult.cs (100%)
 rename source/{ => models}/messaging/MessagingService.cs (100%)
 rename source/{ => models}/messaging/SmsMessage.cs (100%)
 rename source/{ => models}/messaging/SmsMessageCollection.cs (100%)
 rename source/{ => models}/messaging/VoiceMessage.cs (100%)
 rename source/{ => models}/messaging/VoiceMessageCollection.cs (100%)
 rename source/{ => models}/messaging/VoiceMessageLanguage.cs (100%)

diff --git a/samples/Program.cs b/samples/Program.cs
index e80c014..78739c2 100644
--- a/samples/Program.cs
+++ b/samples/Program.cs
@@ -261,11 +261,10 @@ private static void GetContactsByGroupExample(EsendexCredentials credentials)
 
                 var groupId = "";
 
-                foreach (var item in collection.Groups.Where(item => item.Name == "Test group"))
-                {
-                    groupId = item.Id.ToString();
-                    break;
-                }
+                var contactGroup = collection.Groups.FirstOrDefault(item => item.Name == "Test group");
+      
+                if (contactGroup == null)
+                    return;
 
                 if (groupId == "") return;
 
diff --git a/source/Constants.cs b/source/Constants.cs
index 5f633a4..17196e8 100644
--- a/source/Constants.cs
+++ b/source/Constants.cs
@@ -1,16 +1,18 @@
-using System;
-
-namespace com.esendex.sdk
-{
-    internal static class Constants
-    {
-        internal const string API_NAMESPACE = "http://api.esendex.com/ns/";
-
-        internal static Uri api_uri;
-
-        internal static Uri API_URI
-        {
-            get { return api_uri ?? (api_uri = new UriBuilder("https", "api.esendex.com").Uri); }
-        }
-    }
+using System;
+
+namespace com.esendex.sdk
+{
+    internal static class Constants
+    {
+        internal const string API_NAMESPACE = "http://api.esendex.com/ns/";
+
+        internal static Uri api_uri;
+
+        internal static Uri API_URI
+        {
+            get { return api_uri ?? (api_uri = new UriBuilder("https", "api.esendex.com").Uri); }
+        }
+
+        internal static string JSON_MEDIA_TYPE = "application/json; charset=utf-8";
+    }
 }
\ No newline at end of file
diff --git a/source/EsendexCredentials.cs b/source/EsendexCredentials.cs
index e56c2ae..cfb1294 100644
--- a/source/EsendexCredentials.cs
+++ b/source/EsendexCredentials.cs
@@ -1,108 +1,114 @@
-using System;
-using System.Net;
-
-namespace com.esendex.sdk
-{
-    /// <summary>
-    /// Represents authentication details required to access Esendex services.
-    /// </summary>
-    [Serializable]
-    public class EsendexCredentials
-    {
-        internal EsendexCredentials()
-        {
-        }
-
-        /// <summary>
-        /// Initialises a new instance of the com.esendex.sdk.EsendexCredentials
-        /// </summary>
-        /// <param name="username">Your Esendex username.</param>
-        /// <param name="password">Your Esendex password.</param>
-        /// <exception cref="System.ArgumentNullException"></exception>
-        public EsendexCredentials(string username, string password)
-        {
-            if (string.IsNullOrEmpty(username)) throw new ArgumentNullException("username");
-            if (string.IsNullOrEmpty(password)) throw new ArgumentNullException("password");
-
-            Username = username;
-            Password = password;
-        }
-
-        /// <summary>
-        /// Initialises a new instance of the com.esendex.sdk.EsendexCredentials
-        /// </summary>
-        /// <param name="sessionId">A System.Guid instance containing the session id.</param>
-        public EsendexCredentials(Guid sessionId)
-        {
-            SessionId = sessionId;
-        }
-
-        /// <summary>
-        /// Initialises a new instance of the com.esendex.sdk.EsendexCredentials
-        /// </summary>
-        /// <param name="sessionId">A System.Guid instance containing the session id.</param>
-        /// <param name="proxy">A System.Net.WebProxy instance that contains proxy information required by the local network.</param>
-        /// <exception cref="System.ArgumentNullException"></exception>
-        public EsendexCredentials(Guid sessionId, IWebProxy proxy)
-            : this(sessionId)
-        {
-            SetProxy(proxy);
-        }
-
-        /// <summary>
-        /// Initialises a new instance of the com.esendex.sdk.EsendexCredentials
-        /// </summary>
-        /// <param name="username">A System.String instance that contains the Esendex username.</param>
-        /// <param name="password">A System.String instance that contains the Esendex password.</param>
-        /// <param name="proxy">A System.Net.WebProxy instance that contains proxy information required by the local network.</param>
-        /// <exception cref="System.ArgumentNullException"></exception>
-        public EsendexCredentials(string username, string password, IWebProxy proxy)
-            : this(username, password)
-        {
-            SetProxy(proxy);
-        }
-
-        /// <summary>
-        /// Gets the Esendex username.
-        /// </summary>
-        public string Username { get; private set; }
-
-        /// <summary>
-        /// Gets the Esendex password.
-        /// </summary>
-        public string Password { get; private set; }
-
-        /// <summary>
-        /// Gets the proxy information.
-        /// </summary>
-        public IWebProxy WebProxy { get; private set; }
-
-        /// <summary>
-        /// Returns true if a System.Net.WebProxy instance was supplied to the constructor; otherwise, false.
-        /// </summary>
-        public bool UseProxy
-        {
-            get { return WebProxy != null; }
-        }
-
-        /// <summary>
-        /// Returns true if a System.Guid instance was supplied to the constructor; otherwise, false.
-        /// </summary>
-        public bool UseSessionAuthentication
-        {
-            get { return SessionId.HasValue; }
-        }
-
-        /// <summary>
-        /// Gets or sets a System.Guid instance containing the session id.
-        /// </summary>
-        public Guid? SessionId { get; set; }
-
-        private void SetProxy(IWebProxy proxy)
-        {
-            if (proxy == null) throw new ArgumentNullException("proxy");
-
-            WebProxy = proxy;
-        }
-    }
+using System;
+using System.Net;
+using System.Text;
+
+namespace com.esendex.sdk
+{
+    /// <summary>
+    /// Represents authentication details required to access Esendex services.
+    /// </summary>
+    [Serializable]
+    public class EsendexCredentials
+    {
+        internal EsendexCredentials()
+        {
+        }
+
+        /// <summary>
+        /// Initialises a new instance of the com.esendex.sdk.EsendexCredentials
+        /// </summary>
+        /// <param name="username">Your Esendex username.</param>
+        /// <param name="password">Your Esendex password.</param>
+        /// <exception cref="System.ArgumentNullException"></exception>
+        public EsendexCredentials(string username, string password)
+        {
+            if (string.IsNullOrEmpty(username)) throw new ArgumentNullException("username");
+            if (string.IsNullOrEmpty(password)) throw new ArgumentNullException("password");
+
+            Username = username;
+            Password = password;
+        }
+
+        /// <summary>
+        /// Initialises a new instance of the com.esendex.sdk.EsendexCredentials
+        /// </summary>
+        /// <param name="sessionId">A System.Guid instance containing the session id.</param>
+        public EsendexCredentials(Guid sessionId)
+        {
+            SessionId = sessionId;
+        }
+
+        /// <summary>
+        /// Initialises a new instance of the com.esendex.sdk.EsendexCredentials
+        /// </summary>
+        /// <param name="sessionId">A System.Guid instance containing the session id.</param>
+        /// <param name="proxy">A System.Net.WebProxy instance that contains proxy information required by the local network.</param>
+        /// <exception cref="System.ArgumentNullException"></exception>
+        public EsendexCredentials(Guid sessionId, IWebProxy proxy)
+            : this(sessionId)
+        {
+            SetProxy(proxy);
+        }
+
+        /// <summary>
+        /// Initialises a new instance of the com.esendex.sdk.EsendexCredentials
+        /// </summary>
+        /// <param name="username">A System.String instance that contains the Esendex username.</param>
+        /// <param name="password">A System.String instance that contains the Esendex password.</param>
+        /// <param name="proxy">A System.Net.WebProxy instance that contains proxy information required by the local network.</param>
+        /// <exception cref="System.ArgumentNullException"></exception>
+        public EsendexCredentials(string username, string password, IWebProxy proxy)
+            : this(username, password)
+        {
+            SetProxy(proxy);
+        }
+
+        /// <summary>
+        /// Gets the Esendex username.
+        /// </summary>
+        public string Username { get; private set; }
+
+        /// <summary>
+        /// Gets the Esendex password.
+        /// </summary>
+        public string Password { get; private set; }
+
+        /// <summary>
+        /// Gets the proxy information.
+        /// </summary>
+        public IWebProxy WebProxy { get; private set; }
+
+        /// <summary>
+        /// Returns true if a System.Net.WebProxy instance was supplied to the constructor; otherwise, false.
+        /// </summary>
+        public bool UseProxy
+        {
+            get { return WebProxy != null; }
+        }
+
+        /// <summary>
+        /// Returns true if a System.Guid instance was supplied to the constructor; otherwise, false.
+        /// </summary>
+        public bool UseSessionAuthentication
+        {
+            get { return SessionId.HasValue; }
+        }
+
+        /// <summary>
+        /// Gets or sets a System.Guid instance containing the session id.
+        /// </summary>
+        public Guid? SessionId { get; set; }
+
+        private void SetProxy(IWebProxy proxy)
+        {
+            if (proxy == null) throw new ArgumentNullException("proxy");
+
+            WebProxy = proxy;
+        }
+
+        internal string EncodedValue()
+        {
+            return Convert.ToBase64String(Encoding.UTF8.GetBytes(UseSessionAuthentication ? SessionId.Value.ToString() : Username + ":" + Password));
+        }
+    }
 }
\ No newline at end of file
diff --git a/source/Properties/AssemblyInfo.cs b/source/Properties/AssemblyInfo.cs
index 5794fe1..363a6a1 100644
--- a/source/Properties/AssemblyInfo.cs
+++ b/source/Properties/AssemblyInfo.cs
@@ -35,5 +35,5 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 
-[assembly: AssemblyVersion("2.5.0")]
-[assembly: AssemblyFileVersion("2.5.0")]
\ No newline at end of file
+[assembly: AssemblyVersion("2.6.0")]
+[assembly: AssemblyFileVersion("2.6.0")]
\ No newline at end of file
diff --git a/source/com.esendex.sdk.csproj b/source/com.esendex.sdk.csproj
index 051da26..ffe583e 100644
--- a/source/com.esendex.sdk.csproj
+++ b/source/com.esendex.sdk.csproj
@@ -111,8 +111,8 @@
     <Compile Include="inbox\InboxMessageCollection.cs" />
     <Compile Include="inbox\InboxMessageStatus.cs" />
     <Compile Include="inbox\InboxService.cs" />
-    <Compile Include="messaging\MessageBodyService.cs" />
-    <Compile Include="messaging\VoiceMessageLanguage.cs" />
+    <Compile Include="models\messaging\MessageBodyService.cs" />
+    <Compile Include="models\messaging\VoiceMessageLanguage.cs" />
     <Compile Include="models\requests\SurveysAddRecipientRequest.cs" />
     <Compile Include="models\requests\SurveysAddRecipientsRequest.cs" />
     <Compile Include="optouts\models\response\FromAddress.cs" />
@@ -124,22 +124,23 @@
     <Compile Include="Properties\BuildInfo.cs" />
     <Compile Include="Request.cs" />
     <Compile Include="rest\resources\ContactsResource.cs" />
+    <Compile Include="rest\resources\GroupsResource.cs" />
     <Compile Include="rest\resources\InboxMessagesResource.cs" />
     <Compile Include="rest\resources\MessageHeadersResource.cs" />
     <Compile Include="core\IPagedCollection.cs" />
-    <Compile Include="messaging\Message.cs" />
-    <Compile Include="messaging\MessagingResult.cs" />
-    <Compile Include="messaging\MessageCollection.cs" />
+    <Compile Include="models\messaging\Message.cs" />
+    <Compile Include="models\messaging\MessagingResult.cs" />
+    <Compile Include="models\messaging\MessageCollection.cs" />
     <Compile Include="rest\resources\ResourceLinkResource.cs" />
     <Compile Include="rest\resources\SessionResource.cs" />
     <Compile Include="sent\FailureReason.cs" />
     <Compile Include="optouts\models\response\OptOutCreateError.cs" />
     <Compile Include="surveys\models\SurveyResult.cs" />
     <Compile Include="sent\SentMessage.cs" />
-    <Compile Include="messaging\SmsMessage.cs" />
-    <Compile Include="messaging\SmsMessageCollection.cs" />
-    <Compile Include="messaging\VoiceMessage.cs" />
-    <Compile Include="messaging\VoiceMessageCollection.cs" />
+    <Compile Include="models\messaging\SmsMessage.cs" />
+    <Compile Include="models\messaging\SmsMessageCollection.cs" />
+    <Compile Include="models\messaging\VoiceMessage.cs" />
+    <Compile Include="models\messaging\VoiceMessageCollection.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="rest\IRestClient.cs" />
     <Compile Include="sent\ISentService.cs" />
@@ -156,8 +157,8 @@
     <Compile Include="rest\RestResource.cs" />
     <Compile Include="rest\RestResponse.cs" />
     <Compile Include="utilities\XmlSerialiser.cs" />
-    <Compile Include="messaging\IMessagingService.cs" />
-    <Compile Include="messaging\MessagingService.cs" />
+    <Compile Include="models\messaging\IMessagingService.cs" />
+    <Compile Include="models\messaging\MessagingService.cs" />
     <Compile Include="ServiceBase.cs" />
   </ItemGroup>
   <ItemGroup>
diff --git a/source/messaging/IMessagingService.cs b/source/models/messaging/IMessagingService.cs
similarity index 100%
rename from source/messaging/IMessagingService.cs
rename to source/models/messaging/IMessagingService.cs
diff --git a/source/messaging/Message.cs b/source/models/messaging/Message.cs
similarity index 100%
rename from source/messaging/Message.cs
rename to source/models/messaging/Message.cs
diff --git a/source/messaging/MessageBodyService.cs b/source/models/messaging/MessageBodyService.cs
similarity index 100%
rename from source/messaging/MessageBodyService.cs
rename to source/models/messaging/MessageBodyService.cs
diff --git a/source/messaging/MessageCollection.cs b/source/models/messaging/MessageCollection.cs
similarity index 100%
rename from source/messaging/MessageCollection.cs
rename to source/models/messaging/MessageCollection.cs
diff --git a/source/messaging/MessagingResult.cs b/source/models/messaging/MessagingResult.cs
similarity index 100%
rename from source/messaging/MessagingResult.cs
rename to source/models/messaging/MessagingResult.cs
diff --git a/source/messaging/MessagingService.cs b/source/models/messaging/MessagingService.cs
similarity index 100%
rename from source/messaging/MessagingService.cs
rename to source/models/messaging/MessagingService.cs
diff --git a/source/messaging/SmsMessage.cs b/source/models/messaging/SmsMessage.cs
similarity index 100%
rename from source/messaging/SmsMessage.cs
rename to source/models/messaging/SmsMessage.cs
diff --git a/source/messaging/SmsMessageCollection.cs b/source/models/messaging/SmsMessageCollection.cs
similarity index 100%
rename from source/messaging/SmsMessageCollection.cs
rename to source/models/messaging/SmsMessageCollection.cs
diff --git a/source/messaging/VoiceMessage.cs b/source/models/messaging/VoiceMessage.cs
similarity index 100%
rename from source/messaging/VoiceMessage.cs
rename to source/models/messaging/VoiceMessage.cs
diff --git a/source/messaging/VoiceMessageCollection.cs b/source/models/messaging/VoiceMessageCollection.cs
similarity index 100%
rename from source/messaging/VoiceMessageCollection.cs
rename to source/models/messaging/VoiceMessageCollection.cs
diff --git a/source/messaging/VoiceMessageLanguage.cs b/source/models/messaging/VoiceMessageLanguage.cs
similarity index 100%
rename from source/messaging/VoiceMessageLanguage.cs
rename to source/models/messaging/VoiceMessageLanguage.cs
diff --git a/test/com.esendex.sdk.test.csproj b/test/com.esendex.sdk.test.csproj
index 11e2403..4539d3f 100644
--- a/test/com.esendex.sdk.test.csproj
+++ b/test/com.esendex.sdk.test.csproj
@@ -75,6 +75,10 @@
       <HintPath>..\packages\Moq.4.2.1510.2205\lib\net40\Moq.dll</HintPath>
       <Private>True</Private>
     </Reference>
+    <Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\Newtonsoft.Json.8.0.2\lib\net40\Newtonsoft.Json.dll</HintPath>
+    </Reference>
     <Reference Include="nunit.framework">
       <HintPath>..\packages\NUnit.2.6.2\lib\nunit.framework.dll</HintPath>
     </Reference>
@@ -102,6 +106,8 @@
     <Compile Include="messaging\MessageSerialisationTests.cs" />
     <Compile Include="messaging\MessageTests.cs" />
     <Compile Include="messaging\SmsMessageSerializationTests.cs" />
+    <Compile Include="mockapi\MockApi.cs" />
+    <Compile Include="mockapi\MockEndpoint.cs" />
     <Compile Include="models\requests\optouts\From.cs" />
     <Compile Include="models\requests\optouts\OptOutsAddRequest.cs" />
     <Compile Include="models\requests\surveys\SurveyAddRecipientRequest.cs" />
diff --git a/test/packages.config b/test/packages.config
index 2a07e46..8e2fdaa 100644
--- a/test/packages.config
+++ b/test/packages.config
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Moq" version="4.2.1510.2205" targetFramework="net40" />
+  <package id="Newtonsoft.Json" version="8.0.2" targetFramework="net40" />
   <package id="NUnit" version="2.6.2" targetFramework="net40" />
 </packages>
\ No newline at end of file

From eb0b4a1aa72d5845f2a75c4a6257cf7d833f3a40 Mon Sep 17 00:00:00 2001
From: John Doyle <john.doyle@dovetail.ie>
Date: Tue, 8 Nov 2016 16:02:09 +0000
Subject: [PATCH 6/6] Added back in more files that were still missing

---
 test/com.esendex.sdk.test.csproj | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/test/com.esendex.sdk.test.csproj b/test/com.esendex.sdk.test.csproj
index 4539d3f..b018a62 100644
--- a/test/com.esendex.sdk.test.csproj
+++ b/test/com.esendex.sdk.test.csproj
@@ -133,7 +133,12 @@
     <Compile Include="sent\SentServiceTests.cs" />
     <Compile Include="sent\SentMessageTests.cs" />
     <Compile Include="session\SessionServiceTests.cs" />
+    <Compile Include="SetUpFixture.cs" />
+    <Compile Include="surveys\SurveysServiceTests.cs" />
+    <Compile Include="surveys\SurveysServiceWithBadRequestTests.cs" />
+    <Compile Include="surveys\SurveysServiceWithErrorResponseTests.cs" />
     <Compile Include="surveys\SurveysServiceWithMetaDataFieldsTests.cs" />
+    <Compile Include="surveys\SurveysServiceWithTemplateFieldsTests.cs" />
     <Compile Include="utilities\XmlSerialiserTests.cs" />
     <Compile Include="messaging\MessagingServiceTests.cs" />
   </ItemGroup>