CallFire · vmalinovskiy · Mar 28, 2017 · Mar 28, 2017 · Mar 28, 2017 · Mar 28, 2017
diff --git a/CallfireApiClient.nuspec b/CallfireApiClient.nuspec
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?><package>
   <metadata>
     <id>CallfireApiClient</id>
-    <version>1.1.15</version>
+    <version>1.1.16</version>
     <title>CallFire API v2 client</title>
     <authors>
       Vladimir Mikhailov
@@ -15,6 +15,9 @@
     <description>C# client library for integration with Callfire REST API v2 services</description>
     <releaseNotes>Callfire API client Changelog
 =============================
+Version 1.1.16 - Mar 28 2017
+- fixed DayOfWeek enum for scheduler
+
 Version 1.1.15 - Jan 27 2017
 - added dnc apis
 

diff --git a/Changelog.txt b/Changelog.txt
@@ -1,5 +1,8 @@
 Callfire API client Changelog
 =============================
+Version 1.1.16 - Mar 28 2017
+- fixed DayOfWeek enum for scheduler
+
 Version 1.1.15 - Jan 27 2017
 - added dnc apis
 

diff --git a/src/CallfireApiClient.IntegrationTests/Api/Campaigns/CallBroadcastsApiIntegrationTest.cs b/src/CallfireApiClient.IntegrationTests/Api/Campaigns/CallBroadcastsApiIntegrationTest.cs
@@ -1,5 +1,4 @@
-using System;
-using NUnit.Framework;
+using NUnit.Framework;
 using CallfireApiClient.Api.Campaigns.Model;
 using System.Collections.Generic;
 using CallfireApiClient.Api.Campaigns.Model.Request;
@@ -30,10 +29,18 @@ public void VoiceBroadcastCrudOperations()
                     new Recipient { PhoneNumber = "12132212384" },
                     new Recipient { PhoneNumber = "12132212385" }
                 },
+                Schedules = new List<Schedule>
+                {
+                    new Schedule {
+                                    StartTimeOfDay = new LocalTime { Hour = 1, Minute = 1, Second = 1 },
+                                    StopTimeOfDay = new LocalTime { Hour = 2, Minute = 2, Second = 2 },
+                                    TimeZone = "America/New_York",
+                                    DaysOfWeek = new HashSet<DayOfWeek> { DayOfWeek.MONDAY, DayOfWeek.FRIDAY } }
+                },
                 ResumeNextDay = true
             };
             var id = Client.CallBroadcastsApi.Create(broadcast, true);
-            Console.WriteLine("broadcast id: " + id);
+            System.Console.WriteLine("broadcast id: " + id);
             var savedBroadcast = Client.CallBroadcastsApi.Get(id.Id);
             Assert.AreEqual(broadcast.Name, savedBroadcast.Name);
             Assert.AreEqual(savedBroadcast.ResumeNextDay, true);
@@ -64,7 +71,7 @@ public void IvrsCrudOperations()
                 }
             };
             var id = Client.CallBroadcastsApi.Create(broadcast, true);
-            Console.WriteLine("ivr id: " + id);
+            System.Console.WriteLine("ivr id: " + id);
             var savedBroadcast = Client.CallBroadcastsApi.Get(id.Id);
             Assert.AreEqual(broadcast.Name, savedBroadcast.Name);
 
@@ -101,7 +108,7 @@ public void StartStopArchiveCampaign()
             var id = Client.CallBroadcastsApi.Create(broadcast, true);
 
             CallBroadcast campaign = Client.CallBroadcastsApi.Get(id.Id);
-            Console.WriteLine(campaign);
+            System.Console.WriteLine(campaign);
             Assert.NotNull(campaign);
             // start
             Client.CallBroadcastsApi.Start((long)campaign.Id);
