Merge pull request #14 from YV-Proxiad/sms-api-integrations

mskochev · web-flow · commit 843dab595f7d · 2018-06-06T11:22:00.000+03:00
Sms API integrations
diff --git a/Mailjet.Client/DefaultProxy.cs b/Mailjet.Client/DefaultProxy.cs
@@ -1,9 +1,5 @@
 ﻿using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.Net;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace Mailjet.Client
 {
diff --git a/Mailjet.Client/IMailjetClient.cs b/Mailjet.Client/IMailjetClient.cs
@@ -1,8 +1,4 @@
-﻿using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+﻿using System.Threading.Tasks;
 
 namespace Mailjet.Client
 {
diff --git a/Mailjet.Client/MailjetClient.cs b/Mailjet.Client/MailjetClient.cs
@@ -1,9 +1,6 @@
 ﻿using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Net;
 using System.Net.Http;
 using System.Net.Http.Headers;
 using System.Text;
@@ -45,9 +42,7 @@ public MailjetClient(string token, HttpMessageHandler httpMessageHandler = null)
         {
             InitHttpClient(httpMessageHandler);
 
-            // Set token authentification
-            var byteArray = Encoding.UTF8.GetBytes(token);
-            _httpClient.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", Convert.ToBase64String(byteArray));
+            _httpClient.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", token);
         }
 
         public ApiVersion Version { get; set; } = ApiVersion.V3;
diff --git a/Mailjet.Client/MailjetClientHandler.cs b/Mailjet.Client/MailjetClientHandler.cs
@@ -1,7 +1,4 @@
-﻿using System;
-using System.Collections.Generic;
-using System.Net.Http;
-using System.Text;
+﻿using System.Net.Http;
 
 namespace Mailjet.Client
 {
diff --git a/Mailjet.Client/MailjetRequest.cs b/Mailjet.Client/MailjetRequest.cs
@@ -1,9 +1,6 @@
 ﻿using Newtonsoft.Json.Linq;
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace Mailjet.Client
 {
diff --git a/Mailjet.Client/MailjetResponse.cs b/Mailjet.Client/MailjetResponse.cs
@@ -1,9 +1,5 @@
 ﻿using Newtonsoft.Json.Linq;
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace Mailjet.Client
 {
diff --git a/Mailjet.Client/ResourceId.cs b/Mailjet.Client/ResourceId.cs
@@ -1,10 +1,4 @@
-﻿using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Mailjet.Client
+﻿namespace Mailjet.Client
 {
     public class ResourceId
     {
diff --git a/Mailjet.Client/ResourceInfo.cs b/Mailjet.Client/ResourceInfo.cs
@@ -1,11 +1,4 @@
-﻿using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Mailjet.Client
+﻿namespace Mailjet.Client
 {
     public enum ResourceType
     {
@@ -62,7 +55,7 @@ private string GetPath()
                     return "REST";
                 case ResourceType.Data:
                     return "DATA";
-                case ResourceType.Send: 
+                case ResourceType.Send:
                 case ResourceType.V4:
                     return string.Empty;
                 default:
diff --git a/Mailjet.Client/Resources/SMS/Count.cs b/Mailjet.Client/Resources/SMS/Count.cs
@@ -1,10 +1,4 @@
-﻿using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Mailjet.Client.Resources.SMS
+﻿namespace Mailjet.Client.Resources.SMS
 {
     public static class Count
     {
diff --git a/Mailjet.Client/Resources/SMS/Export.cs b/Mailjet.Client/Resources/SMS/Export.cs
@@ -1,10 +1,4 @@
-﻿using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Mailjet.Client.Resources.SMS
+﻿namespace Mailjet.Client.Resources.SMS
 {
     public static class Export
     {
diff --git a/Mailjet.Client/Resources/SMS/SMS.cs b/Mailjet.Client/Resources/SMS/SMS.cs
@@ -1,10 +1,4 @@
-﻿using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Mailjet.Client.Resources.SMS
+﻿namespace Mailjet.Client.Resources.SMS
 {
     public static class SMS
     {
diff --git a/Mailjet.Client/Resources/SMS/Send.cs b/Mailjet.Client/Resources/SMS/Send.cs
@@ -1,10 +1,4 @@
-﻿using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Mailjet.Client.Resources.SMS
+﻿namespace Mailjet.Client.Resources.SMS
 {
     public static class Send
     {
diff --git a/Mailjet.Client/UrlHelper.cs b/Mailjet.Client/UrlHelper.cs
@@ -1,9 +1,6 @@
-﻿using System;
-using System.Collections.Generic;
+﻿using System.Collections.Generic;
 using System.Linq;
 using System.Net;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace Mailjet.Client
 {
diff --git a/Mailjet.Tests/MailjetClientTests.cs b/Mailjet.Tests/MailjetClientTests.cs
@@ -1,12 +1,14 @@
-using System;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-using RichardSzalay.MockHttp;
 using Mailjet.Client;
 using Mailjet.Client.Resources;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Newtonsoft.Json.Linq;
+using RichardSzalay.MockHttp;
+using System;
+using sms = Mailjet.Client.Resources.SMS;
 
 namespace Mailjet.Tests
 {
+
     [TestClass]
     public class MailjetClientTests
     {
@@ -16,6 +18,18 @@ public class MailjetClientTests
         private const string TotalKey = "Total";
         private const string CountKey = "Count";
         private const string DataKey = "Data";
+        private const string Status = "Status";
+        private const string Code = "Code";
+        private const string Name = "Name";
+        private const string Description = "Description";
+
+        private string API_TOKEN;
+
+        [TestInitialize]
+        public void TestInit()
+        {
+            API_TOKEN = "ApiToken";
+        }
 
         [TestMethod]
         public void TestGetAsync()
@@ -55,6 +69,120 @@ public void TestGetAsync()
             Assert.IsTrue(JToken.DeepEquals(expectedData, response.GetData()));
         }
 
+        [TestMethod]
+        public void TestSmsCountAsync()
+        {
+            int expectedTotal = 1;
+            int expectedCount = 1;
+            var expectedData = new JArray();
+
+            var mockHttp = new MockHttpMessageHandler();
+
+            var jsonResponse = GenerateJsonResponse(expectedTotal, expectedCount, expectedData);
+
+            // Setup a respond for the user api (including a wildcard in the URL)
+            mockHttp.When("https://api.mailjet.com/v4/*")
+                    .Respond(JsonMediaType, jsonResponse); // Respond with JSON
+
+            IMailjetClient client = new MailjetClient(API_TOKEN, mockHttp)
+            {
+                Version = ApiVersion.V4
+            };
+
+
+            MailjetRequest request = new MailjetRequest
+            {
+                Resource = sms.Count.Resource
+            }
+            .Filter(sms.Count.FromTS, DateTimeOffset.UtcNow.ToUnixTimeMilliseconds().ToString())
+            .Filter(sms.Count.ToTS, DateTimeOffset.UtcNow.ToUnixTimeMilliseconds().ToString());
+
+
+            MailjetResponse response = client.GetAsync(request).Result;
+
+            Assert.IsTrue(response.IsSuccessStatusCode);
+            Assert.AreEqual(expectedTotal, response.GetTotal());
+            Assert.AreEqual(expectedCount, response.GetCount());
+            Assert.IsTrue(JToken.DeepEquals(expectedData, response.GetData()));
+        }
+
+        [TestMethod]
+        public void TestSmsExportAsync()
+        {
+            int expectedCode = 1;
+            string expectedName = "PENDING";
+            string expectedDescription = "The request is accepted.";
+
+            var status = new JObject
+            {
+                { Code, expectedCode},
+                { Name, expectedName},
+                { Description, expectedDescription}
+            };
+
+            var smsExportResponse = new JObject
+            {
+                { Status, status }
+            };
+
+            var mockHttp = new MockHttpMessageHandler();
+            // Setup a respond for the user api (including a wildcard in the URL)
+            mockHttp.When("https://api.mailjet.com/v4/*")
+                    .Respond(JsonMediaType, GenerateJsonResponse(smsExportResponse)); // Respond with JSON
+
+            // timsestamp range offset
+            int offset = 1000;
+
+            IMailjetClient client = new MailjetClient(API_TOKEN, mockHttp)
+            {
+                Version = ApiVersion.V4
+            };
+
+            MailjetRequest request = new MailjetRequest
+            {
+                Resource = sms.Export.Resource
+            }
+            .Property(sms.Export.FromTS, DateTimeOffset.UtcNow.ToUnixTimeMilliseconds())
+            .Property(sms.Export.ToTS, DateTimeOffset.UtcNow.ToUnixTimeMilliseconds() + offset);
+
+
+            MailjetResponse response = client.PostAsync(request).Result;
+
+            Assert.IsTrue(response.IsSuccessStatusCode);
+            Assert.AreEqual(expectedCode, response.GetData()[0][Status].Value<int>(Code));
+            Assert.AreEqual(expectedName, response.GetData()[0][Status].Value<string>(Name));
+            Assert.AreEqual(expectedDescription, response.GetData()[0][Status].Value<string>(Description));
+        }
+
+        [TestMethod]
+        public void TestSmsStatisticsAsync()
+        {
+            var expectedData = new JArray();
+            var mockHttp = new MockHttpMessageHandler();
+            var jsonResponse = GenerateJsonResponse(1, 1, expectedData);
+
+            // Setup a respond for the user api (including a wildcard in the URL)
+            mockHttp.When("https://api.mailjet.com/v4/*")
+                    .Respond(JsonMediaType, jsonResponse); // Respond with JSON
+
+            IMailjetClient client = new MailjetClient(API_TOKEN, mockHttp)
+            {
+                Version = ApiVersion.V4
+            };
+
+            MailjetRequest request = new MailjetRequest
+            {
+                Resource = sms.SMS.Resource
+            }
+            .Filter(sms.SMS.FromTS, DateTimeOffset.UtcNow.ToUnixTimeMilliseconds().ToString())
+            .Filter(sms.SMS.ToTS, DateTimeOffset.UtcNow.ToUnixTimeMilliseconds().ToString());
+
+            MailjetResponse response = client.GetAsync(request).Result;
+
+            Assert.IsTrue(response.IsSuccessStatusCode);
+            Assert.IsTrue(JToken.DeepEquals(expectedData, response.GetData()));
+        }
+
         private string GenerateJsonResponse(int total, int count, JArray data)
         {
             var jObject = new JObject()
@@ -64,6 +192,11 @@ private string GenerateJsonResponse(int total, int count, JArray data)
                 { DataKey, data },
             };
 
+            return GenerateJsonResponse(jObject);
+        }
+
+        private string GenerateJsonResponse(JObject jObject)
+        {
             return jObject.ToString(Newtonsoft.Json.Formatting.None);
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -1,9 +1,5 @@`
`1`	`1`	`using System;`
`2`		`-using System.Collections.Generic;`
`3`		`-using System.Linq;`
`4`	`2`	`using System.Net;`
`5`		`-using System.Text;`
`6`		`-using System.Threading.Tasks;`
`7`	`3`
`8`	`4`	`namespace Mailjet.Client`
`9`	`5`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,4 @@`
`1`		`-using System;`
`2`		`-using System.Collections.Generic;`
`3`		`-using System.Linq;`
`4`		`-using System.Text;`
`5`		`-using System.Threading.Tasks;`
	`1`	`+using System.Threading.Tasks;`
`6`	`2`
`7`	`3`	`namespace Mailjet.Client`
`8`	`4`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,4 @@`
`1`		`-using System;`
`2`		`-using System.Collections.Generic;`
`3`		`-using System.Net.Http;`
`4`		`-using System.Text;`
	`1`	`+using System.Net.Http;`
`5`	`2`
`6`	`3`	`namespace Mailjet.Client`
`7`	`4`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,9 +1,6 @@`
`1`	`1`	`using Newtonsoft.Json.Linq;`
`2`	`2`	`using System;`
`3`	`3`	`using System.Collections.Generic;`
`4`		`-using System.Linq;`
`5`		`-using System.Text;`
`6`		`-using System.Threading.Tasks;`
`7`	`4`
`8`	`5`	`namespace Mailjet.Client`
`9`	`6`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,10 +1,4 @@`
`1`		`-using System;`
`2`		`-using System.Collections.Generic;`
`3`		`-using System.Linq;`
`4`		`-using System.Text;`
`5`		`-using System.Threading.Tasks;`
`6`		`-`
`7`		`-namespace Mailjet.Client`
	`1`	`+namespace Mailjet.Client`
`8`	`2`	`{`
`9`	`3`	`public class ResourceId`
`10`	`4`	`{`