@@ -122,25 +129,25 @@ public void GetBroadcastCalls()
         {
             var getCallsRequest = new GetByIdRequest { Id = 1 };
             var calls = Client.CallBroadcastsApi.GetCalls(getCallsRequest);
-            Console.WriteLine(calls);
+            System.Console.WriteLine(calls);
             Assert.That(calls.Items, Is.Not.Empty);
 
             long testBatchId = (long) calls.Items[0].BatchId;
 
             getCallsRequest = new GetBroadcastCallsTextsRequest { Id = 1, batchId = testBatchId };
             calls = Client.CallBroadcastsApi.GetCalls(getCallsRequest);
-            Console.WriteLine(calls);
+            System.Console.WriteLine(calls);
             Assert.AreEqual(calls.Items[0].BatchId, testBatchId);
         }
 
         [Test]
         public void GetBroadcastStats()
         {
-            var begin = DateTime.Now.AddDays(-5d);
-            var end = DateTime.Now;
+            var begin = System.DateTime.Now.AddDays(-5d);
+            var end = System.DateTime.Now;
             var fields = "callsAttempted,callsPlaced,callsDuration";
             var stats = Client.CallBroadcastsApi.GetStats(1, fields, begin, end);
-            Console.WriteLine(stats);
+            System.Console.WriteLine(stats);
         }
 
         [Test]
@@ -152,7 +159,7 @@ public void AddRecipientsAndAddRemoveBatches()
                 Limit = 1
             };
             var broadcasts = Client.CallBroadcastsApi.Find(findRequest);
-            Console.WriteLine(broadcasts);
+            System.Console.WriteLine(broadcasts);
             Assert.That(broadcasts.Items, Is.Not.Empty);
             var id = broadcasts.Items[0].Id;
 
@@ -161,13 +168,13 @@ public void AddRecipientsAndAddRemoveBatches()
                     new Recipient { PhoneNumber = "12132212384" },
                     new Recipient { PhoneNumber = "12132212385" }
                 });
-            Console.WriteLine(calls);
+            System.Console.WriteLine(calls);
             Assert.AreEqual(2, calls.Count);
 
             // get batches
             var getBatchesRequest = new GetByIdRequest { Id = id };
             var batches = Client.CallBroadcastsApi.GetBatches(getBatchesRequest);
-            Console.WriteLine(batches);
+            System.Console.WriteLine(batches);
 
             // add batch
             var addBatchRequest = new AddBatchRequest

diff --git a/src/CallfireApiClient.IntegrationTests/Api/Numbers/NumberLeasesApiIntegrationTest.cs b/src/CallfireApiClient.IntegrationTests/Api/Numbers/NumberLeasesApiIntegrationTest.cs
@@ -1,5 +1,4 @@
-using System;
-using NUnit.Framework;
+using NUnit.Framework;
 using CallfireApiClient.Api.Numbers.Model;
 using CallfireApiClient.Api.Numbers.Model.Request;
 using System.Collections.Generic;
@@ -15,7 +14,7 @@ public void FindNumberLeases()
         {
             var request = new FindNumberLeasesRequest { Limit = 2 };
             var leases = Client.NumberLeasesApi.Find(request);
-            Console.WriteLine(leases);
+            System.Console.WriteLine(leases);
 
             Assert.True(leases.Items.Count > 0);
             Assert.True(leases.Items[0].Labels.Count > 0);
@@ -24,9 +23,9 @@ public void FindNumberLeases()
         [Test]
         public void GetNumberLease()
         {
-            const String number = "12132041238";
+            const System.String number = "12132041238";
             var lease = Client.NumberLeasesApi.Get(number);
-            Console.WriteLine(lease);
+            System.Console.WriteLine(lease);
 
             Assert.IsNotNull(lease.Region);
             Assert.AreEqual(number, lease.PhoneNumber);
@@ -46,7 +45,7 @@ public void UpdateNumberLease()
 
             Client.NumberLeasesApi.Update(lease);
             lease = Client.NumberLeasesApi.Get(number, "number,callFeatureStatus,textFeatureStatus");
-            Console.WriteLine(lease);
+            System.Console.WriteLine(lease);
             Assert.NotNull(lease.PhoneNumber);
             Assert.AreEqual(NumberLease.FeatureStatus.DISABLED, lease.TextFeatureStatus);
             Assert.AreEqual(NumberLease.FeatureStatus.DISABLED, lease.CallFeatureStatus);
@@ -61,7 +60,7 @@ public void FindNumberLeaseConfigs()
         {
             var request = new FindNumberLeaseConfigsRequest { Limit = 2 };
             var configs = Client.NumberLeasesApi.FindConfigs(request);
-            Console.WriteLine(configs);
+            System.Console.WriteLine(configs);
 
             Assert.True(configs.Items.Count > 0);
         }
@@ -70,7 +69,7 @@ public void FindNumberLeaseConfigs()
         public void GetNumberLeaseConfig()
         {
             var config = Client.NumberLeasesApi.GetConfig("12132041238");
-            Console.WriteLine(config);
+            System.Console.WriteLine(config);
 
             Assert.True(NumberConfig.NumberConfigType.TRACKING.Equals(config.ConfigType));
             Assert.True(config.CallTrackingConfig != null);
@@ -98,7 +97,7 @@ public void UpdateNumberLeaseConfig()
                 StartTimeOfDay = new LocalTime { Hour = 1, Minute = 1, Second = 1 },
                 StopTimeOfDay = new LocalTime { Hour = 2, Minute = 2, Second = 2 },
                 TimeZone = "America/New_York",
-                DaysOfWeek = new HashSet<DayOfWeek> { DayOfWeek.Monday, DayOfWeek.Friday }
+                DaysOfWeek = new HashSet<DayOfWeek> { DayOfWeek.MONDAY, DayOfWeek.FRIDAY, DayOfWeek.SATURDAY }
             };
             callTrackingConfig.WeeklySchedule = weeklySchedule;
 
@@ -110,10 +109,17 @@ public void UpdateNumberLeaseConfig()
             };
             callTrackingConfig.GoogleAnalytics = googleAnalytics;
 
+            config.CallTrackingConfig = callTrackingConfig;
+            config.ConfigType = NumberConfig.NumberConfigType.TRACKING;
+
             Client.NumberLeasesApi.UpdateConfig(config);
-            config = Client.NumberLeasesApi.GetConfig(number, "callTrackingConfig,configType");
-            Console.WriteLine(config);
+            config = Client.NumberLeasesApi.GetConfig(number);
+            Assert.AreEqual(config.ConfigType, NumberConfig.NumberConfigType.TRACKING);
+            Assert.AreEqual(config.Number, number);
+            Assert.NotNull(config.CallTrackingConfig);
+            System.Console.WriteLine(config);
 
+            config = Client.NumberLeasesApi.GetConfig(number, "callTrackingConfig,configType");
             Assert.IsNotNull(config.CallTrackingConfig);
             Assert.IsNull(config.Number);
             Assert.AreEqual(NumberConfig.NumberConfigType.TRACKING, config.ConfigType);

diff --git a/src/CallfireApiClient.IntegrationTests/Api/Numbers/NumbersApiIntegrationTest.cs b/src/CallfireApiClient.IntegrationTests/Api/Numbers/NumbersApiIntegrationTest.cs
@@ -39,11 +39,13 @@ public void FindTollfreeNumbers()
         [Test]
         public void FindNumbersLocal()
         {
-            var request = new FindNumbersLocalRequest { Limit = 2, State = "LA" };
+            var request = new FindNumbersLocalRequest { Limit = 1, State = "LA" };
             var numbers = Client.NumbersApi.FindNumbersLocal(request);
-            Assert.AreEqual(2, numbers.Count);
-            Assert.That(numbers[0].NationalFormat, Is.StringStarting("(225)"));
-
+            Assert.AreEqual(1, numbers.Count);
+            Assert.NotNull(numbers[0].NationalFormat);
+            Assert.NotNull(numbers[0].PhoneNumber);
+            Assert.NotNull(numbers[0].Region);
+            Assert.NotNull(numbers[0].TollFree);
             Console.WriteLine(numbers);
         }
 

diff --git a/src/CallfireApiClient.Tests/Api/Numbers/NumberLeasesApiTest.cs b/src/CallfireApiClient.Tests/Api/Numbers/NumberLeasesApiTest.cs
@@ -1,5 +1,4 @@
-using System;
-using NUnit.Framework;
+using NUnit.Framework;
 using RestSharp;
 using System.Linq;
 using CallfireApiClient.Api.Numbers.Model.Request;
@@ -138,7 +137,7 @@ public void UpdateConfig()
                     {
                         StartTimeOfDay = new LocalTime { Hour = 1, Minute = 1, Second = 1 },
                         StopTimeOfDay = new LocalTime { Hour = 2, Minute = 2, Second = 2 },
-                        DaysOfWeek = new HashSet<DayOfWeek> { DayOfWeek.Friday },
+                        DaysOfWeek = new HashSet<DayOfWeek> { DayOfWeek.FRIDAY },
                         TimeZone = "America/Los_Angeles"
                     },
                     GoogleAnalytics = new GoogleAnalytics
@@ -150,7 +149,7 @@ public void UpdateConfig()
                 }
             };
             Client.NumberLeasesApi.UpdateConfig(config);
-            Console.WriteLine(config);
+            System.Console.WriteLine(config);
 
             Assert.AreEqual(Method.PUT, restRequest.Value.Method);
             var requestBodyParam = restRequest.Value.Parameters.FirstOrDefault(p => p.Type == ParameterType.RequestBody);

diff --git a/...ireApiClient.Tests/JsonMocks/numbers/numberLeasesApi/request/updateNumberLeaseConfig.json b/...ireApiClient.Tests/JsonMocks/numbers/numberLeasesApi/request/updateNumberLeaseConfig.json
@@ -25,7 +25,7 @@
         "second": 2
       },
       "daysOfWeek": [
-        "Friday"
+        "FRIDAY"
       ],
       "timeZone": "America/Los_Angeles"
     },

diff --git a/src/CallfireApiClient/Api/Common/Model/DayOfWeek.cs b/src/CallfireApiClient/Api/Common/Model/DayOfWeek.cs
@@ -0,0 +1,16 @@
+
+
+namespace CallfireApiClient.Api.Common.Model
+{
+    public enum DayOfWeek
+    {
+        SUNDAY = 0,
+        MONDAY = 1,
+        TUESDAY = 2,
+        WEDNESDAY = 3,
+        THURSDAY = 4,
+        FRIDAY = 5,
+        SATURDAY = 6
+    }
+}
+
diff --git a/src/CallfireApiClient/Api/Common/Model/WeeklySchedule.cs b/src/CallfireApiClient/Api/Common/Model/WeeklySchedule.cs
@@ -1,5 +1,4 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 
 namespace CallfireApiClient.Api.Common.Model
 {

diff --git a/src/CallfireApiClient/CallfireApiClient.csproj b/src/CallfireApiClient/CallfireApiClient.csproj
@@ -94,6 +94,7 @@
     <Compile Include="Api\Campaigns\Model\CallRecording.cs" />
     <Compile Include="Api\Campaigns\Model\CampaignSound.cs" />
     <Compile Include="Api\Common\Model\LocalDate.cs" />
+    <Compile Include="Api\Common\Model\DayOfWeek.cs" />
     <Compile Include="Api\Common\Model\LocalTime.cs" />
     <Compile Include="Api\Common\Model\LocalTimeRestriction.cs" />
     <Compile Include="Api\Campaigns\Model\Recipient.cs" />

diff --git a/src/CallfireApiClient/Properties/AssemblyInfo.cs b/src/CallfireApiClient/Properties/AssemblyInfo.cs
@@ -13,7 +13,7 @@
 // The form "{Major}.{Minor}.*" will automatically update the build and revision,
 // and "{Major}.{Minor}.{Build}.*" will update just the revision.
 
-[assembly: AssemblyVersion("1.1.15.*")]
+[assembly: AssemblyVersion("1.1.16.*")]
 
 // The following attributes are used to specify the signing key for the assembly,
 // if desired. See the Mono documentation for more information about signing.